[evolution] Updated Spanish translation

From: Jorge Gonzalez Gonzalez <jorgegonz src gnome org>
To: svn-commits-list gnome org
Cc:
Subject: [evolution] Updated Spanish translation
Date: Sat, 19 Dec 2009 16:21:57 +0000 (UTC)
commit 011cef2499c07b6e76f1bfe1ad9011c7b33fc3be
Author: Jorge GonzÃ¡lez <jorgegonz svn gnome org>
Date:   Sat Dec 19 17:21:27 2009 +0100

    Updated Spanish translation

 po/es.po | 3758 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2011 insertions(+), 1747 deletions(-)
---
diff --git a/po/es.po b/po/es.po
index eaa924b..0b997b4 100644
--- a/po/es.po
+++ b/po/es.po
@@ -10,14 +10,14 @@
 # Pablo Gonzalo del Campo <pablodc bigfoot com>,2003 (revisiÃ³n).
 # Francisco Javier F. Serrador <serrador cvs gnome org>, 2003, 2004, 2005, 2006.
 # Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2007, 2008, 2009.
-#: ../shell/main.c:527
+#: ../shell/main.c:506
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution.HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution\n"
-"POT-Creation-Date: 2009-11-26 21:09+0000\n"
-"PO-Revision-Date: 2009-11-27 01:43+0100\n"
+"POT-Creation-Date: 2009-12-19 05:50+0000\n"
+"PO-Revision-Date: 2009-12-19 17:20+0100\n"
 "Last-Translator: Jorge GonzÃ¡lez <jorgegonz svn gnome org>\n"
 "Language-Team: EspaÃ±ol <gnome-es-list gnome org>\n"
 "MIME-Version: 1.0\n"
@@ -108,7 +108,7 @@ msgstr "No es posible autenticar con el servidor LDAP."
 
 #. Unknown error
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1020
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1015
 msgid "Failed to delete contact"
 msgstr "FallÃ³ al borrar el contacto"
 
@@ -231,7 +231,7 @@ msgstr ""
 "Los contactos para {0} no estarÃ¡n disponibles hasta que Evolution se "
 "reinicie."
 
-#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:518
+#: ../addressbook/addressbook.error.xml.h:38 ../mail/em-vfolder-rule.c:521
 #: ../plugins/groupwise-features/junk-settings.ui.h:4
 #: ../plugins/groupwise-features/properties.ui.h:10
 #: ../widgets/table/e-table-config.ui.h:18
@@ -264,17 +264,17 @@ msgstr "{0}"
 msgid "{1}"
 msgstr "{1}"
 
-#: ../addressbook/conduit/address-conduit.c:595
+#: ../addressbook/conduit/address-conduit.c:597
 msgid "Default Sync Address:"
 msgstr "DirecciÃ³n de sincr. predeterminada:"
 
-#: ../addressbook/conduit/address-conduit.c:1618
-#: ../addressbook/conduit/address-conduit.c:1619
+#: ../addressbook/conduit/address-conduit.c:1631
+#: ../addressbook/conduit/address-conduit.c:1632
 msgid "Could not load address book"
 msgstr "No se pudo cargar la libreta de direcciones"
 
-#: ../addressbook/conduit/address-conduit.c:1696
-#: ../addressbook/conduit/address-conduit.c:1699
+#: ../addressbook/conduit/address-conduit.c:1709
+#: ../addressbook/conduit/address-conduit.c:1712
 msgid "Could not read pilot's Address application block"
 msgstr "No es posible leer el bloque de la aplicaciÃ³n de Direcciones del Pilot"
 
@@ -291,7 +291,7 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:2
 #: ../addressbook/gui/widgets/eab-contact-display.c:582
-#: ../calendar/gui/e-calendar-view.c:1833 ../shell/main.c:114
+#: ../calendar/gui/e-calendar-view.c:1833 ../shell/main.c:110
 msgid "Birthday"
 msgstr "CumpleaÃ±os"
 
@@ -306,16 +306,16 @@ msgid "Calendar:"
 msgstr "Calendario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:5
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:312
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1264
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:311
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1265
 #: ../addressbook/gui/widgets/e-minicard.c:198
 msgid "Contact"
 msgstr "Contacto"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:592
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:607
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2494
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:591
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:606
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2497
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -325,7 +325,7 @@ msgstr "Editor de contactos"
 #: ../addressbook/gui/widgets/eab-contact-display.c:517
 #: ../addressbook/gui/widgets/eab-contact-display.c:525
 #: ../addressbook/gui/widgets/eab-contact-display.c:811
-#: ../plugins/groupwise-features/junk-settings.c:409 ../smime/lib/e-cert.c:808
+#: ../plugins/groupwise-features/junk-settings.c:408 ../smime/lib/e-cert.c:821
 msgid "Email"
 msgstr "Correo-e"
 
@@ -338,7 +338,7 @@ msgid "Full _Name..."
 msgstr "_Nombre completoâ?¦"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
 #: ../addressbook/gui/widgets/eab-contact-display.c:70
 msgid "Home"
 msgstr "Domicilio"
@@ -364,7 +364,7 @@ msgid "Mailing Address"
 msgstr "DirecciÃ³n de correo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../calendar/gui/dialogs/task-details-page.ui.h:6
+#: ../calendar/gui/dialogs/task-details-page.ui.h:11
 msgid "Miscellaneous"
 msgstr "MiscelÃ¡nea"
 
@@ -376,12 +376,12 @@ msgstr "Apo_do:"
 #: ../modules/calendar/e-memo-shell-migrate.c:250
 #: ../plugins/groupwise-features/camel-gw-listener.c:422
 #: ../plugins/groupwise-features/camel-gw-listener.c:452
-#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/groupwise-features/camel-gw-listener.c:567
 msgid "Notes"
 msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
 #: ../addressbook/gui/widgets/eab-contact-display.c:71
 #: ../addressbook/gui/widgets/eab-contact-display.c:460
 #: ../calendar/gui/e-calendar-view.c:1542
@@ -410,10 +410,10 @@ msgstr "Diario web:"
 
 #. red
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:188
 #: ../addressbook/gui/widgets/eab-contact-display.c:69
 #: ../addressbook/gui/widgets/eab-contact-display.c:569
-#: ../modules/mail/e-mail-shell-migrate.c:957
+#: ../mail/e-mail-migrate.c:954
 msgid "Work"
 msgstr "Trabajo"
 
@@ -520,17 +520,18 @@ msgstr "_CÃ³digo postal:"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:88
 #: ../e-util/e-logger.c:171 ../mail/e-mail-label-tree-view.c:96
+#: ../plugins/caldav/caldav-browse-server.c:1160
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:7
 #: ../plugins/plugin-manager/plugin-manager.c:58
-#: ../widgets/menus/gal-define-views-dialog.c:338
+#: ../widgets/menus/gal-define-views-dialog.c:315
 #: ../widgets/menus/gal-view-instance-save-as-dialog.c:90
-#: ../widgets/menus/gal-view-new-dialog.c:61
+#: ../widgets/menus/gal-view-new-dialog.c:60
 msgid "Name"
 msgstr "Nombre"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:94
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:340
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1284
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:339
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1285
 #: ../addressbook/gui/widgets/e-addressbook-model.c:523
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:428
 #: ../addressbook/gui/widgets/e-minicard-label.c:164
@@ -543,98 +544,98 @@ msgstr "Nombre"
 msgid "Editable"
 msgstr "Editable"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
 #: ../addressbook/gui/widgets/eab-contact-display.c:539
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
 #: ../addressbook/gui/widgets/eab-contact-display.c:542
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
 #: ../addressbook/gui/widgets/eab-contact-display.c:544
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
 #: ../addressbook/gui/widgets/eab-contact-display.c:545
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
 #: ../addressbook/gui/widgets/eab-contact-display.c:543
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
 #: ../addressbook/gui/widgets/eab-contact-display.c:541
 msgid "ICQ"
 msgstr "ICQ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
 #: ../addressbook/gui/widgets/eab-contact-display.c:540
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
 #: ../addressbook/gui/widgets/eab-contact-display.c:546
 msgid "Skype"
 msgstr "Skype"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:211
-#: ../addressbook/gui/widgets/eab-gui-util.c:367
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:372
 msgid "Error adding contact"
 msgstr "Error al aÃ±adir el contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:224
 msgid "Error modifying contact"
 msgstr "Error al modificar el contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:239
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:238
 msgid "Error removing contact"
 msgstr "Error al eliminar el contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:297
 msgid "Source Book"
 msgstr "Libro origen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:305
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:304
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:319
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:326
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:325
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:333
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:332
 msgid "Required Fields"
 msgstr "Campos requeridos"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:347
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:346
 msgid "Changed"
 msgstr "Modificados"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:602
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2489
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2492
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos: %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2884
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2889
 msgid "Please select an image for this contact"
 msgstr "Seleccione una imagen para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2885
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2890
 msgid "_No image"
 msgstr "_Sin imagen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3156
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3163
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -642,53 +643,53 @@ msgstr ""
 "Los datos del contacto son invÃ¡lidos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3160
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â«%sÂ» tiene un formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3167
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3174
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ«%sÂ» tiene un formato invÃ¡lido"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3182
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3193
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3189
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3200
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ«%sÂ» estÃ¡ vacÃo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3206
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3214
 msgid "Invalid contact."
 msgstr "Contacto invÃ¡lido."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:350
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
 msgid "Contact Quick-Add"
 msgstr "AÃ±adir contacto rÃ¡pido"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:353
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:356
 msgid "_Edit Full"
 msgstr "_Editar todo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:427
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:430
 msgid "_Full name"
 msgstr "Nombre _completo"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
 msgid "E_mail"
 msgstr "_Correo-e"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:449
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
 msgid "_Select Address Book"
 msgstr "_Seleccione la libreta de direcciones"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:167
-#: ../shell/e-shell-backend.c:171 ../shell/e-shell-window.c:355
+#: ../shell/e-shell-backend.c:222 ../shell/e-shell-window.c:653
 msgid "Shell"
 msgstr "Shell"
 
 #: ../addressbook/gui/contact-editor/eab-editor.c:168
-#: ../shell/e-shell-backend.c:172 ../shell/e-shell-window.c:356
+#: ../shell/e-shell-backend.c:223 ../shell/e-shell-window.c:654
 msgid "The EShell singleton"
 msgstr "El Â«singletonÂ» EShell"
 
@@ -758,7 +759,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:694
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:695
 msgid "Contact List Editor"
 msgstr "Editor de listas de contactos"
 
@@ -784,28 +785,28 @@ msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Teclee una direcciÃ³n de correo o arrastre un contacto a la lista inferior:"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:787
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:788
 msgid "Contact List Members"
 msgstr "Miembros de la lista de contactos"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:935
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1342
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:936
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1343
 msgid "_Members"
 msgstr "_Miembros"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1182
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1183
 msgid "Error adding list"
 msgstr "Error al aÃ±adir la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1196
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1197
 msgid "Error modifying list"
 msgstr "Error al modificar la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1210
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1211
 msgid "Error removing list"
 msgstr "Error al eliminar la lista"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1254
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1255
 #: ../addressbook/gui/widgets/e-addressbook-model.c:513
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:414
 #: ../addressbook/gui/widgets/e-minicard-view-widget.c:119
@@ -813,7 +814,7 @@ msgstr "Error al eliminar la lista"
 msgid "Book"
 msgstr "Libro"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1274
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1275
 msgid "Is New List"
 msgstr "Es una lista nueva"
 
@@ -867,9 +868,9 @@ msgstr "Combinar contacto"
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
 #: ../calendar/gui/tasktypes.xml.h:4
 #: ../modules/addressbook/e-book-shell-view-actions.c:983
-#: ../modules/calendar/e-cal-shell-view-actions.c:1624
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-task-shell-view-actions.c:1028
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
@@ -912,8 +913,8 @@ msgstr "BÃºsqueda interrumpida"
 #: ../addressbook/gui/widgets/e-addressbook-reflow-adapter.c:435
 #: ../addressbook/gui/widgets/e-addressbook-view.c:560
 #: ../calendar/gui/e-calendar-table.c:877 ../calendar/gui/e-memo-table.c:660
-#: ../modules/calendar/e-memo-shell-content.c:601
-#: ../modules/calendar/e-task-shell-content.c:624
+#: ../modules/calendar/e-memo-shell-content.c:606
+#: ../modules/calendar/e-task-shell-content.c:629
 #: ../widgets/table/e-table-click-to-add.c:505
 #: ../widgets/table/e-table-selection-model.c:302
 #: ../widgets/table/e-table.c:3344
@@ -935,33 +936,33 @@ msgstr "Vista de shell"
 msgid "Source"
 msgstr "Fuente"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1038
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1033
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Â¿Seguro que quiere borrar estas listas de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1042
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1037
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Â¿Seguro que quiere borrar esta lista de contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1046
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1041
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Â¿Seguro que quiere borrar esta lista de contactos (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1052
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1047
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Â¿Seguro que quiere borrar estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1056
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1051
 msgid "Are you sure you want to delete this contact?"
 msgstr "Â¿Seguro que quiere borrar este contacto?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1060
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1055
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Â¿Seguro que quiere borrar este contacto (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1222
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1219
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -970,11 +971,11 @@ msgstr ""
 "Abrir %d contactos abrirÃ¡ tambiÃ©n %d ventanas nuevas.\n"
 "Â¿Quiere realmente mostrar todos estos contactos?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1227
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1224
 msgid "_Don't Display"
 msgstr "_No mostrar"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1228
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1225
 msgid "Display _All Contacts"
 msgstr "Mostrar t_odos los contactos"
 
@@ -1134,7 +1135,7 @@ msgid "Telex"
 msgstr "TÃ©lex"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../shell/e-shell-view.c:520
+#: ../shell/e-shell-view.c:735
 msgid "Title"
 msgstr "Tratamiento"
 
@@ -1155,7 +1156,7 @@ msgstr "Sitio web"
 #: ../widgets/table/e-table-group-container.c:995
 #: ../widgets/table/e-table-group-leaf.c:642
 #: ../widgets/table/e-table-group-leaf.c:643
-#: ../widgets/table/e-table-item.c:3069 ../widgets/table/e-table-item.c:3070
+#: ../widgets/table/e-table-item.c:3019 ../widgets/table/e-table-item.c:3020
 #: ../widgets/text/e-text.c:3716 ../widgets/text/e-text.c:3717
 msgid "Width"
 msgstr "Anchura"
@@ -1168,7 +1169,7 @@ msgstr "Anchura"
 #: ../widgets/table/e-table-group-container.c:988
 #: ../widgets/table/e-table-group-leaf.c:635
 #: ../widgets/table/e-table-group-leaf.c:636
-#: ../widgets/table/e-table-item.c:3075 ../widgets/table/e-table-item.c:3076
+#: ../widgets/table/e-table-item.c:3025 ../widgets/table/e-table-item.c:3026
 #: ../widgets/text/e-text.c:3723 ../widgets/text/e-text.c:3724
 msgid "Height"
 msgstr "Altura"
@@ -1370,14 +1371,14 @@ msgstr "Charla por vÃdeo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:562
 #: ../calendar/gui/dialogs/calendar-setup.c:368
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
-#: ../modules/calendar/e-cal-shell-view.c:468
+#: ../modules/calendar/e-cal-shell-view-actions.c:213
+#: ../modules/calendar/e-cal-shell-view-actions.c:242
+#: ../modules/calendar/e-cal-shell-view.c:481
 #: ../plugins/groupwise-features/camel-gw-listener.c:420
 #: ../plugins/groupwise-features/camel-gw-listener.c:450
-#: ../plugins/groupwise-features/camel-gw-listener.c:563
-#: ../plugins/hula-account-setup/camel-hula-listener.c:372
-#: ../plugins/hula-account-setup/camel-hula-listener.c:400
+#: ../plugins/groupwise-features/camel-gw-listener.c:565
+#: ../plugins/hula-account-setup/camel-hula-listener.c:371
+#: ../plugins/hula-account-setup/camel-hula-listener.c:399
 #: ../plugins/publish-calendar/publish-calendar.ui.h:1
 msgid "Calendar"
 msgstr "Calendario"
@@ -1411,12 +1412,13 @@ msgstr "PÃ¡gina personal"
 msgid "Web Log"
 msgstr "Diario web"
 
+#. orange
 #. Create the default Person addressbook
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#. orange
 #: ../addressbook/gui/widgets/eab-contact-display.c:586
+#: ../mail/e-mail-migrate.c:955
 #: ../modules/addressbook/e-book-shell-backend.c:175
 #: ../modules/addressbook/e-book-shell-migrate.c:507
 #: ../modules/calendar/e-cal-shell-backend.c:167
@@ -1425,8 +1427,7 @@ msgstr "Diario web"
 #: ../modules/calendar/e-memo-shell-migrate.c:112
 #: ../modules/calendar/e-task-shell-backend.c:156
 #: ../modules/calendar/e-task-shell-migrate.c:511
-#: ../modules/mail/e-mail-shell-migrate.c:958
-#: ../plugins/email-custom-header/email-custom-header.c:323
+#: ../plugins/email-custom-header/email-custom-header.c:322
 msgid "Personal"
 msgstr "Privado"
 
@@ -1497,14 +1498,15 @@ msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #. E_BOOK_ERROR_CANCELLED
+#. To Translators: This is task status
 #: ../addressbook/gui/widgets/eab-gui-util.c:65
-#: ../calendar/gui/dialogs/task-details-page.ui.h:1
+#: ../calendar/gui/dialogs/task-details-page.ui.h:2
 #: ../calendar/gui/e-cal-component-preview.c:293
 #: ../calendar/gui/e-cal-model-tasks.c:465
 #: ../calendar/gui/e-cal-model-tasks.c:735
 #: ../calendar/gui/e-calendar-table.c:215
 #: ../calendar/gui/e-calendar-table.c:226
-#: ../calendar/gui/e-calendar-table.c:791 ../calendar/gui/print.c:2619
+#: ../calendar/gui/e-calendar-table.c:536 ../calendar/gui/print.c:2619
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -1554,7 +1556,7 @@ msgstr "VersiÃ³n del servidor invÃ¡lida"
 msgid "Unsupported authentication method"
 msgstr "MÃ©todo de autenticaciÃ³n no soportado"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:105
+#: ../addressbook/gui/widgets/eab-gui-util.c:107
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1565,7 +1567,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:114
+#: ../addressbook/gui/widgets/eab-gui-util.c:116
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1574,7 +1576,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:126
+#: ../addressbook/gui/widgets/eab-gui-util.c:128
 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."
@@ -1583,7 +1585,7 @@ msgstr ""
 "LDAP en Evolution debe tener instalado un paquete Evolution con LDAP "
 "activado."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:135
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1591,11 +1593,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:143
+#: ../addressbook/gui/widgets/eab-gui-util.c:145
 msgid "Detailed error message:"
 msgstr "Detalle del mensaje de error:"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:166
+#: ../addressbook/gui/widgets/eab-gui-util.c:168
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -1608,7 +1610,7 @@ msgstr ""
 "aumente 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:172
+#: ../addressbook/gui/widgets/eab-gui-util.c:174
 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"
@@ -1620,46 +1622,46 @@ msgstr ""
 "Haga su bÃºsqueda mÃ¡s especÃfica o aumente el lÃmite de tiempo en las\n"
 "opciones del servidor de directorios para esta libreta de direcciones."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:178
+#: ../addressbook/gui/widgets/eab-gui-util.c:180
 msgid "The backend for this address book was unable to parse this query."
 msgstr ""
 "El backend de esta libreta de direcciones no pudo analizar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:181
+#: ../addressbook/gui/widgets/eab-gui-util.c:183
 msgid "The backend for this address book refused to perform this query."
 msgstr ""
 "El backend para esta libreta de direcciones rehusÃ³ a efectuar esta consulta."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:184
+#: ../addressbook/gui/widgets/eab-gui-util.c:186
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completÃ³ con Ã©xito."
 
 #. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:206
+#: ../addressbook/gui/widgets/eab-gui-util.c:208
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#: ../addressbook/gui/widgets/eab-gui-util.c:245
 msgid "Select Address Book"
 msgstr "Seleccione la libreta de direcciones"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:304
+#: ../addressbook/gui/widgets/eab-gui-util.c:306
 msgid "list"
 msgstr "lista"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:428
+#: ../addressbook/gui/widgets/eab-gui-util.c:433
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:430
+#: ../addressbook/gui/widgets/eab-gui-util.c:435
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:433
+#: ../addressbook/gui/widgets/eab-gui-util.c:438
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:435
+#: ../addressbook/gui/widgets/eab-gui-util.c:440
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
@@ -1792,21 +1794,22 @@ msgstr "Error no tratado"
 msgid "Accessing LDAP Server anonymously"
 msgstr "Accediendo al servidor LDAP anÃ³nimamente"
 
-#: ../addressbook/util/addressbook.c:208
+#: ../addressbook/util/addressbook.c:210
 #: ../plugins/groupwise-features/camel-gw-listener.c:530
 msgid "Failed to authenticate.\n"
 msgstr "No es posible autenticar.\n"
 
-#: ../addressbook/util/addressbook.c:215
+#: ../addressbook/util/addressbook.c:217
 #: ../plugins/groupwise-features/camel-gw-listener.c:510
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Introduzca la contraseÃ±a para %s (usuario %s)"
 
-#: ../addressbook/util/addressbook.c:223
+#: ../addressbook/util/addressbook.c:225
 #: ../calendar/common/authentication.c:51
+#: ../plugins/caldav/caldav-browse-server.c:810
 #: ../plugins/google-account-setup/google-source.c:518
-#: ../plugins/publish-calendar/publish-calendar.c:215
+#: ../plugins/publish-calendar/publish-calendar.c:328
 #: ../smime/gui/component.c:49
 msgid "Enter password"
 msgstr "Introduzca contraseÃ±a"
@@ -1895,7 +1898,6 @@ msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgstr "Â¿Seguro que quiere borrar la cita titulada Â«{0}Â»?"
 
 #: ../calendar/calendar.error.xml.h:17
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgstr "Â¿Seguro que quiere borrar la reuniÃ³n titulada Â«{0}Â»?"
 
@@ -2054,7 +2056,6 @@ msgid "Save Appointment"
 msgstr "Guardar cita"
 
 #: ../calendar/calendar.error.xml.h:51
-#| msgid "New Meeting"
 msgid "Save Meeting"
 msgstr "Guardar reuniÃ³n"
 
@@ -2153,7 +2154,6 @@ msgid "Would you like to save your changes to this appointment?"
 msgstr "Â¿Desea guardar los cambios de esta cita?"
 
 #: ../calendar/calendar.error.xml.h:72
-#| msgid "Would you like to save your changes to this memo?"
 msgid "Would you like to save your changes to this meeting?"
 msgstr "Â¿Quiere guardar los cambios de esta reuniÃ³n?"
 
@@ -2207,7 +2207,6 @@ msgid "You have changed this appointment, but not yet saved it."
 msgstr "Ha cambiado esta cita, pero no la ha guardado aÃºn."
 
 #: ../calendar/calendar.error.xml.h:83
-#| msgid "You have changed this task, but not yet saved it."
 msgid "You have changed this meeting, but not yet saved it."
 msgstr "Ha realizado cambios en esta reuniÃ³n, pero no la ha guardado aÃºn."
 
@@ -2262,28 +2261,28 @@ msgstr "{0}."
 msgid "Split Multi-Day Events:"
 msgstr "Dividir acontecimientos de dÃas mÃºltiples:"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1517
-#: ../calendar/conduits/calendar/calendar-conduit.c:1518
-#: ../calendar/conduits/memo/memo-conduit.c:811
-#: ../calendar/conduits/memo/memo-conduit.c:812
-#: ../calendar/conduits/todo/todo-conduit.c:1011
-#: ../calendar/conduits/todo/todo-conduit.c:1012
+#: ../calendar/conduits/calendar/calendar-conduit.c:1532
+#: ../calendar/conduits/calendar/calendar-conduit.c:1533
+#: ../calendar/conduits/memo/memo-conduit.c:821
+#: ../calendar/conduits/memo/memo-conduit.c:822
+#: ../calendar/conduits/todo/todo-conduit.c:1022
+#: ../calendar/conduits/todo/todo-conduit.c:1023
 msgid "Could not start evolution-data-server"
 msgstr "No se ha podido iniciar el servidor evolution-data-server"
 
-#: ../calendar/conduits/calendar/calendar-conduit.c:1625
-#: ../calendar/conduits/calendar/calendar-conduit.c:1628
+#: ../calendar/conduits/calendar/calendar-conduit.c:1640
+#: ../calendar/conduits/calendar/calendar-conduit.c:1643
 msgid "Could not read pilot's Calendar application block"
 msgstr ""
 "No es posible leer informaciÃ³n de la aplicaciÃ³n de calendario del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:905
-#: ../calendar/conduits/memo/memo-conduit.c:908
+#: ../calendar/conduits/memo/memo-conduit.c:915
+#: ../calendar/conduits/memo/memo-conduit.c:918
 msgid "Could not read pilot's Memo application block"
 msgstr "No es posible leer los datos de la aplicaciÃ³n Memo del Pilot"
 
-#: ../calendar/conduits/memo/memo-conduit.c:952
-#: ../calendar/conduits/memo/memo-conduit.c:955
+#: ../calendar/conduits/memo/memo-conduit.c:962
+#: ../calendar/conduits/memo/memo-conduit.c:965
 msgid "Could not write pilot's Memo application block"
 msgstr "No es posible escribir los datos de la aplicaciÃ³n Memo del Pilot"
 
@@ -2291,13 +2290,13 @@ msgstr "No es posible escribir los datos de la aplicaciÃ³n Memo del Pilot"
 msgid "Default Priority:"
 msgstr "Prioridad predeterminada:"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1095
-#: ../calendar/conduits/todo/todo-conduit.c:1098
+#: ../calendar/conduits/todo/todo-conduit.c:1106
+#: ../calendar/conduits/todo/todo-conduit.c:1109
 msgid "Could not read pilot's ToDo application block"
 msgstr "No es posible leer los datos de la aplicaciÃ³n ToDo del Pilot"
 
-#: ../calendar/conduits/todo/todo-conduit.c:1140
-#: ../calendar/conduits/todo/todo-conduit.c:1143
+#: ../calendar/conduits/todo/todo-conduit.c:1151
+#: ../calendar/conduits/todo/todo-conduit.c:1154
 msgid "Could not write pilot's ToDo application block"
 msgstr "No es posible escribir el bloque de aplicaciÃ³n ToDo del Pilot"
 
@@ -2311,7 +2310,7 @@ msgstr[1] "minutos"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:8
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 #: ../calendar/gui/dialogs/event-page.ui.h:20 ../filter/filter.ui.h:15
-#: ../plugins/caldav/caldav-source.c:449
+#: ../plugins/caldav/caldav-source.c:496
 #: ../plugins/calendar-file/calendar-file.c:294
 #: ../plugins/calendar-http/calendar-http.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:515
@@ -2337,9 +2336,9 @@ msgstr "Descartar _todo"
 
 #. Location
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:3
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1576
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1582
-#: ../calendar/gui/e-itip-control.c:1163
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1575
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1581
+#: ../calendar/gui/e-itip-control.c:1162
 #: ../plugins/itip-formatter/itip-view.c:1031
 msgid "Location:"
 msgstr "Lugar:"
@@ -2357,7 +2356,7 @@ msgstr "_Descartar"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:6 ../filter/filter.ui.h:10
 #: ../mail/e-mail-browser.c:111
 #: ../plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1570
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
@@ -2373,8 +2372,8 @@ msgstr "lugar de la cita"
 #: ../calendar/gui/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 #: ../calendar/gui/dialogs/event-page.ui.h:21 ../filter/filter.ui.h:17
-#: ../modules/addressbook/ldap-config.ui.h:32
-#: ../plugins/caldav/caldav-source.c:448
+#: ../modules/addressbook/ldap-config.ui.h:34
+#: ../plugins/caldav/caldav-source.c:495
 #: ../plugins/calendar-file/calendar-file.c:293
 #: ../plugins/calendar-http/calendar-http.c:323
 #: ../plugins/calendar-weather/calendar-weather.c:514
@@ -2383,32 +2382,32 @@ msgstr "lugar de la cita"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1437
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1559
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1436
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1558
 msgid "No summary available."
 msgstr "No hay resumen disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1446
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1448
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1445
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1447
 msgid "No description available."
 msgstr "No hay descripciÃ³n disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1456
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1455
 msgid "No location information available."
 msgstr "No hay informaciÃ³n del lugar disponible."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1499
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1498
 #, c-format
 msgid "You have %d alarms"
 msgstr "Tiene %d alertas"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1671
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1699
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1670
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1698
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warning"
 msgstr "Advertencia"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1675
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1674
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -2420,7 +2419,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrarÃ¡ un diÃ¡logo de recordatorio normal."
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1705
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1704
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2437,7 +2436,7 @@ msgstr ""
 "\n"
 "Â¿EstÃ¡ seguro que quiere ejecutar este programa?"
 
-#: ../calendar/gui/alarm-notify/alarm-queue.c:1719
+#: ../calendar/gui/alarm-notify/alarm-queue.c:1718
 msgid "Do not ask me about this program again."
 msgstr "No preguntar otra vez sobre este programa."
 
@@ -3163,10 +3162,10 @@ msgstr "CategorÃa"
 msgid "Classification"
 msgstr "ClasificaciÃ³n"
 
-#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:262
-#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:695
+#: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/e-cal-list-view.c:264
+#: ../calendar/gui/e-cal-model.c:536 ../calendar/gui/e-calendar-table.c:440
 #: ../calendar/gui/memotypes.xml.h:6
-#: ../plugins/email-custom-header/email-custom-header.c:326
+#: ../plugins/email-custom-header/email-custom-header.c:325
 #: ../widgets/misc/e-send-options.ui.h:2
 msgid "Confidential"
 msgstr "Confidencial"
@@ -3196,9 +3195,9 @@ msgstr "Existen"
 
 #: ../calendar/gui/caltypes.xml.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:9
-#: ../plugins/publish-calendar/publish-calendar.c:720
+#: ../plugins/publish-calendar/publish-calendar.c:833
 #: ../plugins/publish-calendar/publish-calendar.ui.h:8
-#: ../plugins/save-calendar/csv-format.c:370
+#: ../plugins/save-calendar/csv-format.c:368
 msgid "Location"
 msgstr "Lugar"
 
@@ -3207,15 +3206,15 @@ msgstr "Lugar"
 msgid "Organizer"
 msgstr "Organizador"
 
-#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:261
-#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:694
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.c:263
+#: ../calendar/gui/e-cal-model.c:534 ../calendar/gui/e-calendar-table.c:439
 #: ../calendar/gui/memotypes.xml.h:12
 msgid "Private"
 msgstr "Privado"
 
-#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:260
+#: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/e-cal-list-view.c:262
 #: ../calendar/gui/e-cal-model.c:525 ../calendar/gui/e-cal-model.c:532
-#: ../calendar/gui/e-calendar-table.c:693 ../calendar/gui/memotypes.xml.h:13
+#: ../calendar/gui/e-calendar-table.c:438 ../calendar/gui/memotypes.xml.h:13
 msgid "Public"
 msgstr "PÃºblico"
 
@@ -3230,7 +3229,7 @@ msgstr "RepeticiÃ³n"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-memo-table.etspec.h:6 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:22
-#: ../plugins/save-calendar/csv-format.c:356
+#: ../plugins/save-calendar/csv-format.c:354
 msgid "Summary"
 msgstr "Resumen"
 
@@ -3351,8 +3350,8 @@ msgstr "dÃa(s)"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:17 ../filter/filter.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:334
-#: ../plugins/caldav/caldav-source.c:450
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
+#: ../plugins/caldav/caldav-source.c:497
 #: ../plugins/calendar-file/calendar-file.c:295
 #: ../plugins/calendar-http/calendar-http.c:325
 #: ../plugins/calendar-weather/calendar-weather.c:516
@@ -3404,13 +3403,13 @@ msgstr "Alertas"
 #: ../calendar/gui/dialogs/event-page.c:2940
 #: ../calendar/gui/e-cal-model-tasks.c:727
 #: ../calendar/gui/e-day-view-time-item.c:798
-#: ../calendar/gui/e-itip-control.c:1148 ../filter/e-filter-rule.c:739
+#: ../calendar/gui/e-itip-control.c:1147 ../filter/e-filter-rule.c:744
 #: ../mail/em-account-editor.c:865 ../mail/em-account-editor.c:1674
 #: ../modules/mail/e-mail-junk-hook.c:88
 #: ../plugins/calendar-weather/calendar-weather.c:324
 #: ../plugins/calendar-weather/calendar-weather.c:378
-#: ../plugins/email-custom-header/email-custom-header.c:380
-#: ../plugins/itip-formatter/itip-formatter.c:2297
+#: ../plugins/email-custom-header/email-custom-header.c:379
+#: ../plugins/itip-formatter/itip-formatter.c:2301
 #: ../widgets/misc/e-account-tree-view.c:124 ../widgets/misc/e-dateedit.c:1677
 #: ../widgets/misc/e-dateedit.c:1894 ../widgets/misc/e-send-options.ui.h:11
 #: ../widgets/misc/e-signature-combo-box.c:75
@@ -3509,9 +3508,9 @@ msgstr "viernes"
 #: ../calendar/gui/dialogs/calendar-setup.c:389
 #: ../mail/em-folder-properties.c:283 ../mail/mail-config.ui.h:53
 #: ../modules/addressbook/addressbook-config.c:985
-#: ../plugins/itip-formatter/itip-formatter.c:2651
+#: ../plugins/itip-formatter/itip-formatter.c:2655
 #: ../plugins/publish-calendar/publish-calendar.ui.h:7
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "General"
 msgstr "General"
 
@@ -3639,7 +3638,7 @@ msgid "Wee_k starts on:"
 msgstr "La sema_na empieza en:"
 
 #: ../calendar/gui/dialogs/cal-prefs-dialog.ui.h:47
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -3722,7 +3721,7 @@ msgid "_Type:"
 msgstr "_Tipo:"
 
 #: ../calendar/gui/dialogs/calendar-setup.c:226 ../mail/mail-config.ui.h:146
-#: ../modules/addressbook/ldap-config.ui.h:25
+#: ../modules/addressbook/ldap-config.ui.h:27
 #: ../plugins/groupwise-features/properties.ui.h:11
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-signature-script-dialog.c:282
@@ -3927,13 +3926,13 @@ msgid "_Classification"
 msgstr "_ClasificaciÃ³n"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1072 ../mail/e-mail-browser.c:104
-#: ../shell/e-shell-window-actions.c:1649
+#: ../shell/e-shell-window-actions.c:1577
 #: ../widgets/misc/e-signature-editor.c:214
 msgid "_File"
 msgstr "_Archivo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1079
-#: ../shell/e-shell-window-actions.c:1656
+#: ../shell/e-shell-window-actions.c:1584
 msgid "_Help"
 msgstr "Ay_uda"
 
@@ -3946,7 +3945,7 @@ msgid "_Options"
 msgstr "_Opciones"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1100 ../mail/e-mail-browser.c:118
-#: ../shell/e-shell-window-actions.c:1691
+#: ../shell/e-shell-window-actions.c:1619
 msgid "_View"
 msgstr "_Ver"
 
@@ -4392,8 +4391,8 @@ msgid "Unable to open memos in '%s'."
 msgstr "No es posible abrir las notas en Â«%sÂ»."
 
 #: ../calendar/gui/dialogs/memo-page.c:1044 ../em-format/em-format-quote.c:224
-#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2235
-#: ../mail/em-format-html.c:2293 ../mail/em-format-html.c:2318
+#: ../em-format/em-format.c:961 ../mail/em-format-html.c:2247
+#: ../mail/em-format-html.c:2305 ../mail/em-format-html.c:2330
 #: ../mail/message-list.etspec.h:20 ../modules/mail/em-mailer-prefs.c:79
 msgid "To"
 msgstr "Para"
@@ -4636,76 +4635,80 @@ msgstr "La fecha de terminaciÃ³n es errÃ³nea"
 msgid "Web Page"
 msgstr "PÃ¡gina web"
 
-#. Pass TRUE as is_utc, so it gets converted to the current
-#. timezone.
-#: ../calendar/gui/dialogs/task-details-page.ui.h:2
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:4
 #: ../calendar/gui/e-cal-component-preview.c:290
 #: ../calendar/gui/e-cal-model-tasks.c:463
 #: ../calendar/gui/e-cal-model-tasks.c:733
 #: ../calendar/gui/e-calendar-table.c:213
 #: ../calendar/gui/e-calendar-table.c:224
-#: ../calendar/gui/e-calendar-table.c:790 ../calendar/gui/e-itip-control.c:934
+#: ../calendar/gui/e-calendar-table.c:535 ../calendar/gui/e-itip-control.c:932
 #: ../calendar/gui/e-meeting-store.c:190 ../calendar/gui/e-meeting-store.c:213
 #: ../calendar/gui/print.c:2616 ../calendar/gui/tasktypes.xml.h:9
-#: ../plugins/save-calendar/csv-format.c:360
+#: ../plugins/save-calendar/csv-format.c:358
 msgid "Completed"
 msgstr "Terminado"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:3
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:6
 #: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-calendar-table.c:715 ../calendar/gui/tasktypes.xml.h:14
-#: ../mail/message-list.c:1081 ../widgets/misc/e-send-options.ui.h:8
+#: ../calendar/gui/e-calendar-table.c:460 ../calendar/gui/tasktypes.xml.h:14
+#: ../mail/message-list.c:1100 ../widgets/misc/e-send-options.ui.h:8
 msgid "High"
 msgstr "Alta"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:4
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:8
 #: ../calendar/gui/e-cal-component-preview.c:287
 #: ../calendar/gui/e-cal-model-tasks.c:461
 #: ../calendar/gui/e-cal-model-tasks.c:731
 #: ../calendar/gui/e-cal-model-tasks.c:808
 #: ../calendar/gui/e-calendar-table.c:211
 #: ../calendar/gui/e-calendar-table.c:222
-#: ../calendar/gui/e-calendar-table.c:789 ../calendar/gui/print.c:2613
+#: ../calendar/gui/e-calendar-table.c:534 ../calendar/gui/print.c:2613
 msgid "In Progress"
 msgstr "En proceso"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:5
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:10
 #: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-calendar-table.c:717 ../calendar/gui/tasktypes.xml.h:16
-#: ../mail/message-list.c:1079 ../widgets/misc/e-send-options.ui.h:9
+#: ../calendar/gui/e-calendar-table.c:462 ../calendar/gui/tasktypes.xml.h:16
+#: ../mail/message-list.c:1098 ../widgets/misc/e-send-options.ui.h:9
 msgid "Low"
 msgstr "Baja"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:7
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:13
 #: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:716
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1080
+#: ../calendar/gui/e-cal-model.c:1280 ../calendar/gui/e-calendar-table.c:461
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/message-list.c:1099
 #: ../widgets/misc/e-send-options.ui.h:12
 msgid "Normal"
 msgstr "Normal"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:8
+#. To Translators: This is task status
+#: ../calendar/gui/dialogs/task-details-page.ui.h:15
 #: ../calendar/gui/e-cal-component-preview.c:297
 #: ../calendar/gui/e-cal-model-tasks.c:459
 #: ../calendar/gui/e-cal-model-tasks.c:729
 #: ../calendar/gui/e-calendar-table.c:209
 #: ../calendar/gui/e-calendar-table.c:220
-#: ../calendar/gui/e-calendar-table.c:788 ../calendar/gui/print.c:2610
+#: ../calendar/gui/e-calendar-table.c:533 ../calendar/gui/print.c:2610
 #: ../calendar/gui/tasktypes.xml.h:18
 msgid "Not Started"
 msgstr "Sin comenzar"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:9
+#: ../calendar/gui/dialogs/task-details-page.ui.h:16
 msgid "P_ercent complete:"
 msgstr "_Porcentaje completado:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:10
+#: ../calendar/gui/dialogs/task-details-page.ui.h:17
 msgid "Stat_us:"
 msgstr "_Estado:"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. Status: Accepted: X   Declined: Y   ...
-#: ../calendar/gui/dialogs/task-details-page.ui.h:11
+#: ../calendar/gui/dialogs/task-details-page.ui.h:18
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-calendar-view.c:1590
 #: ../calendar/gui/e-meeting-list-view.c:603
@@ -4715,22 +4718,23 @@ msgstr "_Estado:"
 msgid "Status"
 msgstr "Estado"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-calendar-table.c:718 ../calendar/gui/tasktypes.xml.h:24
+#. To Translators: This is task priority
+#: ../calendar/gui/dialogs/task-details-page.ui.h:20
+#: ../calendar/gui/e-calendar-table.c:463 ../calendar/gui/tasktypes.xml.h:24
 #: ../widgets/misc/e-send-options.ui.h:23
 msgid "Undefined"
 msgstr "Sin definir"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:13
+#: ../calendar/gui/dialogs/task-details-page.ui.h:21
 msgid "_Date completed:"
 msgstr "_Fecha de terminaciÃ³n:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:14
+#: ../calendar/gui/dialogs/task-details-page.ui.h:22
 #: ../widgets/misc/e-send-options.ui.h:33
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: ../calendar/gui/dialogs/task-details-page.ui.h:15
+#: ../calendar/gui/dialogs/task-details-page.ui.h:23
 msgid "_Web Page:"
 msgstr "PÃ¡gina _web:"
 
@@ -4869,7 +4873,7 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:653
+#: ../calendar/gui/e-cal-component-preview.c:190 ../filter/e-filter-rule.c:658
 msgid "Untitled"
 msgstr "Sin tÃtulo"
 
@@ -4878,7 +4882,7 @@ msgid "Categories:"
 msgstr "CategorÃas:"
 
 #: ../calendar/gui/e-cal-component-preview.c:235
-#: ../calendar/gui/e-itip-control.c:1152 ../calendar/gui/e-itip-control.ui.h:9
+#: ../calendar/gui/e-itip-control.c:1151 ../calendar/gui/e-itip-control.ui.h:9
 msgid "Summary:"
 msgstr "Resumen:"
 
@@ -4893,7 +4897,7 @@ msgstr "Fecha de vencimiento:"
 
 #. Status
 #: ../calendar/gui/e-cal-component-preview.c:283
-#: ../calendar/gui/e-itip-control.c:1177
+#: ../calendar/gui/e-itip-control.c:1176
 #: ../plugins/itip-formatter/itip-view.c:1062
 msgid "Status:"
 msgstr "Estado:"
@@ -4903,7 +4907,7 @@ msgid "Priority:"
 msgstr "Prioridad:"
 
 #: ../calendar/gui/e-cal-component-preview.c:335
-#: ../calendar/gui/e-itip-control.c:1215 ../calendar/gui/e-itip-control.ui.h:4
+#: ../calendar/gui/e-itip-control.c:1214 ../calendar/gui/e-itip-control.ui.h:4
 #: ../mail/mail-config.ui.h:34
 msgid "Description:"
 msgstr "DescripciÃ³n:"
@@ -4915,7 +4919,7 @@ msgstr "PÃ¡gina web:"
 #: ../calendar/gui/e-cal-list-view.etspec.h:2
 #: ../calendar/gui/e-calendar-table.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../plugins/save-calendar/csv-format.c:361
+#: ../plugins/save-calendar/csv-format.c:359
 msgid "Created"
 msgstr "Creado"
 
@@ -4935,12 +4939,12 @@ msgid "Start Date"
 msgstr "Fecha de inicio"
 
 #: ../calendar/gui/e-cal-model-calendar.c:187
-#: ../calendar/gui/e-calendar-table.c:767
+#: ../calendar/gui/e-calendar-table.c:512
 msgid "Free"
 msgstr "Libre"
 
 #: ../calendar/gui/e-cal-model-calendar.c:190
-#: ../calendar/gui/e-calendar-table.c:768
+#: ../calendar/gui/e-calendar-table.c:513
 #: ../calendar/gui/e-meeting-time-sel.c:543
 msgid "Busy"
 msgstr "Ocupada"
@@ -4971,25 +4975,25 @@ msgid "No"
 msgstr "No"
 
 #: ../calendar/gui/e-cal-model.c:363 ../calendar/gui/gnome-cal.c:524
-#: ../shell/e-shell.c:791
+#: ../shell/e-shell.c:836
 msgid "Shell Settings"
 msgstr "ConfiguraciÃ³n de Shell"
 
 #: ../calendar/gui/e-cal-model.c:364 ../calendar/gui/gnome-cal.c:525
-#: ../shell/e-shell.c:792
+#: ../shell/e-shell.c:837
 msgid "Application-wide settings"
 msgstr "Ajustes globales de la aplicaciÃ³n"
 
 #. This is the default filename used for temporary file creation
-#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1198
-#: ../calendar/gui/e-itip-control.c:1337
+#: ../calendar/gui/e-cal-model.c:538 ../calendar/gui/e-itip-control.c:1197
+#: ../calendar/gui/e-itip-control.c:1336
 #: ../calendar/gui/e-meeting-list-view.c:163
 #: ../calendar/gui/e-meeting-list-view.c:177
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:155
 #: ../calendar/gui/e-meeting-store.c:218 ../calendar/gui/print.c:975
-#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:951
+#: ../calendar/gui/print.c:992 ../e-util/e-charset.c:52 ../mail/em-utils.c:930
 #: ../plugins/itip-formatter/itip-formatter.c:461
-#: ../plugins/itip-formatter/itip-formatter.c:2322
+#: ../plugins/itip-formatter/itip-formatter.c:2326
 #: ../plugins/plugin-manager/plugin-manager.c:89
 msgid "Unknown"
 msgstr "Desconocido"
@@ -5007,100 +5011,101 @@ msgstr "Asignado"
 msgid "Opening %s"
 msgstr "Abriendo %s"
 
-#: ../calendar/gui/e-calendar-table.c:328 ../calendar/gui/e-memo-table.c:261
-msgid "* No Summary *"
-msgstr "* Sin resumen *"
-
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
-#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-table.c:364
-#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:297
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizador: %s <%s>"
-
-#. With SunOne accounts, there may be no ':' in organiser.value
-#. With SunOne accouts, there may be no ':' in organiser.value
-#. With SunOne accounts, there may be no ':' in organiser.value
-#: ../calendar/gui/e-calendar-table.c:367
-#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:300
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizador: %s"
-
-#: ../calendar/gui/e-calendar-table.c:406 ../calendar/gui/e-memo-table.c:339
-msgid "Start: "
-msgstr "Empieza: "
-
-#: ../calendar/gui/e-calendar-table.c:424 ../calendar/gui/e-memo-table.c:357
-msgid "Due: "
-msgstr "Vence: "
-
-#: ../calendar/gui/e-calendar-table.c:737
+#: ../calendar/gui/e-calendar-table.c:482
 msgid "0%"
 msgstr "0%"
 
-#: ../calendar/gui/e-calendar-table.c:738
+#: ../calendar/gui/e-calendar-table.c:483
 msgid "10%"
 msgstr "10%"
 
-#: ../calendar/gui/e-calendar-table.c:739
+#: ../calendar/gui/e-calendar-table.c:484
 msgid "20%"
 msgstr "20%"
 
-#: ../calendar/gui/e-calendar-table.c:740
+#: ../calendar/gui/e-calendar-table.c:485
 msgid "30%"
 msgstr "30%"
 
-#: ../calendar/gui/e-calendar-table.c:741
+#: ../calendar/gui/e-calendar-table.c:486
 msgid "40%"
 msgstr "40%"
 
-#: ../calendar/gui/e-calendar-table.c:742
+#: ../calendar/gui/e-calendar-table.c:487
 msgid "50%"
 msgstr "50%"
 
-#: ../calendar/gui/e-calendar-table.c:743
+#: ../calendar/gui/e-calendar-table.c:488
 msgid "60%"
 msgstr "60%"
 
-#: ../calendar/gui/e-calendar-table.c:744
+#: ../calendar/gui/e-calendar-table.c:489
 msgid "70%"
 msgstr "70%"
 
-#: ../calendar/gui/e-calendar-table.c:745
+#: ../calendar/gui/e-calendar-table.c:490
 msgid "80%"
 msgstr "80%"
 
-#: ../calendar/gui/e-calendar-table.c:746
+#: ../calendar/gui/e-calendar-table.c:491
 msgid "90%"
 msgstr "90%"
 
-#: ../calendar/gui/e-calendar-table.c:747
+#: ../calendar/gui/e-calendar-table.c:492
 msgid "100%"
 msgstr "100%"
 
-#: ../calendar/gui/e-calendar-table.c:855 ../calendar/gui/print.c:2014
+#: ../calendar/gui/e-calendar-table.c:583 ../calendar/gui/print.c:2014
 #: ../calendar/importers/icalendar-importer.c:76
 #: ../calendar/importers/icalendar-importer.c:749
-#: ../modules/calendar/e-cal-shell-content.c:432
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
-#: ../modules/calendar/e-task-shell-view.c:432
+#: ../modules/calendar/e-cal-shell-content.c:428
+#: ../modules/calendar/e-task-shell-view-actions.c:282
+#: ../modules/calendar/e-task-shell-view-actions.c:297
+#: ../modules/calendar/e-task-shell-view.c:446
+#: ../plugins/caldav/caldav-browse-server.c:431
 #: ../plugins/groupwise-features/camel-gw-listener.c:421
-#: ../plugins/groupwise-features/camel-gw-listener.c:564
+#: ../plugins/groupwise-features/camel-gw-listener.c:566
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:12
 msgid "Tasks"
 msgstr "Tareas"
 
-#: ../calendar/gui/e-calendar-table.c:1097
-#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:883
+#: ../calendar/gui/e-calendar-table.c:661 ../calendar/gui/e-memo-table.c:456
+msgid "* No Summary *"
+msgstr "* Sin resumen *"
+
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
+#. To Translators: It will display "Organizer: NameOfTheUser <email ofuser com>"
+#: ../calendar/gui/e-calendar-table.c:697
+#: ../calendar/gui/e-calendar-view.c:1682 ../calendar/gui/e-memo-table.c:492
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizador: %s <%s>"
+
+#. With SunOne accounts, there may be no ':' in organiser.value
+#. With SunOne accouts, there may be no ':' in organiser.value
+#. With SunOne accounts, there may be no ':' in organiser.value
+#: ../calendar/gui/e-calendar-table.c:700
+#: ../calendar/gui/e-calendar-view.c:1686 ../calendar/gui/e-memo-table.c:495
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizador: %s"
+
+#: ../calendar/gui/e-calendar-table.c:739 ../calendar/gui/e-memo-table.c:534
+msgid "Start: "
+msgstr "Empieza: "
+
+#: ../calendar/gui/e-calendar-table.c:757 ../calendar/gui/e-memo-table.c:552
+msgid "Due: "
+msgstr "Vence: "
+
+#: ../calendar/gui/e-calendar-table.c:1073
+#: ../calendar/gui/e-calendar-view.c:602 ../calendar/gui/e-memo-table.c:859
 msgid "Deleting selected objects"
 msgstr "Borrando los objetos seleccionados"
 
-#: ../calendar/gui/e-calendar-table.c:1366
-#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1081
+#: ../calendar/gui/e-calendar-table.c:1337
+#: ../calendar/gui/e-calendar-view.c:787 ../calendar/gui/e-memo-table.c:1052
 msgid "Updating objects"
 msgstr "Actualizando objetos"
 
@@ -5127,7 +5132,7 @@ msgstr "Fecha de vencimiento"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:20
-#: ../plugins/save-calendar/csv-format.c:367
+#: ../plugins/save-calendar/csv-format.c:365
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -5144,18 +5149,18 @@ msgid "Type"
 msgstr "Tipo"
 
 #: ../calendar/gui/e-calendar-view.c:1537
-#: ../calendar/gui/e-itip-control.c:1183
+#: ../calendar/gui/e-itip-control.c:1182
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:182 ../calendar/gui/e-meeting-store.c:205
-#: ../plugins/itip-formatter/itip-formatter.c:2310
+#: ../plugins/itip-formatter/itip-formatter.c:2314
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-calendar-view.c:1538
-#: ../calendar/gui/e-itip-control.c:1193
+#: ../calendar/gui/e-itip-control.c:1192
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:184 ../calendar/gui/e-meeting-store.c:207
-#: ../plugins/itip-formatter/itip-formatter.c:2316
+#: ../plugins/itip-formatter/itip-formatter.c:2320
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -5169,7 +5174,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-calendar-view.c:1540
 #: ../calendar/gui/e-meeting-list-view.c:202
 #: ../calendar/gui/e-meeting-store.c:188 ../calendar/gui/e-meeting-store.c:211
-#: ../plugins/itip-formatter/itip-formatter.c:2319
+#: ../plugins/itip-formatter/itip-formatter.c:2323
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5241,7 +5246,7 @@ msgstr "%A %e de %B"
 #: ../calendar/gui/e-day-view-top-item.c:874 ../calendar/gui/e-day-view.c:1904
 #: ../calendar/gui/e-week-view-main-item.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:189
-#: ../modules/calendar/e-cal-shell-view-private.c:910
+#: ../modules/calendar/e-cal-shell-view-private.c:912
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
@@ -5253,7 +5258,7 @@ msgstr "%a, %e de %b"
 #: ../calendar/gui/e-day-view-top-item.c:878 ../calendar/gui/e-day-view.c:1920
 #: ../calendar/gui/e-week-view-main-item.c:241
 #: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:946
+#: ../modules/calendar/e-cal-shell-view-private.c:948
 msgid "%d %b"
 msgstr "%e de %b"
 
@@ -5351,22 +5356,22 @@ msgstr "Empieza"
 msgid "Ends"
 msgstr "Termina"
 
-#: ../calendar/gui/e-itip-control.c:945
-#: ../plugins/save-calendar/csv-format.c:365
+#: ../calendar/gui/e-itip-control.c:944
+#: ../plugins/save-calendar/csv-format.c:363
 msgid "Due"
 msgstr "Vence"
 
-#: ../calendar/gui/e-itip-control.c:988 ../calendar/gui/e-itip-control.c:1049
+#: ../calendar/gui/e-itip-control.c:987 ../calendar/gui/e-itip-control.c:1048
 msgid "iCalendar Information"
 msgstr "InformaciÃ³n de iCalendar"
 
 #. Title
-#: ../calendar/gui/e-itip-control.c:1010
+#: ../calendar/gui/e-itip-control.c:1009
 msgid "iCalendar Error"
 msgstr "Error de iCalendar"
 
-#: ../calendar/gui/e-itip-control.c:1082 ../calendar/gui/e-itip-control.c:1098
-#: ../calendar/gui/e-itip-control.c:1109 ../calendar/gui/e-itip-control.c:1126
+#: ../calendar/gui/e-itip-control.c:1081 ../calendar/gui/e-itip-control.c:1097
+#: ../calendar/gui/e-itip-control.c:1108 ../calendar/gui/e-itip-control.c:1125
 #: ../plugins/itip-formatter/itip-view.c:349
 #: ../plugins/itip-formatter/itip-view.c:350
 #: ../plugins/itip-formatter/itip-view.c:437
@@ -5376,7 +5381,7 @@ msgstr "Error de iCalendar"
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
-#: ../calendar/gui/e-itip-control.c:1134
+#: ../calendar/gui/e-itip-control.c:1133
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
@@ -5384,12 +5389,12 @@ msgstr ""
 "<br> Revise la siguiente informaciÃ³n y seleccione una acciÃ³n del menÃº de "
 "abajo."
 
-#: ../calendar/gui/e-itip-control.c:1188
-#: ../plugins/itip-formatter/itip-formatter.c:2313
+#: ../calendar/gui/e-itip-control.c:1187
+#: ../plugins/itip-formatter/itip-formatter.c:2317
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:1278
+#: ../calendar/gui/e-itip-control.c:1277
 msgid ""
 "The meeting has been canceled, however it could not be found in your "
 "calendars"
@@ -5397,274 +5402,274 @@ msgstr ""
 "La reuniÃ³n ha sido cancelada, sin embargo no pudo encontrarse en sus "
 "calendarios"
 
-#: ../calendar/gui/e-itip-control.c:1280
+#: ../calendar/gui/e-itip-control.c:1279
 msgid ""
 "The task has been canceled, however it could not be found in your task lists"
 msgstr ""
 "La tarea ha sido cancelada, sin embargo no pudo encontrarse en sus listas de "
 "tareas"
 
-#: ../calendar/gui/e-itip-control.c:1357
+#: ../calendar/gui/e-itip-control.c:1356
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b> ha publicado informaciÃ³n de reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1358
+#: ../calendar/gui/e-itip-control.c:1357
 msgid "Meeting Information"
 msgstr "InformaciÃ³n de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1364
+#: ../calendar/gui/e-itip-control.c:1363
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b> solicita la presencia de %s en una reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1366
+#: ../calendar/gui/e-itip-control.c:1365
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b> solicita su presencia en una reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1367
+#: ../calendar/gui/e-itip-control.c:1366
 msgid "Meeting Proposal"
 msgstr "Propuesta de reuniÃ³n"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1373
+#: ../calendar/gui/e-itip-control.c:1372
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing meeting."
 msgstr "<b>%s</b> desea apuntarse a una reuniÃ³n existente."
 
-#: ../calendar/gui/e-itip-control.c:1374
+#: ../calendar/gui/e-itip-control.c:1373
 msgid "Meeting Update"
 msgstr "ActualizaciÃ³n de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1378
+#: ../calendar/gui/e-itip-control.c:1377
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b> desea recibir la Ãºltima informaciÃ³n de la reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1379
+#: ../calendar/gui/e-itip-control.c:1378
 msgid "Meeting Update Request"
 msgstr "Solicitud de actualizaciÃ³n de la reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1386
+#: ../calendar/gui/e-itip-control.c:1385
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b> ha contestado a la solicitud de reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1387
+#: ../calendar/gui/e-itip-control.c:1386
 msgid "Meeting Reply"
 msgstr "Respuesta de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1394
+#: ../calendar/gui/e-itip-control.c:1393
 #, c-format
 msgid "<b>%s</b> has canceled a meeting."
 msgstr "<b>%s</b> ha cancelado una reuniÃ³n."
 
-#: ../calendar/gui/e-itip-control.c:1395
+#: ../calendar/gui/e-itip-control.c:1394
 msgid "Meeting Cancelation"
 msgstr "CancelaciÃ³n de reuniÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:1405 ../calendar/gui/e-itip-control.c:1482
-#: ../calendar/gui/e-itip-control.c:1522
+#: ../calendar/gui/e-itip-control.c:1404 ../calendar/gui/e-itip-control.c:1481
+#: ../calendar/gui/e-itip-control.c:1521
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b> ha enviado un mensaje ininteligible."
 
-#: ../calendar/gui/e-itip-control.c:1406
+#: ../calendar/gui/e-itip-control.c:1405
 msgid "Bad Meeting Message"
 msgstr "Mensaje de reuniÃ³n errÃ³neo"
 
-#: ../calendar/gui/e-itip-control.c:1433
+#: ../calendar/gui/e-itip-control.c:1432
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b> ha publicado la informaciÃ³n de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1434
+#: ../calendar/gui/e-itip-control.c:1433
 msgid "Task Information"
 msgstr "InformaciÃ³n de la tarea"
 
-#: ../calendar/gui/e-itip-control.c:1441
+#: ../calendar/gui/e-itip-control.c:1440
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b> pide a %s que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1443
+#: ../calendar/gui/e-itip-control.c:1442
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b> le pide que realice una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1444
+#: ../calendar/gui/e-itip-control.c:1443
 msgid "Task Proposal"
 msgstr "Propuesta de tarea"
 
 #. FIXME Whats going on here?
-#: ../calendar/gui/e-itip-control.c:1450
+#: ../calendar/gui/e-itip-control.c:1449
 #, c-format
 msgid "<b>%s</b> wishes to be added to an existing task."
 msgstr "<b>%s</b> desea aÃ±adirse a una tarea existente."
 
-#: ../calendar/gui/e-itip-control.c:1451
+#: ../calendar/gui/e-itip-control.c:1450
 msgid "Task Update"
 msgstr "ActualizaciÃ³n de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1455
+#: ../calendar/gui/e-itip-control.c:1454
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b> quiere recibir la Ãºltima informaciÃ³n de la tarea."
 
-#: ../calendar/gui/e-itip-control.c:1456
+#: ../calendar/gui/e-itip-control.c:1455
 msgid "Task Update Request"
 msgstr "Solicitud de actualizaciÃ³n de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1463
+#: ../calendar/gui/e-itip-control.c:1462
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b> ha contestado a una asignaciÃ³n de tarea."
 
-#: ../calendar/gui/e-itip-control.c:1464
+#: ../calendar/gui/e-itip-control.c:1463
 msgid "Task Reply"
 msgstr "Respuesta a una tarea"
 
-#: ../calendar/gui/e-itip-control.c:1471
+#: ../calendar/gui/e-itip-control.c:1470
 #, c-format
 msgid "<b>%s</b> has canceled a task."
 msgstr "<b>%s</b> ha cancelado una tarea."
 
-#: ../calendar/gui/e-itip-control.c:1472
+#: ../calendar/gui/e-itip-control.c:1471
 msgid "Task Cancelation"
 msgstr "CancelaciÃ³n de tarea"
 
-#: ../calendar/gui/e-itip-control.c:1483
+#: ../calendar/gui/e-itip-control.c:1482
 msgid "Bad Task Message"
 msgstr "Mensaje de tarea errÃ³neo"
 
-#: ../calendar/gui/e-itip-control.c:1507
+#: ../calendar/gui/e-itip-control.c:1506
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b> ha publicado la informaciÃ³n de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1508
+#: ../calendar/gui/e-itip-control.c:1507
 msgid "Free/Busy Information"
 msgstr "InformaciÃ³n de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1512
+#: ../calendar/gui/e-itip-control.c:1511
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b> pide su informaciÃ³n de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1513
+#: ../calendar/gui/e-itip-control.c:1512
 msgid "Free/Busy Request"
 msgstr "Solicitud de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1517
+#: ../calendar/gui/e-itip-control.c:1516
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b> ha contestado a una solicitud de disponibilidad."
 
-#: ../calendar/gui/e-itip-control.c:1518
+#: ../calendar/gui/e-itip-control.c:1517
 msgid "Free/Busy Reply"
 msgstr "Respuesta sobre disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:1523
+#: ../calendar/gui/e-itip-control.c:1522
 msgid "Bad Free/Busy Message"
 msgstr "Mensaje de disponibilidad errÃ³neo"
 
-#: ../calendar/gui/e-itip-control.c:1599
+#: ../calendar/gui/e-itip-control.c:1598
 msgid "The message does not appear to be properly formed"
 msgstr "El mensaje no parece estar formado correctamente"
 
-#: ../calendar/gui/e-itip-control.c:1658
+#: ../calendar/gui/e-itip-control.c:1657
 msgid "The message contains only unsupported requests."
 msgstr "Este mensaje sÃ³lo contiene solicitudes no soportadas."
 
-#: ../calendar/gui/e-itip-control.c:1691
+#: ../calendar/gui/e-itip-control.c:1690
 msgid "The attachment does not contain a valid calendar message"
 msgstr "El adjunto no contiene un mensaje de calendario vÃ¡lido"
 
-#: ../calendar/gui/e-itip-control.c:1729
+#: ../calendar/gui/e-itip-control.c:1728
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de calendario visibles"
 
-#: ../calendar/gui/e-itip-control.c:1971
+#: ../calendar/gui/e-itip-control.c:1970
 msgid "Update complete\n"
 msgstr "ActualizaciÃ³n terminada\n"
 
-#: ../calendar/gui/e-itip-control.c:2005
+#: ../calendar/gui/e-itip-control.c:2004
 msgid "Object is invalid and cannot be updated\n"
 msgstr "El objeto es invÃ¡lido y no puede ser actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2022
+#: ../calendar/gui/e-itip-control.c:2021
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Esta respuesta no es de un participante. Â¿Desea aÃ±adirlo como participante?"
 
-#: ../calendar/gui/e-itip-control.c:2040
+#: ../calendar/gui/e-itip-control.c:2039
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "El estado del participante no pudo actualizarse debido a un estado invÃ¡lido\n"
 
-#: ../calendar/gui/e-itip-control.c:2064
+#: ../calendar/gui/e-itip-control.c:2063
 msgid "Attendee status updated\n"
 msgstr "Estado del participante actualizado\n"
 
-#: ../calendar/gui/e-itip-control.c:2071
-#: ../plugins/itip-formatter/itip-formatter.c:1406
+#: ../calendar/gui/e-itip-control.c:2070
+#: ../plugins/itip-formatter/itip-formatter.c:1409
 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"
 
-#: ../calendar/gui/e-itip-control.c:2102 ../calendar/gui/e-itip-control.c:2159
+#: ../calendar/gui/e-itip-control.c:2101 ../calendar/gui/e-itip-control.c:2158
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: ../calendar/gui/e-itip-control.c:2108 ../calendar/gui/e-itip-control.c:2167
+#: ../calendar/gui/e-itip-control.c:2107 ../calendar/gui/e-itip-control.c:2166
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo enviarse.\n"
 
-#: ../calendar/gui/e-itip-control.c:2260
+#: ../calendar/gui/e-itip-control.c:2259
 msgid "Choose an action:"
 msgstr "Elija una acciÃ³n:"
 
 #. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-itip-control.c:2289
+#: ../calendar/gui/e-itip-control.c:2288
 #: ../calendar/gui/e-meeting-list-view.c:591
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "Confirmar"
 
-#: ../calendar/gui/e-itip-control.c:2329
+#: ../calendar/gui/e-itip-control.c:2328
 msgid "Update"
 msgstr "Actualizar"
 
-#: ../calendar/gui/e-itip-control.c:2353
+#: ../calendar/gui/e-itip-control.c:2352
 #: ../plugins/groupwise-features/gw-ui.c:331
 msgid "Accept"
 msgstr "Aceptar"
 
-#: ../calendar/gui/e-itip-control.c:2354
+#: ../calendar/gui/e-itip-control.c:2353
 msgid "Tentatively accept"
 msgstr "Aceptar provisionalmente"
 
-#: ../calendar/gui/e-itip-control.c:2355
+#: ../calendar/gui/e-itip-control.c:2354
 #: ../plugins/groupwise-features/gw-ui.c:345
 msgid "Decline"
 msgstr "Rehusar"
 
-#: ../calendar/gui/e-itip-control.c:2380
+#: ../calendar/gui/e-itip-control.c:2379
 msgid "Send Free/Busy Information"
 msgstr "Enviar informaciÃ³n de disponibilidad"
 
-#: ../calendar/gui/e-itip-control.c:2404
+#: ../calendar/gui/e-itip-control.c:2403
 msgid "Update respondent status"
 msgstr "Actualizar el estado del remitente"
 
-#: ../calendar/gui/e-itip-control.c:2428
+#: ../calendar/gui/e-itip-control.c:2427
 msgid "Send Latest Information"
 msgstr "Enviar la Ãºltima informaciÃ³n"
 
-#: ../calendar/gui/e-itip-control.c:2452
-#: ../modules/mail/e-mail-shell-view-actions.c:1166
+#: ../calendar/gui/e-itip-control.c:2451
+#: ../modules/mail/e-mail-shell-view-actions.c:1141
 #: ../widgets/misc/e-activity-proxy.c:299
 msgid "Cancel"
 msgstr "Cancelar"
@@ -5886,11 +5891,12 @@ msgstr "Idioma"
 msgid "Member"
 msgstr "Miembro"
 
-#: ../calendar/gui/e-memo-table.c:638
-#: ../modules/calendar/e-cal-shell-content.c:461
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
-#: ../modules/calendar/e-memo-shell-view.c:285
+#: ../calendar/gui/e-memo-table.c:378
+#: ../modules/calendar/e-cal-shell-content.c:468
+#: ../modules/calendar/e-memo-shell-view-actions.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:266
+#: ../modules/calendar/e-memo-shell-view.c:298
+#: ../plugins/caldav/caldav-browse-server.c:433
 msgid "Memos"
 msgstr "Notas"
 
@@ -6003,16 +6009,16 @@ msgid "calendar view for one or more days"
 msgstr "vista de calendario para uno o mÃ¡s dÃas"
 
 #: ../calendar/gui/ea-gnome-calendar.c:186
-#: ../modules/calendar/e-cal-shell-view-private.c:906
+#: ../modules/calendar/e-cal-shell-view-private.c:908
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
 #: ../calendar/gui/ea-gnome-calendar.c:191
 #: ../calendar/gui/ea-gnome-calendar.c:196
 #: ../calendar/gui/ea-gnome-calendar.c:198
-#: ../modules/calendar/e-cal-shell-view-private.c:913
-#: ../modules/calendar/e-cal-shell-view-private.c:919
-#: ../modules/calendar/e-cal-shell-view-private.c:922
+#: ../modules/calendar/e-cal-shell-view-private.c:915
+#: ../modules/calendar/e-cal-shell-view-private.c:921
+#: ../modules/calendar/e-cal-shell-view-private.c:924
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -6020,10 +6026,10 @@ msgstr "%a, %e de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:221
 #: ../calendar/gui/ea-gnome-calendar.c:227
 #: ../calendar/gui/ea-gnome-calendar.c:229
-#: ../modules/calendar/e-cal-shell-view-private.c:939
-#: ../modules/calendar/e-cal-shell-view-private.c:950
-#: ../modules/calendar/e-cal-shell-view-private.c:957
-#: ../modules/calendar/e-cal-shell-view-private.c:960
+#: ../modules/calendar/e-cal-shell-view-private.c:941
+#: ../modules/calendar/e-cal-shell-view-private.c:952
+#: ../modules/calendar/e-cal-shell-view-private.c:959
+#: ../modules/calendar/e-cal-shell-view-private.c:962
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -6472,7 +6478,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:335
 #: ../calendar/importers/icalendar-importer.c:628
-#: ../plugins/itip-formatter/itip-formatter.c:1818
+#: ../plugins/itip-formatter/itip-formatter.c:1821
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -8211,6 +8217,15 @@ msgstr "Conmutador que indica si se muestra el campo Â«Responder-aÂ»"
 msgid "Save Draft"
 msgstr "Guardar borrador"
 
+# #En conflicto con _Mensaje
+#: ../composer/e-composer-header.c:126
+msgid "Show"
+msgstr "Mostrar"
+
+#: ../composer/e-composer-header.c:132
+msgid "Hide"
+msgstr "Ocultar"
+
 #: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
@@ -8250,19 +8265,17 @@ msgstr "_Para:"
 msgid "_Cc:"
 msgstr "_Cc:"
 
-# #En conflicto con _Mensaje
-#: ../composer/e-composer-header-table.c:969
-msgid "Show CC"
-msgstr "Mostrar Cc"
+#: ../composer/e-composer-header-table.c:969 ../mail/em-filter-i18n.h:8
+msgid "CC"
+msgstr "Cc"
 
 #: ../composer/e-composer-header-table.c:975
 msgid "_Bcc:"
 msgstr "Cc_o:"
 
-# #En conflicto con _Mensaje
-#: ../composer/e-composer-header-table.c:975
-msgid "Show BCC"
-msgstr "Mostrar Cco"
+#: ../composer/e-composer-header-table.c:975 ../mail/em-filter-i18n.h:6
+msgid "BCC"
+msgstr "Cco"
 
 #: ../composer/e-composer-header-table.c:980
 msgid "_Post To:"
@@ -8289,19 +8302,19 @@ msgid "Save draft"
 msgstr "Guardar borrador"
 
 #. Check buttons
-#: ../composer/e-msg-composer.c:189 ../mail/em-utils.c:170
+#: ../composer/e-msg-composer.c:192 ../mail/em-utils.c:149
 #: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../composer/e-msg-composer.c:985
+#: ../composer/e-msg-composer.c:988
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:992
+#: ../composer/e-msg-composer.c:995
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
@@ -8309,15 +8322,15 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1381
+#: ../composer/e-msg-composer.c:1384
 msgid "Unable to reconstruct message from autosave file"
 msgstr "No se pudo reconstruir el mensaje desde el archivo autoguardado"
 
-#: ../composer/e-msg-composer.c:1447 ../composer/e-msg-composer.c:2174
+#: ../composer/e-msg-composer.c:1450 ../composer/e-msg-composer.c:2125
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:3404
+#: ../composer/e-msg-composer.c:3355
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)</"
 "b>"
@@ -8475,9 +8488,9 @@ msgstr "Notificaciones de acontecimientos del calendario"
 msgid "Evolution Alarm Notify"
 msgstr "Notificador de alertas de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:712
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:710
 #: ../plugins/default-mailer/org-gnome-default-mailer.error.xml.h:2
-#: ../shell/e-shell-window-private.c:209
+#: ../shell/e-shell-window-private.c:255
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -8485,7 +8498,7 @@ msgstr "Evolution"
 msgid "Evolution Mail and Calendar"
 msgstr "Correo y calendario de Evolution"
 
-#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:652
+#: ../data/evolution.desktop.in.in.h:3 ../shell/e-shell-window-actions.c:653
 msgid "Groupware Suite"
 msgstr "Suite de trabajo en grupo"
 
@@ -8525,6 +8538,19 @@ msgstr "%sâ?¦"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#: ../e-util/e-alert.c:72 ../e-util/e-alert.c:73
+msgid "Evolution Error"
+msgstr "Error de Evolution"
+
+#: ../e-util/e-alert.c:74 ../e-util/e-alert.c:75
+msgid "Evolution Warning"
+msgstr "Advertencia de Evolution"
+
+#: ../e-util/e-alert.c:638
+#, c-format
+msgid "Internal error, unknown error '%s' requested"
+msgstr "Error interno, solicitado un error desconocido Â«%sÂ»"
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Ã?rabe"
@@ -8600,7 +8626,7 @@ msgstr "visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:193
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1769
 #: ../plugins/itip-formatter/itip-view.c:194
 #: ../widgets/table/e-cell-date-edit.c:304
 msgid "Today"
@@ -8634,20 +8660,6 @@ msgstr "Usar los valores predeterminados del sistema"
 msgid "Format:"
 msgstr "Formato:"
 
-#: ../e-util/e-error.c:77 ../e-util/e-error.c:78
-msgid "Evolution Error"
-msgstr "Error de Evolution"
-
-#: ../e-util/e-error.c:79 ../e-util/e-error.c:80
-msgid "Evolution Warning"
-msgstr "Advertencia de Evolution"
-
-#. setup a dummy error
-#: ../e-util/e-error.c:451
-#, c-format
-msgid "Internal error, unknown error '%s' requested"
-msgstr "Error interno, solicitado un error desconocido Â«%sÂ»"
-
 #: ../e-util/e-file-utils.c:135
 msgid "(Unknown Filename)"
 msgstr "(Nombre del archivo desconocido)"
@@ -8699,39 +8711,39 @@ msgstr "Mensajes de sucesos:"
 msgid "Log Level"
 msgstr "Nivel de sucesos"
 
-#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2627
+#: ../e-util/e-non-intrusive-error-dialog.c:292 ../mail/message-list.c:2623
 #: ../mail/message-list.etspec.h:10
 msgid "Messages"
 msgstr "Mensajes"
 
 #: ../e-util/e-non-intrusive-error-dialog.c:301 ../mail/e-mail-browser.c:97
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1430
 msgid "Close this window"
 msgstr "Cierra esta ventana"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Error"
 msgstr "Error"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:39
+#: ../e-util/e-non-intrusive-error-dialog.h:38
 msgid "Errors"
 msgstr "Errores"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:40
+#: ../e-util/e-non-intrusive-error-dialog.h:39
 msgid "Warnings and Errors"
 msgstr "Avisos y errores"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Debug"
 msgstr "Depurar"
 
-#: ../e-util/e-non-intrusive-error-dialog.h:41
+#: ../e-util/e-non-intrusive-error-dialog.h:40
 msgid "Error, Warnings and Debug messages"
 msgstr "Mensajes de error, avisos y depuraciÃ³n"
 
-#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:474
+#: ../e-util/e-plugin.c:292 ../modules/mail/em-composer-prefs.c:473
 #: ../plugins/plugin-manager/plugin-manager.c:349
-#: ../plugins/publish-calendar/publish-calendar.c:716
+#: ../plugins/publish-calendar/publish-calendar.c:829
 #: ../widgets/misc/e-account-tree-view.c:205
 msgid "Enabled"
 msgstr "Activado"
@@ -8796,12 +8808,12 @@ msgstr "No se pudo abrir el enlace."
 msgid "Could not display help for Evolution."
 msgstr "No se pudo mostrar la ayuda de Evolution."
 
-#: ../e-util/gconf-bridge.c:1222
+#: ../e-util/gconf-bridge.c:1262
 #, c-format
 msgid "GConf error: %s"
 msgstr "Error de GConf: %s"
 
-#: ../e-util/gconf-bridge.c:1233
+#: ../e-util/gconf-bridge.c:1273
 msgid "All further errors shown only on terminal."
 msgstr "En adelante todos los errores sÃ³lo se mostrarÃ¡n en el terminal."
 
@@ -8811,26 +8823,26 @@ msgid "Reply-To"
 msgstr "Responder a"
 
 #: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:962
-#: ../mail/em-format-html.c:2236 ../mail/em-format-html.c:2300
-#: ../mail/em-format-html.c:2321 ../modules/mail/em-mailer-prefs.c:80
+#: ../mail/em-format-html.c:2248 ../mail/em-format-html.c:2312
+#: ../mail/em-format-html.c:2333 ../modules/mail/em-mailer-prefs.c:80
 msgid "Cc"
 msgstr "Cc"
 
 #: ../em-format/em-format-quote.c:224 ../em-format/em-format.c:963
-#: ../mail/em-format-html.c:2237 ../mail/em-format-html.c:2306
-#: ../mail/em-format-html.c:2324 ../modules/mail/em-mailer-prefs.c:81
+#: ../mail/em-format-html.c:2249 ../mail/em-format-html.c:2318
+#: ../mail/em-format-html.c:2336 ../modules/mail/em-mailer-prefs.c:81
 msgid "Bcc"
 msgstr "Cco"
 
 #: ../em-format/em-format-quote.c:356 ../em-format/em-format.c:964
 #: ../mail/e-mail-tag-editor.c:328 ../mail/em-filter-i18n.h:74
 #: ../mail/message-list.etspec.h:18 ../modules/mail/em-mailer-prefs.c:82
-#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1112
+#: ../plugins/groupwise-features/properties.ui.h:7 ../smime/lib/e-cert.c:1125
 msgid "Subject"
 msgstr "Asunto"
 
 #. pseudo-header
-#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2416
+#: ../em-format/em-format-quote.c:367 ../mail/em-format-html.c:2428
 #: ../modules/mail/em-mailer-prefs.c:1131
 msgid "Mailer"
 msgstr "Transporte"
@@ -9017,68 +9029,68 @@ msgstr "%e/%b/%Y"
 msgid "Select a time to compare against"
 msgstr "Seleccione una fecha con la que comparar"
 
-#: ../filter/e-filter-file.c:181
+#: ../filter/e-filter-file.c:184
 msgid "Choose a File"
 msgstr "Elegir un archivo"
 
-#: ../filter/e-filter-rule.c:648
+#: ../filter/e-filter-rule.c:653
 msgid "R_ule name:"
 msgstr "Nombre de la _regla:"
 
-#: ../filter/e-filter-rule.c:677
+#: ../filter/e-filter-rule.c:682
 msgid "Find items that meet the following conditions"
 msgstr "Buscar elementos que cumplen con estos criterios"
 
-#: ../filter/e-filter-rule.c:711
+#: ../filter/e-filter-rule.c:716
 msgid "A_dd Condition"
 msgstr "AÃ±adir a_cciÃ³n"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:722
 msgid "If all conditions are met"
 msgstr "Si se cumplen todos los criterios"
 
-#: ../filter/e-filter-rule.c:717
+#: ../filter/e-filter-rule.c:722
 msgid "If any conditions are met"
 msgstr "Si se cumple algÃºn criterio"
 
-#: ../filter/e-filter-rule.c:719
+#: ../filter/e-filter-rule.c:724
 msgid "_Find items:"
 msgstr "_Buscar elementos:"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:744
 msgid "All related"
 msgstr "Todas las relacionadas"
 
-#: ../filter/e-filter-rule.c:739 ../widgets/misc/e-send-options.ui.h:15
+#: ../filter/e-filter-rule.c:744 ../widgets/misc/e-send-options.ui.h:15
 msgid "Replies"
 msgstr "Respuestas"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:744
 msgid "Replies and parents"
 msgstr "Respuestas y antecesores"
 
-#: ../filter/e-filter-rule.c:739
+#: ../filter/e-filter-rule.c:744
 msgid "No reply or parent"
 msgstr "Sin respuesta o antecesor"
 
-#: ../filter/e-filter-rule.c:741
+#: ../filter/e-filter-rule.c:746
 msgid "I_nclude threads"
 msgstr "I_ncluir conversaciones"
 
-#: ../filter/e-filter-rule.c:1114 ../filter/filter.ui.h:2
-#: ../mail/em-utils.c:321
+#: ../filter/e-filter-rule.c:1119 ../filter/filter.ui.h:2
+#: ../mail/em-utils.c:300
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1114 ../mail/em-utils.c:322
+#: ../filter/e-filter-rule.c:1119 ../mail/em-utils.c:301
 msgid "Outgoing"
 msgstr "Saliente"
 
-#: ../filter/e-rule-editor.c:261
+#: ../filter/e-rule-editor.c:265
 msgid "Add Rule"
 msgstr "AÃ±adir regla"
 
-#: ../filter/e-rule-editor.c:344
+#: ../filter/e-rule-editor.c:352
 msgid "Edit Rule"
 msgstr "Editar regla"
 
@@ -9191,7 +9203,7 @@ msgstr "la hora actual"
 msgid "the time you specify"
 msgstr "la fecha que especifique"
 
-#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:451
+#: ../filter/filter.ui.h:22 ../plugins/caldav/caldav-source.c:498
 #: ../plugins/calendar-file/calendar-file.c:296
 #: ../plugins/calendar-http/calendar-http.c:326
 #: ../plugins/calendar-weather/calendar-weather.c:517
@@ -9205,7 +9217,7 @@ msgstr "semanas"
 msgid "years"
 msgstr "aÃ±os"
 
-#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:993
+#: ../mail/e-mail-attachment-bar.c:121 ../mail/em-format-html-display.c:1001
 #: ../mail/mail-config.ui.h:13 ../mail/message-list.etspec.h:1
 #: ../widgets/misc/e-attachment-paned.c:147
 msgid "Attachment"
@@ -9223,19 +9235,19 @@ msgstr "Vista de icono"
 msgid "List View"
 msgstr "Vista de lista"
 
-#: ../mail/e-mail-browser.c:665
+#: ../mail/e-mail-browser.c:663
 msgid "Shell Module"
 msgstr "Modo de shell"
 
-#: ../mail/e-mail-browser.c:666 ../mail/message-list.c:2511
+#: ../mail/e-mail-browser.c:664 ../mail/message-list.c:2521
 msgid "The mail shell backend"
 msgstr "El Â«backendÂ» de la shell de correo"
 
-#: ../mail/e-mail-browser.c:676
+#: ../mail/e-mail-browser.c:674
 msgid "Show Deleted"
 msgstr "Mostrar borrados"
 
-#: ../mail/e-mail-browser.c:677
+#: ../mail/e-mail-browser.c:675
 msgid "Show deleted messages"
 msgstr "Mostrar los mensajes borrados"
 
@@ -9284,7 +9296,7 @@ msgid "_Later"
 msgstr "_MÃ¡s tarde"
 
 #: ../mail/e-mail-label-manager.c:165
-#: ../modules/mail/e-mail-shell-view-actions.c:552
+#: ../modules/mail/e-mail-shell-view-actions.c:547
 msgid "Add Label"
 msgstr "AÃ±adir etiqueta"
 
@@ -9305,558 +9317,702 @@ msgid "Color"
 msgstr "Color"
 
 #: ../mail/e-mail-local.c:37 ../mail/em-folder-properties.c:367
-#: ../mail/em-folder-tree-model.c:584 ../mail/em-folder-tree.c:2571
+#: ../mail/em-folder-tree-model.c:652 ../mail/em-folder-tree.c:2576
 #: ../modules/mail/e-mail-shell-view-private.c:907
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
-#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:577
+#: ../mail/e-mail-local.c:38 ../mail/em-folder-tree-model.c:645
 msgid "Drafts"
 msgstr "Borradores"
 
-#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:587
+#: ../mail/e-mail-local.c:39 ../mail/em-folder-tree-model.c:655
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
-#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:589
+#: ../mail/e-mail-local.c:40 ../mail/em-folder-tree-model.c:657
 msgid "Sent"
 msgstr "Correo enviado"
 
-#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:580
+#: ../mail/e-mail-local.c:41 ../mail/em-folder-tree-model.c:648
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:2
-#: ../plugins/templates/templates.c:575
+#: ../plugins/templates/templates.c:574
 msgid "Templates"
 msgstr "Plantillas"
 
+#: ../mail/e-mail-migrate.c:953 ../mail/em-filter-i18n.h:30
+msgid "Important"
+msgstr "Importante"
+
+#. green
+#: ../mail/e-mail-migrate.c:956
+msgid "To Do"
+msgstr "Tareas pendientes"
+
+#. blue
+#: ../mail/e-mail-migrate.c:957
+msgid "Later"
+msgstr "MÃ¡s tarde"
+
+#: ../mail/e-mail-migrate.c:1103
+#: ../modules/addressbook/e-book-shell-migrate.c:76
+#: ../modules/calendar/e-cal-shell-migrate.c:123
+#: ../modules/calendar/e-task-shell-migrate.c:90
+msgid "Migrating..."
+msgstr "Migrandoâ?¦"
+
+#: ../mail/e-mail-migrate.c:1136
+msgid "Migration"
+msgstr "MigraciÃ³n"
+
+#: ../mail/e-mail-migrate.c:1176
+#: ../modules/addressbook/e-book-shell-migrate.c:128
+#: ../modules/calendar/e-cal-shell-migrate.c:165
+#: ../modules/calendar/e-task-shell-migrate.c:132
+#, c-format
+msgid "Migrating '%s':"
+msgstr "Migrando Â«%sÂ»:"
+
+#: ../mail/e-mail-migrate.c:1586
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "No es posible crear la carpeta nueva: Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:1614
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "No es posible copiar el la carpeta Â«%sÂ» a Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:1809
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "No es posible buscar buzones existentes en Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:1815 ../mail/e-mail-migrate.c:2912
+msgid "Migrating Folders"
+msgstr "Migrando carpetas"
+
+#: ../mail/e-mail-migrate.c:1816
+msgid ""
+"The location and hierarchy of the Evolution mailbox folders has changed "
+"since Evolution 1.x.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El lugar y jerarquÃa de las carpetas de buzones de correo ha cambiado desde "
+"Evolution 1.x.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#: ../mail/e-mail-migrate.c:2019
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "No es posible abrir los datos antiguos POP keep-on-server Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:2035
+#, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Fallo al crear directorio de datos POP3 keep-on-server Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:2067
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr "No es posible copiar los datos POP3 keep-on-server Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:2538 ../mail/e-mail-migrate.c:2552
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "No es posible crear el almacÃ©n de correo local Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:2913
+msgid ""
+"The summary format of the Evolution mailbox folders has been moved to SQLite "
+"since Evolution 2.24.\n"
+"\n"
+"Please be patient while Evolution migrates your folders..."
+msgstr ""
+"El formato de resÃºmenes de las carpetas del buzÃ³n de Evolution se ha movido "
+"a sqlite desde Evolution 2.24.\n"
+"\n"
+"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+
+#. On This Computer is always first, and Search Folders
+#. * is always last.
+#. create the local source group
+#: ../mail/e-mail-migrate.c:2929 ../mail/e-mail-store.c:225
+#: ../mail/em-folder-tree-model.c:144 ../mail/em-folder-tree-model.c:146
+#: ../mail/mail-vfolder.c:215 ../mail/message-list.c:1582
+#: ../modules/addressbook/e-book-shell-backend.c:125
+#: ../modules/addressbook/e-book-shell-migrate.c:499
+#: ../modules/calendar/e-cal-shell-backend.c:120
+#: ../modules/calendar/e-cal-shell-migrate.c:564
+#: ../modules/calendar/e-memo-shell-backend.c:107
+#: ../modules/calendar/e-memo-shell-migrate.c:102
+#: ../modules/calendar/e-task-shell-backend.c:110
+#: ../modules/calendar/e-task-shell-migrate.c:501
+msgid "On This Computer"
+msgstr "En este equipo"
+
+#: ../mail/e-mail-migrate.c:3010
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "No es posible crear las carpetas de correo local en: Â«%sÂ»: %s"
+
+#: ../mail/e-mail-migrate.c:3028
+#, c-format
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+"No es posible leer la configuraciÃ³n de la instalaciÃ³n anterior de Evolution, "
+"Â«evolution/config.xmldbÂ» no existe o estÃ¡ corrompido."
+
 #. XXX e-error should provide a widget layout and API suitable
 #. *     for packing additional widgets to the right of the alert
 #. *     icon.  But for now, screw it.
-#: ../mail/e-mail-reader-utils.c:107
-#: ../modules/calendar/e-task-shell-view-actions.c:576
+#: ../mail/e-mail-reader-utils.c:105
+#: ../modules/calendar/e-task-shell-view-actions.c:602
 msgid "Do not ask me again"
 msgstr "No preguntarme de nuevo"
 
-#: ../mail/e-mail-reader.c:214 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:206 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:214 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:206 ../mail/em-folder-utils.c:381
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:619 ../mail/em-filter-i18n.h:51
+#: ../mail/e-mail-reader.c:583 ../mail/em-filter-i18n.h:51
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: ../mail/e-mail-reader.c:619 ../mail/em-folder-utils.c:381
+#: ../mail/e-mail-reader.c:583 ../mail/em-folder-utils.c:381
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:837
+#: ../mail/e-mail-reader.c:811
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
 msgstr[1] "Guardar mensajes"
 
-#: ../mail/e-mail-reader.c:1129
+#. To Translators: This is a part of a suggested file name used when saving
+#. a message or multiple messages to an mbox format, when the first message
+#. doesn't have a Subject. The extension ".mbox" is appended to this string,
+#. thus it will be something like "Message.mbox" at the end.
+#: ../mail/e-mail-reader.c:828 ../plugins/groupwise-features/properties.ui.h:5
+#: ../widgets/table/e-table-click-to-add.c:512
+#| msgid "Message"
+msgid "Message"
+msgid_plural "Messages"
+msgstr[0] "Mensaje"
+msgstr[1] "Mensajes"
+
+#: ../mail/e-mail-reader.c:1103
 msgid "A_dd Sender to Address Book"
 msgstr "_AÃ±adir remitente a la libreta"
 
-#: ../mail/e-mail-reader.c:1131
+#: ../mail/e-mail-reader.c:1105
 msgid "Add sender to address book"
 msgstr "AÃ±adir el remitente a la libreta de direcciones"
 
-#: ../mail/e-mail-reader.c:1136
+#: ../mail/e-mail-reader.c:1110
 msgid "Check for _Junk"
 msgstr "Detectar _SPAM"
 
-#: ../mail/e-mail-reader.c:1138
+#: ../mail/e-mail-reader.c:1112
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
 
-#: ../mail/e-mail-reader.c:1145
+#: ../mail/e-mail-reader.c:1119
 msgid "Copy selected messages to the clipboard"
 msgstr "Copiar los mensajes seleccionados al portapapeles"
 
-#: ../mail/e-mail-reader.c:1150
+#: ../mail/e-mail-reader.c:1124
 msgid "_Copy to Folder..."
 msgstr "Copiar a la c_arpetaâ?¦"
 
-#: ../mail/e-mail-reader.c:1152
+#: ../mail/e-mail-reader.c:1126
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1157
+#: ../mail/e-mail-reader.c:1131
 msgid "_Delete Message"
 msgstr "_Borrar el mensaje"
 
-#: ../mail/e-mail-reader.c:1159
+#: ../mail/e-mail-reader.c:1133
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para borrar"
 
-#: ../mail/e-mail-reader.c:1164
+#: ../mail/e-mail-reader.c:1138
 msgid "Filter on Mailing _List..."
 msgstr "Filtro segÃºn la _lista de correoâ?¦"
 
-#: ../mail/e-mail-reader.c:1166
+#: ../mail/e-mail-reader.c:1140
 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:1171
+#: ../mail/e-mail-reader.c:1145
 msgid "Filter on _Recipients..."
 msgstr "Filtro segÃºn los _destinatariosâ?¦"
 
-#: ../mail/e-mail-reader.c:1173
+#: ../mail/e-mail-reader.c:1147
 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:1178
+#: ../mail/e-mail-reader.c:1152
 msgid "Filter on Se_nder..."
 msgstr "Filtro segÃºn el _remitenteâ?¦"
 
-#: ../mail/e-mail-reader.c:1180
+#: ../mail/e-mail-reader.c:1154
 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:1185
+#: ../mail/e-mail-reader.c:1159
 msgid "Filter on _Subject..."
 msgstr "Filtro segÃºn el _asuntoâ?¦"
 
-#: ../mail/e-mail-reader.c:1187
+#: ../mail/e-mail-reader.c:1161
 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:1192
+#: ../mail/e-mail-reader.c:1166
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../mail/e-mail-reader.c:1194
+#: ../mail/e-mail-reader.c:1168
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1199
+#: ../mail/e-mail-reader.c:1173
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensajeâ?¦"
 
-#: ../mail/e-mail-reader.c:1201
+#: ../mail/e-mail-reader.c:1175
 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:1206
+#: ../mail/e-mail-reader.c:1180
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/e-mail-reader.c:1208
+#: ../mail/e-mail-reader.c:1182
 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:1213
+#: ../mail/e-mail-reader.c:1187
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/e-mail-reader.c:1215
+#: ../mail/e-mail-reader.c:1189
 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:1220
+#: ../mail/e-mail-reader.c:1194
 msgid "Follow _Up..."
 msgstr "Se_guimientoâ?¦"
 
-#: ../mail/e-mail-reader.c:1222
+#: ../mail/e-mail-reader.c:1196
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/e-mail-reader.c:1227
+#: ../mail/e-mail-reader.c:1201
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../mail/e-mail-reader.c:1229 ../mail/e-mail-reader.c:1236
+#: ../mail/e-mail-reader.c:1203 ../mail/e-mail-reader.c:1210
 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:1234
+#: ../mail/e-mail-reader.c:1208
 msgid "Forward As _Attached"
 msgstr "Reenviar como _adjunto"
 
-#: ../mail/e-mail-reader.c:1241
+#: ../mail/e-mail-reader.c:1215
 msgid "_Inline"
 msgstr "_Incluido en lÃnea"
 
-#: ../mail/e-mail-reader.c:1243 ../mail/e-mail-reader.c:1250
+#: ../mail/e-mail-reader.c:1217 ../mail/e-mail-reader.c:1224
 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:1248
+#: ../mail/e-mail-reader.c:1222
 msgid "Forward As _Inline"
 msgstr "Reenviar en _lÃnea"
 
-#: ../mail/e-mail-reader.c:1255
+#: ../mail/e-mail-reader.c:1229
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../mail/e-mail-reader.c:1257 ../mail/e-mail-reader.c:1264
+#: ../mail/e-mail-reader.c:1231 ../mail/e-mail-reader.c:1238
 msgid "Forward the selected message quoted like a reply"
 msgstr "ReenvÃa el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/e-mail-reader.c:1262
+#: ../mail/e-mail-reader.c:1236
 msgid "Forward As _Quoted"
 msgstr "Reenviar como ci_tado"
 
-#: ../mail/e-mail-reader.c:1269
+#: ../mail/e-mail-reader.c:1243
 msgid "_Load Images"
 msgstr "Cargar _imÃ¡genes"
 
-#: ../mail/e-mail-reader.c:1271
+#: ../mail/e-mail-reader.c:1245
 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:1276
+#: ../mail/e-mail-reader.c:1250
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1278
+#: ../mail/e-mail-reader.c:1252
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ../mail/e-mail-reader.c:1283
+#: ../mail/e-mail-reader.c:1257
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../mail/e-mail-reader.c:1285
+#: ../mail/e-mail-reader.c:1259
 msgid "Mark the selected messages as junk"
 msgstr "Marcar los mensajes seleccionados como SPAM"
 
-#: ../mail/e-mail-reader.c:1290
+#: ../mail/e-mail-reader.c:1264
 msgid "_Not Junk"
 msgstr "No es SPA_M"
 
-#: ../mail/e-mail-reader.c:1292
+#: ../mail/e-mail-reader.c:1266
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar los mensajes seleccionados como no SPAM"
 
-#: ../mail/e-mail-reader.c:1297
+#: ../mail/e-mail-reader.c:1271
 msgid "_Read"
 msgstr "_LeÃdo"
 
-#: ../mail/e-mail-reader.c:1299
+#: ../mail/e-mail-reader.c:1273
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leÃdos"
 
-#: ../mail/e-mail-reader.c:1304
+#: ../mail/e-mail-reader.c:1278
 msgid "Uni_mportant"
 msgstr "N_o importante"
 
-#: ../mail/e-mail-reader.c:1306
+#: ../mail/e-mail-reader.c:1280
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ../mail/e-mail-reader.c:1311
+#: ../mail/e-mail-reader.c:1285
 msgid "_Unread"
 msgstr "_No leÃdo"
 
-#: ../mail/e-mail-reader.c:1313
+#: ../mail/e-mail-reader.c:1287
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leÃdos"
 
-#: ../mail/e-mail-reader.c:1318
+#: ../mail/e-mail-reader.c:1292
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevoâ?¦"
 
-#: ../mail/e-mail-reader.c:1320
+#: ../mail/e-mail-reader.c:1294
 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:1325
+#: ../mail/e-mail-reader.c:1299
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../mail/e-mail-reader.c:1327
+#: ../mail/e-mail-reader.c:1301
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../mail/e-mail-reader.c:1332
+#: ../mail/e-mail-reader.c:1306
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1334
+#: ../mail/e-mail-reader.c:1308
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1339
+#: ../mail/e-mail-reader.c:1313
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpetaâ?¦"
 
-#: ../mail/e-mail-reader.c:1341
+#: ../mail/e-mail-reader.c:1315
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1346
+#: ../mail/e-mail-reader.c:1320
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../mail/e-mail-reader.c:1348
+#: ../mail/e-mail-reader.c:1322
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ../mail/e-mail-reader.c:1353
+#: ../mail/e-mail-reader.c:1327
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../mail/e-mail-reader.c:1355
+#: ../mail/e-mail-reader.c:1329
 msgid "Display the next important message"
 msgstr "Mostrar el mensaje siguiente importante"
 
-#: ../mail/e-mail-reader.c:1360
+#: ../mail/e-mail-reader.c:1334
 msgid "Next _Thread"
 msgstr "_ConversaciÃ³n siguiente"
 
-#: ../mail/e-mail-reader.c:1362
+#: ../mail/e-mail-reader.c:1336
 msgid "Display the next thread"
 msgstr "Mostrar la siguiente conversaciÃ³n"
 
-#: ../mail/e-mail-reader.c:1367
+#: ../mail/e-mail-reader.c:1341
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leÃdo"
 
-#: ../mail/e-mail-reader.c:1369
+#: ../mail/e-mail-reader.c:1343
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leÃdo"
 
-#: ../mail/e-mail-reader.c:1374
+#: ../mail/e-mail-reader.c:1348
 msgid "_Previous Message"
 msgstr "Mensaje _anterior"
 
-#: ../mail/e-mail-reader.c:1376
+#: ../mail/e-mail-reader.c:1350
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ../mail/e-mail-reader.c:1381
+#: ../mail/e-mail-reader.c:1355
 msgid "Pr_evious Important Message"
 msgstr "Mensaje anterior i_mportante"
 
-#: ../mail/e-mail-reader.c:1383
+#: ../mail/e-mail-reader.c:1357
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ../mail/e-mail-reader.c:1388
+#: ../mail/e-mail-reader.c:1362
 msgid "P_revious Unread Message"
 msgstr "Mensaje anterior n_o leÃdo"
 
-#: ../mail/e-mail-reader.c:1390
+#: ../mail/e-mail-reader.c:1364
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leÃdo"
 
-#: ../mail/e-mail-reader.c:1397
+#: ../mail/e-mail-reader.c:1371
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../mail/e-mail-reader.c:1404
+#: ../mail/e-mail-reader.c:1378
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-mail-reader.c:1409
+#: ../mail/e-mail-reader.c:1383
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../mail/e-mail-reader.c:1411
+#: ../mail/e-mail-reader.c:1385
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../mail/e-mail-reader.c:1416
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../mail/e-mail-reader.c:1390
+#: ../modules/calendar/e-cal-shell-view-actions.c:1431
 #: ../modules/mail/e-mail-attachment-handler.c:141
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/e-mail-reader.c:1418
+#: ../mail/e-mail-reader.c:1392
 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:1423
+#: ../mail/e-mail-reader.c:1397
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: ../mail/e-mail-reader.c:1425
+#: ../mail/e-mail-reader.c:1399
 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:1430
+#: ../mail/e-mail-reader.c:1404
 #: ../modules/mail/e-mail-attachment-handler.c:148
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1406
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:1437
+#: ../mail/e-mail-reader.c:1411
 msgid "_Save as mbox..."
 msgstr "_Guardar como mboxâ?¦"
 
-#: ../mail/e-mail-reader.c:1439
+#: ../mail/e-mail-reader.c:1413
 msgid "Save selected messages as an mbox file"
 msgstr "Guarda los mensajes como un archivo mbox"
 
-#: ../mail/e-mail-reader.c:1444
+#: ../mail/e-mail-reader.c:1418
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de bÃºsqueda segÃºn la l_ista de correoâ?¦"
 
-#: ../mail/e-mail-reader.c:1446
+#: ../mail/e-mail-reader.c:1420
 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:1451
+#: ../mail/e-mail-reader.c:1425
 msgid "Search Folder from Recipien_ts..."
 msgstr "Carpeta de bÃºsqueda segÃºn los des_tinatariosâ?¦"
 
-#: ../mail/e-mail-reader.c:1453
+#: ../mail/e-mail-reader.c:1427
 msgid "Create a search folder for these recipients"
 msgstr "Crear una carpeta de bÃºsqueda para estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1432
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de bÃºsqueda segÃºn el r_emitenteâ?¦"
 
-#: ../mail/e-mail-reader.c:1460
+#: ../mail/e-mail-reader.c:1434
 msgid "Create a search folder for this sender"
 msgstr "Crear una carpeta de bÃºsqueda para este remitente"
 
-#: ../mail/e-mail-reader.c:1465
+#: ../mail/e-mail-reader.c:1439
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de bÃºsqueda segÃºn el a_suntoâ?¦"
 
-#: ../mail/e-mail-reader.c:1467
+#: ../mail/e-mail-reader.c:1441
 msgid "Create a search folder for this subject"
 msgstr "Crear una carpeta de bÃºsqueda para este asunto"
 
-#: ../mail/e-mail-reader.c:1472
+#: ../mail/e-mail-reader.c:1446
 msgid "Select _All Text"
 msgstr "Seleccionar _todo el texto"
 
-#: ../mail/e-mail-reader.c:1474
+#: ../mail/e-mail-reader.c:1448
 msgid "Select all the text in a message"
 msgstr "Selecciona todo el texto de un mensaje"
 
-#: ../mail/e-mail-reader.c:1479
+#: ../mail/e-mail-reader.c:1453
 msgid "_Message Source"
 msgstr "Me_nsaje en bruto"
 
-#: ../mail/e-mail-reader.c:1481
+#: ../mail/e-mail-reader.c:1455
 msgid "Show the raw email source of the message"
 msgstr "Mostrar mensaje de correo-e en bruto"
 
-#: ../mail/e-mail-reader.c:1493
+#: ../mail/e-mail-reader.c:1467
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../mail/e-mail-reader.c:1495
+#: ../mail/e-mail-reader.c:1469
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1500
+#: ../mail/e-mail-reader.c:1474
 msgid "_Normal Size"
 msgstr "TamaÃ±o _normal"
 
-#: ../mail/e-mail-reader.c:1502
+#: ../mail/e-mail-reader.c:1476
 msgid "Reset the text to its original size"
 msgstr "Restablecer el texto a su tamaÃ±o original"
 
-#: ../mail/e-mail-reader.c:1507
+#: ../mail/e-mail-reader.c:1481
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1509
+#: ../mail/e-mail-reader.c:1483
 msgid "Increase the text size"
 msgstr "Incrementar el tamaÃ±o del texto"
 
-#: ../mail/e-mail-reader.c:1514
+#: ../mail/e-mail-reader.c:1488
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:1516
+#: ../mail/e-mail-reader.c:1490
 msgid "Decrease the text size"
 msgstr "Reduce el tamaÃ±o del texto"
 
-#: ../mail/e-mail-reader.c:1523
+#: ../mail/e-mail-reader.c:1497
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../mail/e-mail-reader.c:1530
+#: ../mail/e-mail-reader.c:1504
 msgid "Ch_aracter Encoding"
 msgstr "C_odificaciÃ³n de caracteres"
 
-#: ../mail/e-mail-reader.c:1537
+#: ../mail/e-mail-reader.c:1511
 msgid "F_orward As"
 msgstr "Reenviar _como"
 
-#: ../mail/e-mail-reader.c:1544
+#: ../mail/e-mail-reader.c:1518
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:1551
+#: ../mail/e-mail-reader.c:1525
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:1558
+#: ../mail/e-mail-reader.c:1532
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../mail/e-mail-reader.c:1565
+#: ../mail/e-mail-reader.c:1539
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:1594
+#: ../mail/e-mail-reader.c:1568
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimientoâ?¦"
 
-#: ../mail/e-mail-reader.c:1602
+#: ../mail/e-mail-reader.c:1576
 msgid "Mark as _Important"
 msgstr "Marcar como imp_ortante"
 
-#: ../mail/e-mail-reader.c:1606
+#: ../mail/e-mail-reader.c:1580
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/e-mail-reader.c:1610
+#: ../mail/e-mail-reader.c:1584
 msgid "Mark as _Not Junk"
 msgstr "Marcar como no _SPAM"
 
-#: ../mail/e-mail-reader.c:1614
+#: ../mail/e-mail-reader.c:1588
 msgid "Mar_k as Read"
 msgstr "Marcar como _leÃdo"
 
-#: ../mail/e-mail-reader.c:1618
+#: ../mail/e-mail-reader.c:1592
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como no imp_ortante"
 
-#: ../mail/e-mail-reader.c:1622
+#: ../mail/e-mail-reader.c:1596
 msgid "Mark as _Unread"
 msgstr "Marcar como no _leÃdo"
 
-#: ../mail/e-mail-reader.c:1658
+#: ../mail/e-mail-reader.c:1632
 msgid "_Caret Mode"
 msgstr "Activar cu_rsor"
 
-#: ../mail/e-mail-reader.c:1660
+#: ../mail/e-mail-reader.c:1634
 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:1666
+#: ../mail/e-mail-reader.c:1640
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../mail/e-mail-reader.c:1668
+#: ../mail/e-mail-reader.c:1642
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1880
 msgid "Unable to retrieve message"
 msgstr "No se pudo obtener el mensaje"
 
+#: ../mail/e-mail-reader.c:1925 ../mail/mail-ops.c:1864
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "Obteniendo mensaje Â«%sÂ»"
+
 #. we changed user, thus reset the chosen calendar combo too, because
 #. other user means other calendars subscribed
-#: ../mail/e-mail-reader.c:2372
+#: ../mail/e-mail-reader.c:2426
 #: ../plugins/google-account-setup/google-source.c:303
 #: ../plugins/google-account-setup/google-source.c:612
 #: ../plugins/google-account-setup/google-source.c:783
@@ -9864,37 +10020,37 @@ msgstr "No se pudo obtener el mensaje"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/e-mail-reader.c:2488
+#: ../mail/e-mail-reader.c:2545
 #: ../modules/mail/e-mail-attachment-handler.c:134
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:2489
+#: ../mail/e-mail-reader.c:2546
 msgid "Forward the selected message to someone"
 msgstr "ReenvÃa a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2537 ../mail/em-filter-i18n.h:14
-#: ../modules/addressbook/e-book-shell-view-actions.c:1132
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
-#: ../modules/calendar/e-memo-shell-view-actions.c:938
-#: ../modules/calendar/e-task-shell-view-actions.c:1137
-#: ../plugins/groupwise-features/share-folder.c:751
+#: ../mail/e-mail-reader.c:2594 ../mail/em-filter-i18n.h:14
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../modules/calendar/e-memo-shell-view-actions.c:982
+#: ../modules/calendar/e-task-shell-view-actions.c:1181
+#: ../plugins/groupwise-features/share-folder.c:754
 msgid "Delete"
 msgstr "Borrar"
 
-#: ../mail/e-mail-reader.c:2541
-#: ../modules/calendar/e-cal-shell-view-actions.c:1227
+#: ../mail/e-mail-reader.c:2598
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 #: ../widgets/misc/e-calendar.c:193
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mail/e-mail-reader.c:2545
-#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../mail/e-mail-reader.c:2602
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 #: ../widgets/misc/e-calendar.c:169
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:2549 ../mail/mail-dialogs.ui.h:18
+#: ../mail/e-mail-reader.c:2606 ../mail/mail-dialogs.ui.h:18
 msgid "Reply"
 msgstr "Responder"
 
@@ -9943,24 +10099,6 @@ msgstr "Se llegÃ³ al final de la pÃ¡gina, continuando desde el principio"
 msgid "Reached top of page, continued from bottom"
 msgstr "Se llegÃ³ al principio de la pÃ¡gina, continuando desde el final"
 
-#. On This Computer is always first, and Search Folders
-#. * is always last.
-#. create the local source group
-#: ../mail/e-mail-store.c:225 ../mail/em-folder-tree-model.c:144
-#: ../mail/em-folder-tree-model.c:146 ../mail/mail-vfolder.c:216
-#: ../mail/message-list.c:1563
-#: ../modules/addressbook/e-book-shell-backend.c:125
-#: ../modules/addressbook/e-book-shell-migrate.c:499
-#: ../modules/calendar/e-cal-shell-backend.c:120
-#: ../modules/calendar/e-cal-shell-migrate.c:564
-#: ../modules/calendar/e-memo-shell-backend.c:107
-#: ../modules/calendar/e-memo-shell-migrate.c:102
-#: ../modules/calendar/e-task-shell-backend.c:110
-#: ../modules/calendar/e-task-shell-migrate.c:501
-#: ../modules/mail/e-mail-shell-migrate.c:2932
-msgid "On This Computer"
-msgstr "En este equipo"
-
 #: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
@@ -9976,7 +10114,7 @@ msgstr "Sin cifrado"
 #. the Mailer. TLS (Transport Layer Security) is commonly known by
 #. this abbreviation.
 #: ../mail/em-account-editor.c:488 ../mail/mail-config.ui.h:120
-#: ../modules/addressbook/ldap-config.ui.h:19
+#: ../modules/addressbook/ldap-config.ui.h:21
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
@@ -9984,7 +10122,7 @@ msgstr "Cifrado TLS"
 #. the Mailer. SSL (Secure Sockets Layer) is commonly known by this
 #. abbreviation.
 #: ../mail/em-account-editor.c:492 ../mail/mail-config.ui.h:93
-#: ../modules/addressbook/ldap-config.ui.h:12
+#: ../modules/addressbook/ldap-config.ui.h:13
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -10172,7 +10310,7 @@ msgstr "Destino de publicaciÃ³n"
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
-#: ../mail/em-filter-folder-element.c:255
+#: ../mail/em-filter-folder-element.c:258
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
 
@@ -10189,18 +10327,10 @@ msgstr "Asignar color"
 msgid "Assign Score"
 msgstr "Asignar puntuaciÃ³n"
 
-#: ../mail/em-filter-i18n.h:6
-msgid "BCC"
-msgstr "Cco"
-
 #: ../mail/em-filter-i18n.h:7
 msgid "Beep"
 msgstr "Pitar"
 
-#: ../mail/em-filter-i18n.h:8
-msgid "CC"
-msgstr "Cc"
-
 #: ../mail/em-filter-i18n.h:9
 msgid "Completed On"
 msgstr "Completado en"
@@ -10261,10 +10391,6 @@ msgstr "Seguimiento"
 msgid "Forward to"
 msgstr "Reenviar a"
 
-#: ../mail/em-filter-i18n.h:30 ../modules/mail/e-mail-shell-migrate.c:956
-msgid "Important"
-msgstr "Importante"
-
 #: ../mail/em-filter-i18n.h:32
 msgid "is after"
 msgstr "es posterior a"
@@ -10471,7 +10597,7 @@ msgstr "_Nombre de la carpeta:"
 
 #. load store to mail component
 #: ../mail/em-folder-tree-model.c:148 ../mail/em-folder-tree-model.c:150
-#: ../mail/mail-vfolder.c:968 ../mail/mail-vfolder.c:1024
+#: ../mail/mail-vfolder.c:1056 ../mail/mail-vfolder.c:1121
 msgid "Search Folders"
 msgstr "Carpetas de bÃºsqueda"
 
@@ -10480,7 +10606,7 @@ msgstr "Carpetas de bÃºsqueda"
 msgid "UNMATCHED"
 msgstr "NO COINCIDENTE"
 
-#: ../mail/em-folder-tree-model.c:648 ../mail/em-folder-tree-model.c:985
+#: ../mail/em-folder-tree-model.c:716 ../mail/em-folder-tree-model.c:1053
 msgid "Loading..."
 msgstr "Cargandoâ?¦"
 
@@ -10489,7 +10615,7 @@ msgstr "Cargandoâ?¦"
 msgid "Scanning folders in \"%s\""
 msgstr "Analizando carpetas en Â«%sÂ»"
 
-#: ../mail/em-folder-tree.c:445
+#: ../mail/em-folder-tree.c:593
 msgid "Folder names cannot contain '/'"
 msgstr "Los nombres de carpetas no pueden contener el carÃ¡cter Â«/Â»"
 
@@ -10511,37 +10637,37 @@ msgstr "Los nombres de carpetas no pueden contener el carÃ¡cter Â«/Â»"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../mail/em-folder-tree.c:978
+#: ../mail/em-folder-tree.c:1075
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1309
+#: ../mail/em-folder-tree.c:1281
 msgid "Mail Folder Tree"
 msgstr "Ã?rbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:1476
+#: ../mail/em-folder-tree.c:1481
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1478
+#: ../mail/em-folder-tree.c:1483
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1485 ../mail/message-list.c:2076
+#: ../mail/em-folder-tree.c:1490 ../mail/message-list.c:2095
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1487 ../mail/message-list.c:2078
+#: ../mail/em-folder-tree.c:1492 ../mail/message-list.c:2097
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:1502
+#: ../mail/em-folder-tree.c:1507
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacÃ©n de nivel superior"
 
@@ -10691,7 +10817,7 @@ msgstr ""
 "difÃcil que un espÃa vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:48
+#: ../mail/em-format-html-display.c:248 ../smime/gui/smime-ui.ui.h:47
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
@@ -10707,28 +10833,28 @@ msgstr ""
 "Evolution no puede mostrar este correo debido a que es demasiado grande para "
 "procesarlo. Puede verlo sin formato o con un editor de texto externo."
 
-#: ../mail/em-format-html-display.c:730
+#: ../mail/em-format-html-display.c:738
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:738
+#: ../mail/em-format-html-display.c:746
 msgid "Overdue:"
 msgstr "Atrasado:"
 
 #. To Translators: the "by" is part of the string, like "Follow-up by Tuesday, January 13, 2009"
-#: ../mail/em-format-html-display.c:742
+#: ../mail/em-format-html-display.c:750
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:926 ../mail/em-format-html-display.c:965
+#: ../mail/em-format-html-display.c:934 ../mail/em-format-html-display.c:973
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:928
+#: ../mail/em-format-html-display.c:936
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:985
+#: ../mail/em-format-html-display.c:993
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
@@ -10750,35 +10876,35 @@ msgstr "Formateando el mensajeâ?¦"
 msgid "Retrieving `%s'"
 msgstr "Obteniendo Â«%sÂ»"
 
-#: ../mail/em-format-html.c:1848
+#: ../mail/em-format-html.c:1860
 msgid "Unknown external-body part."
 msgstr "Parte externa al cuerpo del mensaje desconocida."
 
-#: ../mail/em-format-html.c:1856
+#: ../mail/em-format-html.c:1868
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:1886
+#: ../mail/em-format-html.c:1898
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:1897
+#: ../mail/em-format-html.c:1909
 #, 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:1899
+#: ../mail/em-format-html.c:1911
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:1920
+#: ../mail/em-format-html.c:1932
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:1931
+#: ../mail/em-format-html.c:1943
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo Â«%sÂ»)"
@@ -10786,7 +10912,7 @@ msgstr "Puntero a datos externos desconocidos (tipo Â«%sÂ»)"
 #. To translators: This message suggests to the receipients that the sender of the mail is
 #. different from the one listed in From field.
 #.
-#: ../mail/em-format-html.c:2589
+#: ../mail/em-format-html.c:2601
 #, c-format
 msgid "This message was sent by <b>%s</b> on behalf of <b>%s</b>"
 msgstr "Este mensaje lo enviÃ³ <b>%s</b> en nombre de <b>%s</b>"
@@ -10812,12 +10938,12 @@ msgstr "Seleccione un servidor."
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningÃºn servidor"
 
-#: ../mail/em-utils.c:331
+#: ../mail/em-utils.c:310
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
 #. Drop filename for messages from a mailbox
-#: ../mail/em-utils.c:835
+#: ../mail/em-utils.c:814
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
@@ -10826,7 +10952,7 @@ msgstr "Mensajes de %s"
 msgid "Search _Folders"
 msgstr "Carpetas de _bÃºsqueda"
 
-#: ../mail/em-vfolder-rule.c:518
+#: ../mail/em-vfolder-rule.c:521
 msgid "Add Folder"
 msgstr "AÃ±adir carpeta"
 
@@ -11623,14 +11749,6 @@ msgstr ""
 "el menÃº Ver cuando se elige una cuenta de correo."
 
 #: ../mail/evolution-mail.schemas.in.h:157
-msgid "Show the \"Preview\" pane"
-msgstr "Mostrar el panel de vista previa"
-
-#: ../mail/evolution-mail.schemas.in.h:158
-msgid "Show the \"Preview\" pane."
-msgstr "Mostrar el panel de vista previa."
-
-#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -11638,7 +11756,7 @@ msgstr ""
 "Mostrar el campo Â«Responder aÂ» al publicar en un grupo de noticias. Esto se "
 "controla desde el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:160
+#: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -11646,7 +11764,7 @@ msgstr ""
 "Mostrar el campo Â«Responder aÂ» al enviar un mensaje de correo. Esto se "
 "controla desde el menÃº Ver cuando se elige una cuenta de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:161
+#: ../mail/evolution-mail.schemas.in.h:159
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -11654,7 +11772,7 @@ msgstr ""
 "Mostrar el correo-e del remitente en una columna separada en la lista de "
 "mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:162
+#: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -11665,51 +11783,51 @@ msgstr ""
 "cabecera Â«FechaÂ» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../mail/evolution-mail.schemas.in.h:163
+#: ../mail/evolution-mail.schemas.in.h:161
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Mostrar la foto del remitente en el panel de lectura de mensajes."
 
-#: ../mail/evolution-mail.schemas.in.h:164
+#: ../mail/evolution-mail.schemas.in.h:162
 msgid "Spell check inline"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica en lÃnea"
 
-#: ../mail/evolution-mail.schemas.in.h:165
+#: ../mail/evolution-mail.schemas.in.h:163
 msgid "Spell checking color"
 msgstr "Color de la correcciÃ³n ortogrÃ¡fica"
 
-#: ../mail/evolution-mail.schemas.in.h:166
+#: ../mail/evolution-mail.schemas.in.h:164
 msgid "Spell checking languages"
 msgstr "ComprobaciÃ³n ortogrÃ¡fica de idiomas"
 
-#: ../mail/evolution-mail.schemas.in.h:167
+#: ../mail/evolution-mail.schemas.in.h:165
 msgid "Subscribe dialog default height"
 msgstr "Altura predeterminada del diÃ¡logo de suscripciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:168
+#: ../mail/evolution-mail.schemas.in.h:166
 msgid "Subscribe dialog default width"
 msgstr "Anchura predeterminada del diÃ¡logo de suscripciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:169
+#: ../mail/evolution-mail.schemas.in.h:167
 msgid "Terminal font"
 msgstr "TipografÃa del terminal"
 
-#: ../mail/evolution-mail.schemas.in.h:170
+#: ../mail/evolution-mail.schemas.in.h:168
 msgid "Text message part limit"
 msgstr "LÃmite de la parte de texto del mensaje"
 
-#: ../mail/evolution-mail.schemas.in.h:171
+#: ../mail/evolution-mail.schemas.in.h:169
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../mail/evolution-mail.schemas.in.h:172
+#: ../mail/evolution-mail.schemas.in.h:170
 msgid "The last time empty junk was run, in days since the epoch."
 msgstr "La Ãºltima vez que se vaciÃ³ el SPAM, en dÃas desde la Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:173
+#: ../mail/evolution-mail.schemas.in.h:171
 msgid "The last time empty trash was run, in days since the epoch."
 msgstr "La Ãºltima vez que se vaciÃ³ la papelera, en dÃas desde la Ã©poca."
 
-#: ../mail/evolution-mail.schemas.in.h:174
+#: ../mail/evolution-mail.schemas.in.h:172
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -11721,15 +11839,15 @@ msgstr ""
 "vista previa debajo de la lista de correos. Â«1Â» (vista vertical) ubica el "
 "panel de vista previa junto a la lista de correos."
 
-#: ../mail/evolution-mail.schemas.in.h:175
+#: ../mail/evolution-mail.schemas.in.h:173
 msgid "The terminal font for mail display."
 msgstr "La tipografÃa de terminal para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:176
+#: ../mail/evolution-mail.schemas.in.h:174
 msgid "The variable width font for mail display."
 msgstr "La tipografÃa de anchura variable para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:177
+#: ../mail/evolution-mail.schemas.in.h:175
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -11737,7 +11855,7 @@ msgstr ""
 "Esto puede tener tres valores posibles. Â«0Â» para errores. Â«1Â» para avisos. Â«2Â» "
 "para mensajes de depuraciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:178
+#: ../mail/evolution-mail.schemas.in.h:176
 msgid ""
 "This decides the max size of the text part that can be formatted under "
 "Evolution. The default is 4MB / 4096 KB and is specified in terms of KB."
@@ -11746,7 +11864,7 @@ msgstr ""
 "bajo Evolution. Lo predeterminado son 4 MiB/4096 KiB y estÃ¡ especificado en "
 "tÃ©rminos de KiB."
 
-#: ../mail/evolution-mail.schemas.in.h:179
+#: ../mail/evolution-mail.schemas.in.h:177
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -11756,7 +11874,7 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado estÃ¡ "
 "desactivado, entonces no usarÃ¡ los otros complementos disponibles."
 
-#: ../mail/evolution-mail.schemas.in.h:180
+#: ../mail/evolution-mail.schemas.in.h:178
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -11765,7 +11883,7 @@ msgstr ""
 "Esto deselecciona el correo en la lista y elimina la vista previa para esa "
 "carpeta."
 
-#: ../mail/evolution-mail.schemas.in.h:181
+#: ../mail/evolution-mail.schemas.in.h:179
 msgid ""
 "This key should contain a list of XML structures specifying custom headers, "
 "and whether they are to be displayed. The format of the XML structure is &lt;"
@@ -11777,7 +11895,7 @@ msgstr ""
 "estructura XML es &lt;header enabled&gt;: poner a activado si la cabecera se "
 "debe mostrar en la vista de correo."
 
-#: ../mail/evolution-mail.schemas.in.h:182
+#: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -11788,11 +11906,11 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../mail/evolution-mail.schemas.in.h:183
+#: ../mail/evolution-mail.schemas.in.h:181
 msgid "This option would help in improving the speed of fetching."
 msgstr "Esta opciÃ³n ayudarÃ¡ a mejorar la velocidad de obtenciÃ³n."
 
-#: ../mail/evolution-mail.schemas.in.h:184
+#: ../mail/evolution-mail.schemas.in.h:182
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -11800,7 +11918,7 @@ msgstr ""
 "Esto establece el nÃºmero de direcciones a mostrar en la vista de lista de "
 "mensajes predeterminada, mÃ¡s allÃ¡ de los cuales se muestra un Â«â?¦Â»."
 
-#: ../mail/evolution-mail.schemas.in.h:185
+#: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -11809,7 +11927,7 @@ msgstr ""
 "deberÃan estar en estado expandido o contraÃdo. Evolution necesita "
 "reiniciarse."
 
-#: ../mail/evolution-mail.schemas.in.h:186
+#: ../mail/evolution-mail.schemas.in.h:184
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -11819,61 +11937,53 @@ msgstr ""
 "Ãºltimo mensaje de cada conversaciÃ³n, en lugar de por la fecha del mensaje. "
 "Evolution necesita un reinicio."
 
-#: ../mail/evolution-mail.schemas.in.h:187
-msgid "Thread the message list."
-msgstr "Agrupar la lista de mensajes."
-
-#: ../mail/evolution-mail.schemas.in.h:188
-msgid "Thread the message-list"
-msgstr "Agrupar la lista de mensajes"
-
-#: ../mail/evolution-mail.schemas.in.h:189
+#: ../mail/evolution-mail.schemas.in.h:185
 msgid "Thread the message-list based on Subject"
 msgstr "Agrupar la lista de mensajes en conversaciones basadas en el asunto"
 
-#: ../mail/evolution-mail.schemas.in.h:190
+#: ../mail/evolution-mail.schemas.in.h:186
 msgid "Timeout for marking message as seen"
 msgstr "Tiempo para marcar un mensaje como visto"
 
-#: ../mail/evolution-mail.schemas.in.h:191
+#: ../mail/evolution-mail.schemas.in.h:187
 msgid "Timeout for marking message as seen."
 msgstr "Tiempo para marcar un mensaje como visto."
 
-#: ../mail/evolution-mail.schemas.in.h:192
+#: ../mail/evolution-mail.schemas.in.h:188
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../mail/evolution-mail.schemas.in.h:193
+#: ../mail/evolution-mail.schemas.in.h:189
 msgid "Underline color for misspelled words when using inline spelling."
 msgstr ""
 "Color de subrayado para las palabras mal escritas cuando se use correcciÃ³n "
 "en lÃnea."
 
-#: ../mail/evolution-mail.schemas.in.h:194
+#: ../mail/evolution-mail.schemas.in.h:190
 msgid "Use SpamAssassin daemon and client"
 msgstr "Usar el demonio y cliente de SpamAssassin"
 
-#: ../mail/evolution-mail.schemas.in.h:195
+#: ../mail/evolution-mail.schemas.in.h:191
 msgid "Use SpamAssassin daemon and client (spamc/spamd)."
 msgstr "Usar el demonio y cliente de SpamAssassin (spamc/spamd)."
 
-#: ../mail/evolution-mail.schemas.in.h:196
+#: ../mail/evolution-mail.schemas.in.h:192
 msgid "Use custom fonts"
 msgstr "Usar tipografÃa personalizada"
 
-#: ../mail/evolution-mail.schemas.in.h:197
+#: ../mail/evolution-mail.schemas.in.h:193
 msgid "Use custom fonts for displaying mail."
 msgstr "Usar tipografÃa personalizada para mostrar el correo."
 
-#: ../mail/evolution-mail.schemas.in.h:198
+#: ../mail/evolution-mail.schemas.in.h:194
 msgid "Use only local spam tests."
 msgstr "Usar sÃ³lo comprobaciones de SPAM locales."
 
-#: ../mail/evolution-mail.schemas.in.h:199
+#: ../mail/evolution-mail.schemas.in.h:195
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Usa sÃ³lo comprobaciones de SPAM locales (sin DNS)."
 
-#: ../mail/evolution-mail.schemas.in.h:200
+#: ../mail/evolution-mail.schemas.in.h:196
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -11883,7 +11993,7 @@ msgstr ""
 "mensaje. Esto determina si el cursor se posiciona en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:201
+#: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -11893,23 +12003,23 @@ msgstr ""
 "mensaje. Esto determina si la firma se ubica en la parte superior del "
 "mensaje o en la inferior."
 
-#: ../mail/evolution-mail.schemas.in.h:202
+#: ../mail/evolution-mail.schemas.in.h:198
 msgid "Variable width font"
 msgstr "TipografÃa de anchura variable"
 
-#: ../mail/evolution-mail.schemas.in.h:203
+#: ../mail/evolution-mail.schemas.in.h:199
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr ""
 "Indica si se debe aÃ±adir una solicitud de lectura de forma predeterminada a "
 "cada mensaje."
 
-#: ../mail/evolution-mail.schemas.in.h:204
+#: ../mail/evolution-mail.schemas.in.h:200
 msgid "Whether disable ellipsizing feature of folder names in side bar."
 msgstr ""
 "Indica si se debe desactivar la caracterÃstica de elipsis de los nombres de "
 "las carpetas en la barra lateral."
 
-#: ../mail/evolution-mail.schemas.in.h:205
+#: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -11917,35 +12027,35 @@ msgstr ""
 "Indica si se debe o no volver al agrupado de conversaciones por asuntos "
 "cuando los mensajes no contienen cabeceras Â«In-Reply-ToÂ» o Â«ReferencesÂ»."
 
-#: ../mail/evolution-mail.schemas.in.h:206
+#: ../mail/evolution-mail.schemas.in.h:202
 msgid "Whether sort threads based on latest message in that thread"
 msgstr ""
 "Indica si ordenar las conversaciones basÃ¡ndose en el Ãºltimo mensaje de esa "
 "conversaciÃ³n"
 
-#: ../mail/evolution-mail.schemas.in.h:207
+#: ../mail/evolution-mail.schemas.in.h:203
 msgid "Width of the message-list pane"
 msgstr "Anchura del panel de lista de mensajes"
 
-#: ../mail/evolution-mail.schemas.in.h:208
+#: ../mail/evolution-mail.schemas.in.h:204
 msgid "Width of the message-list pane."
 msgstr "Anchura del panel de lista de mensajes."
 
-#: ../mail/importers/elm-importer.c:179
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Importando datos de Elm"
 
-#: ../mail/importers/elm-importer.c:324 ../mail/importers/pine-importer.c:378
-#: ../modules/mail/e-mail-shell-view.c:588
+#: ../mail/importers/elm-importer.c:323 ../mail/importers/pine-importer.c:377
+#: ../modules/mail/e-mail-shell-view.c:596
 #: ../plugins/groupwise-features/proxy-add-dialog.ui.h:5
 msgid "Mail"
 msgstr "Correo"
 
-#: ../mail/importers/elm-importer.c:364
+#: ../mail/importers/elm-importer.c:363
 msgid "Evolution Elm importer"
 msgstr "Importador de Elm de Evolution"
 
-#: ../mail/importers/elm-importer.c:365
+#: ../mail/importers/elm-importer.c:364
 msgid "Import mail from Elm."
 msgstr "Importar correo de Elm."
 
@@ -11965,6 +12075,7 @@ msgid "Select folder to import into"
 msgstr "Seleccione la carpeta en la que importar"
 
 #: ../mail/importers/evolution-mbox-importer.c:258
+#: ../shell/e-shell-utils.c:218
 msgid "Berkeley Mailbox (mbox)"
 msgstr "BuzÃ³n Berkeley (mbox)"
 
@@ -11989,44 +12100,44 @@ msgstr "Importando Â«%sÂ»"
 msgid "Scanning %s"
 msgstr "Analizando %s"
 
-#: ../mail/importers/pine-importer.c:225
+#: ../mail/importers/pine-importer.c:224
 msgid "Importing Pine data"
 msgstr "Importando datos de Pine"
 
-#: ../mail/importers/pine-importer.c:383
+#: ../mail/importers/pine-importer.c:382
 #: ../modules/addressbook/addressbook-config.c:986
 msgid "Address Book"
 msgstr "Libreta de direcciones"
 
-#: ../mail/importers/pine-importer.c:424
+#: ../mail/importers/pine-importer.c:423
 msgid "Evolution Pine importer"
 msgstr "Importador de Pine de Evolution"
 
-#: ../mail/importers/pine-importer.c:425
+#: ../mail/importers/pine-importer.c:424
 msgid "Import mail from Pine."
 msgstr "Importar correo de Pine."
 
-#: ../mail/mail-autofilter.c:71
+#: ../mail/mail-autofilter.c:73
 #, c-format
 msgid "Mail to %s"
 msgstr "Correo para %s"
 
-#: ../mail/mail-autofilter.c:234 ../mail/mail-autofilter.c:273
+#: ../mail/mail-autofilter.c:236 ../mail/mail-autofilter.c:275
 #, c-format
 msgid "Mail from %s"
 msgstr "Correo de %s"
 
-#: ../mail/mail-autofilter.c:257
+#: ../mail/mail-autofilter.c:259
 #, c-format
 msgid "Subject is %s"
 msgstr "Asunto es %s"
 
-#: ../mail/mail-autofilter.c:292
+#: ../mail/mail-autofilter.c:294
 #, c-format
 msgid "%s mailing list"
 msgstr "Lista de correo %s"
 
-#: ../mail/mail-autofilter.c:364
+#: ../mail/mail-autofilter.c:366
 msgid "Add Filter Rule"
 msgstr "AÃ±adir regla de filtrado"
 
@@ -12488,7 +12599,7 @@ msgstr "_Usuario:"
 msgid "Use Authe_ntication"
 msgstr "Usar aute_nticaciÃ³n"
 
-#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:405
+#: ../mail/mail-config.ui.h:130 ../plugins/caldav/caldav-source.c:441
 #: ../plugins/google-account-setup/google-contacts-source.c:280
 #: ../plugins/google-account-setup/google-source.c:700
 #: ../plugins/webdav-account-setup/webdav-contacts-source.c:307
@@ -12584,7 +12695,7 @@ msgstr "_Script:"
 msgid "_Secure HTTP Proxy:"
 msgstr "Proxy HTTP _seguro:"
 
-#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:28
+#: ../mail/mail-config.ui.h:155 ../modules/addressbook/ldap-config.ui.h:30
 #: ../plugins/publish-calendar/publish-calendar.ui.h:28
 msgid "_Server:"
 msgstr "_Servidor:"
@@ -12614,7 +12725,7 @@ msgstr "_Usar los valores predeterminados del sistema"
 msgid "_Use the same fonts as other applications"
 msgstr "_Usar las mismas tipografÃas que en otras aplicaciones"
 
-#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:49
+#: ../mail/mail-config.ui.h:163 ../smime/gui/smime-ui.ui.h:48
 msgid "a"
 msgstr "am"
 
@@ -12622,7 +12733,7 @@ msgstr "am"
 msgid "addresses"
 msgstr "direcciones"
 
-#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:50
+#: ../mail/mail-config.ui.h:165 ../smime/gui/smime-ui.ui.h:49
 msgid "b"
 msgstr "por"
 
@@ -12743,7 +12854,7 @@ msgstr "_Marca:"
 msgid "_Tick this to accept the license agreement"
 msgstr "_Marque esto para aceptar el acuerdo de licencia"
 
-#: ../mail/mail-folder-cache.c:890
+#: ../mail/mail-folder-cache.c:894
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -12876,11 +12987,6 @@ msgstr "Vaciando papelera en Â«%sÂ»"
 msgid "Local Folders"
 msgstr "Carpetas locales"
 
-#: ../mail/mail-ops.c:1864
-#, c-format
-msgid "Retrieving message '%s'"
-msgstr "Obteniendo mensaje Â«%sÂ»"
-
 #: ../mail/mail-ops.c:1982
 #, c-format
 msgid "Retrieving %d message"
@@ -12966,25 +13072,25 @@ msgstr "Esperandoâ?¦"
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
 
-#: ../mail/mail-session.c:214
+#: ../mail/mail-session.c:220
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseÃ±a para %s"
 
-#: ../mail/mail-session.c:216
+#: ../mail/mail-session.c:222
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseÃ±a"
 
-#: ../mail/mail-session.c:219
+#: ../mail/mail-session.c:225
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseÃ±a para %s"
 
-#: ../mail/mail-session.c:221
+#: ../mail/mail-session.c:227
 msgid "Enter Password"
 msgstr "Introduzca contraseÃ±a"
 
-#: ../mail/mail-session.c:263
+#: ../mail/mail-session.c:269
 msgid "User canceled operation."
 msgstr "El usuario cancelÃ³ la operaciÃ³n."
 
@@ -13012,26 +13118,26 @@ msgstr "Mensaje reenviado"
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta invÃ¡lida: Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:88
+#: ../mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Configurando carpeta de bÃºsqueda: %s"
 
-#: ../mail/mail-vfolder.c:233
+#: ../mail/mail-vfolder.c:232
 #, c-format
 msgid "Updating Search Folders for '%s:%s'"
 msgstr "Actualizando carpetas de bÃºsqueda para Â«%s: %sÂ»"
 
-#: ../mail/mail-vfolder.c:240
+#: ../mail/mail-vfolder.c:239
 #, c-format
 msgid "Updating Search Folders for '%s'"
 msgstr "Actualizando carpetas de bÃºsqueda para Â«%sÂ»"
 
-#: ../mail/mail-vfolder.c:1075
+#: ../mail/mail-vfolder.c:1172
 msgid "Edit Search Folder"
 msgstr "Editar carpeta de bÃºsqueda"
 
-#: ../mail/mail-vfolder.c:1166
+#: ../mail/mail-vfolder.c:1265
 msgid "New Search Folder"
 msgstr "Carpeta de bÃºsqueda nueva"
 
@@ -13655,7 +13761,7 @@ msgid "_Do not Synchronize"
 msgstr "_No sincronizar"
 
 #: ../mail/mail.error.xml.h:138
-#: ../modules/mail/e-mail-shell-view-actions.c:1012
+#: ../modules/mail/e-mail-shell-view-actions.c:987
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -13667,82 +13773,82 @@ msgstr "C_ompactar"
 msgid "_Open Messages"
 msgstr "_Abrir mensajes"
 
-#: ../mail/message-list.c:1068
+#: ../mail/message-list.c:1087
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: ../mail/message-list.c:1069
+#: ../mail/message-list.c:1088
 msgid "Seen"
 msgstr "Visto"
 
-#: ../mail/message-list.c:1070
+#: ../mail/message-list.c:1089
 msgid "Answered"
 msgstr "Contestado"
 
-#: ../mail/message-list.c:1071
+#: ../mail/message-list.c:1090
 msgid "Forwarded"
 msgstr "Reenviado"
 
-#: ../mail/message-list.c:1072
+#: ../mail/message-list.c:1091
 msgid "Multiple Unseen Messages"
 msgstr "MÃºltiples mensajes sin leer"
 
-#: ../mail/message-list.c:1073
+#: ../mail/message-list.c:1092
 msgid "Multiple Messages"
 msgstr "MÃºltiples mensajes"
 
-#: ../mail/message-list.c:1077
+#: ../mail/message-list.c:1096
 msgid "Lowest"
 msgstr "La mÃ¡s baja"
 
-#: ../mail/message-list.c:1078
+#: ../mail/message-list.c:1097
 msgid "Lower"
 msgstr "MÃ¡s baja"
 
-#: ../mail/message-list.c:1082
+#: ../mail/message-list.c:1101
 msgid "Higher"
 msgstr "MÃ¡s alta"
 
-#: ../mail/message-list.c:1083
+#: ../mail/message-list.c:1102
 msgid "Highest"
 msgstr "La mÃ¡s alta"
 
-#: ../mail/message-list.c:1712 ../widgets/table/e-cell-date.c:46
+#: ../mail/message-list.c:1731 ../widgets/table/e-cell-date.c:46
 msgid "?"
 msgstr "?"
 
 #. strftime format of a time,
 #. in 12-hour format, without seconds.
-#: ../mail/message-list.c:1719 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1738 ../plugins/itip-formatter/itip-view.c:208
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: ../mail/message-list.c:1728
+#: ../mail/message-list.c:1747
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: ../mail/message-list.c:1740
+#: ../mail/message-list.c:1759
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1748
+#: ../mail/message-list.c:1767
 msgid "%b %d %l:%M %p"
 msgstr "%e de %b %l:%M %p"
 
-#: ../mail/message-list.c:1750
+#: ../mail/message-list.c:1769
 msgid "%b %d %Y"
 msgstr "%e de %b de %Y"
 
-#: ../mail/message-list.c:2510 ../shell/e-shell-view.c:535
+#: ../mail/message-list.c:2520 ../shell/e-shell-view.c:639
 msgid "Shell Backend"
 msgstr "Â«BackendÂ» de la shell"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4263 ../mail/message-list.c:4743
+#: ../mail/message-list.c:4271 ../mail/message-list.c:4757
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
-#: ../mail/message-list.c:4578
+#: ../mail/message-list.c:4592
 msgid ""
 "No message satisfies your search criteria. Either clear search with Search-"
 ">Clear menu item or change it."
@@ -13750,7 +13856,7 @@ msgstr ""
 "NingÃºn mensaje satisface su criterio de bÃºsqueda. Limpie el criterio de "
 "selecciÃ³n con el elemento del menÃº Buscar->Limpiar o cÃ¡mbielo."
 
-#: ../mail/message-list.c:4580
+#: ../mail/message-list.c:4594
 msgid ""
 "There are only hidden messages in this folder. Use View->Show Hidden "
 "Messages to show them."
@@ -13758,7 +13864,7 @@ msgstr ""
 "SÃ³lo hay mensajes ocultos en esta carpeta. Use Ver->Mostrar mensajes ocultos "
 "para mostrarlos."
 
-#: ../mail/message-list.c:4582
+#: ../mail/message-list.c:4596
 msgid "There are no messages in this folder."
 msgstr "No hay mensajes en esta carpeta."
 
@@ -13796,27 +13902,27 @@ msgid "Subject - Trimmed"
 msgstr "Asunto recortado"
 
 #: ../mail/searchtypes.xml.h:1
-#: ../modules/mail/e-mail-shell-view-actions.c:1409
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1416
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1423
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1430
+#: ../modules/mail/e-mail-shell-view-actions.c:1405
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
@@ -14004,7 +14110,6 @@ msgid "Whether to show the preview pane."
 msgstr "Indica si se muestra el panel de vista previa."
 
 #: ../modules/addressbook/autocompletion-config.c:159
-#: ../modules/mail/em-mailer-prefs.c:1152
 msgid "Table column:"
 msgstr "Columna de tabla:"
 
@@ -14054,7 +14159,7 @@ msgstr "Crea una libreta de direcciones nueva"
 
 #. Create the contacts group
 #: ../modules/addressbook/e-book-shell-backend.c:376
-#: ../modules/addressbook/e-book-shell-view.c:396
+#: ../modules/addressbook/e-book-shell-view.c:415
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-migrate.c:480
 msgid "Contacts"
@@ -14071,51 +14176,36 @@ msgstr "Lista de origen"
 msgid "The registry of address books"
 msgstr "El registro de las libretas de direcciones"
 
-#: ../modules/addressbook/e-book-shell-content.c:380
+#: ../modules/addressbook/e-book-shell-content.c:381
 msgid "Current View"
 msgstr "Vista actual"
 
-#: ../modules/addressbook/e-book-shell-content.c:381
+#: ../modules/addressbook/e-book-shell-content.c:382
 msgid "The currently selected address book view"
 msgstr "La vista actual de la libreta de direcciones seleccionada"
 
-#: ../modules/addressbook/e-book-shell-content.c:390
+#: ../modules/addressbook/e-book-shell-content.c:391
 msgid "Previewed Contact"
 msgstr "Contacto previsualizado"
 
-#: ../modules/addressbook/e-book-shell-content.c:391
+#: ../modules/addressbook/e-book-shell-content.c:392
 msgid "The contact being shown in the preview pane"
 msgstr "El contacto mostrado en el panel de vista previa"
 
-#: ../modules/addressbook/e-book-shell-content.c:400
-#: ../modules/calendar/e-memo-shell-content.c:611
-#: ../modules/calendar/e-task-shell-content.c:634
-#: ../modules/mail/e-mail-shell-content.c:725
+#: ../modules/addressbook/e-book-shell-content.c:401
+#: ../modules/calendar/e-memo-shell-content.c:616
+#: ../modules/calendar/e-task-shell-content.c:639
+#: ../modules/mail/e-mail-shell-content.c:712
 msgid "Preview is Visible"
 msgstr "La vista previa es visible"
 
-#: ../modules/addressbook/e-book-shell-content.c:401
-#: ../modules/calendar/e-memo-shell-content.c:612
-#: ../modules/calendar/e-task-shell-content.c:635
-#: ../modules/mail/e-mail-shell-content.c:726
+#: ../modules/addressbook/e-book-shell-content.c:402
+#: ../modules/calendar/e-memo-shell-content.c:617
+#: ../modules/calendar/e-task-shell-content.c:640
+#: ../modules/mail/e-mail-shell-content.c:713
 msgid "Whether the preview pane is visible"
 msgstr "Indica si se muestra el panel de vista previa"
 
-#: ../modules/addressbook/e-book-shell-migrate.c:76
-#: ../modules/calendar/e-cal-shell-migrate.c:123
-#: ../modules/calendar/e-task-shell-migrate.c:90
-#: ../modules/mail/e-mail-shell-migrate.c:1106
-msgid "Migrating..."
-msgstr "Migrandoâ?¦"
-
-#: ../modules/addressbook/e-book-shell-migrate.c:128
-#: ../modules/calendar/e-cal-shell-migrate.c:165
-#: ../modules/calendar/e-task-shell-migrate.c:132
-#: ../modules/mail/e-mail-shell-migrate.c:1179
-#, c-format
-msgid "Migrating '%s':"
-msgstr "Migrando Â«%sÂ»:"
-
 #: ../modules/addressbook/e-book-shell-migrate.c:645
 msgid "LDAP Servers"
 msgstr "Servidores LDAP"
@@ -14168,9 +14258,9 @@ msgstr ""
 "Tenga paciencia mientras Evolution migra sus datos Pilot Syncâ?¦"
 
 #: ../modules/addressbook/e-book-shell-sidebar.c:181
-#: ../modules/calendar/e-cal-shell-sidebar.c:601
-#: ../modules/calendar/e-memo-shell-sidebar.c:536
-#: ../modules/calendar/e-task-shell-sidebar.c:534
+#: ../modules/calendar/e-cal-shell-sidebar.c:608
+#: ../modules/calendar/e-memo-shell-sidebar.c:543
+#: ../modules/calendar/e-task-shell-sidebar.c:541
 msgid "Source Selector Widget"
 msgstr "Selector de fuentes"
 
@@ -14220,10 +14310,10 @@ 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:742
-#: ../modules/calendar/e-cal-shell-view-actions.c:1269
-#: ../modules/calendar/e-memo-shell-view-actions.c:629
-#: ../modules/calendar/e-task-shell-view-actions.c:753
-#: ../modules/mail/e-mail-shell-view-actions.c:1082
+#: ../modules/calendar/e-cal-shell-view-actions.c:1305
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/mail/e-mail-shell-view-actions.c:1057
 msgid "_Rename..."
 msgstr "_Renombrarâ?¦"
 
@@ -14245,17 +14335,17 @@ msgid "Stop loading"
 msgstr "Parar la carga"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:765
-#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-cal-shell-view-actions.c:1321
 msgid "Copy the selection"
 msgstr "Copiar la selecciÃ³n"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:772
-#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-cal-shell-view-actions.c:1328
 msgid "Cut the selection"
 msgstr "Cortar la selecciÃ³n"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:779
-#: ../modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
@@ -14320,21 +14410,21 @@ msgid "Send a message to the selected contacts"
 msgstr "Enviar un mensaje a los contactos seleccionados"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:849
-#: ../modules/calendar/e-cal-shell-view-actions.c:1425
-#: ../modules/calendar/e-task-shell-view-actions.c:811
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-task-shell-view-actions.c:847
 msgid "_Actions"
 msgstr "A_cciones"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:856
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
-#: ../modules/calendar/e-task-shell-view-actions.c:818
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/calendar/e-memo-shell-view-actions.c:702
+#: ../modules/calendar/e-task-shell-view-actions.c:854
+#: ../modules/mail/e-mail-shell-view-actions.c:1199
 msgid "_Preview"
 msgstr "Vista _previa"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:865
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
-#: ../modules/calendar/e-task-shell-view-actions.c:732
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -14355,9 +14445,9 @@ msgid "Show contact preview window"
 msgstr "Mostrar una ventana de vista previa de contactos"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:942
-#: ../modules/calendar/e-memo-shell-view-actions.c:748
-#: ../modules/calendar/e-task-shell-view-actions.c:912
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "_Classic View"
 msgstr "Vista _clÃ¡sica"
 
@@ -14366,9 +14456,9 @@ 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:949
-#: ../modules/calendar/e-memo-shell-view-actions.c:755
-#: ../modules/calendar/e-task-shell-view-actions.c:919
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
@@ -14377,25 +14467,26 @@ 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:959
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:765
-#: ../modules/calendar/e-task-shell-view-actions.c:936
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:976
 msgid "Any Category"
 msgstr "Cualquier categorÃa"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:966
-#: ../modules/calendar/e-cal-shell-view-actions.c:1607
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Unmatched"
 msgstr "No coincidente"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:976
-#: ../modules/calendar/e-cal-shell-view-actions.c:1617
-#: ../modules/calendar/e-memo-shell-view-actions.c:782
-#: ../modules/calendar/e-task-shell-view-actions.c:981
-#: ../modules/mail/e-mail-shell-view-actions.c:1402
-msgid "Advanced search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
+#: ../shell/e-shell-content.c:515
+msgid "Advanced Search"
 msgstr "BÃºsqueda avanzada"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1009
@@ -14418,23 +14509,23 @@ msgstr "Guardar como vCardâ?¦"
 msgid "Save selected contacts as a vCard"
 msgstr "Guardar los contactos seleccionados como VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:336
+#: ../modules/addressbook/e-book-shell-view.c:355
 msgid "_Forward Contacts"
 msgstr "_Reenviar contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:338
+#: ../modules/addressbook/e-book-shell-view.c:357
 msgid "_Forward Contact"
 msgstr "_Reenviar contacto"
 
-#: ../modules/addressbook/e-book-shell-view.c:373
+#: ../modules/addressbook/e-book-shell-view.c:392
 msgid "_Send Message to Contacts"
 msgstr "_Enviar un correo a los contactos"
 
-#: ../modules/addressbook/e-book-shell-view.c:375
+#: ../modules/addressbook/e-book-shell-view.c:394
 msgid "_Send Message to List"
 msgstr "_Enviar un correo a la lista"
 
-#: ../modules/addressbook/e-book-shell-view.c:377
+#: ../modules/addressbook/e-book-shell-view.c:396
 msgid "_Send Message to Contact"
 msgstr "_Enviar un correo al contacto"
 
@@ -14491,23 +14582,24 @@ msgstr "_Examinar esta libreta hasta llegar al final"
 msgid "Lo_gin:"
 msgstr "_Inicio de sesiÃ³n:"
 
-#: ../modules/addressbook/ldap-config.ui.h:11
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:12
 msgid "One"
 msgstr "Uno"
 
-#: ../modules/addressbook/ldap-config.ui.h:13
+#: ../modules/addressbook/ldap-config.ui.h:14
 msgid "Search Filter"
 msgstr "Filtro de bÃºsqueda"
 
-#: ../modules/addressbook/ldap-config.ui.h:14
+#: ../modules/addressbook/ldap-config.ui.h:15
 msgid "Search _base:"
 msgstr "_Base de bÃºsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:15
+#: ../modules/addressbook/ldap-config.ui.h:16
 msgid "Search _filter:"
 msgstr "_Filtro de bÃºsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:16
+#: ../modules/addressbook/ldap-config.ui.h:17
 msgid ""
 "Search filter is the type of object to be searched for. If this is not "
 "modified, the default search will be performed on the type \"person\"."
@@ -14516,51 +14608,52 @@ msgstr ""
 "modifica, la bÃºsqueda predeterminada se realizarÃ¡ sobre la clase de objetos "
 "de tipo Â«personÂ»."
 
-#: ../modules/addressbook/ldap-config.ui.h:17
+#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
+#: ../modules/addressbook/ldap-config.ui.h:19
 msgid "Sub"
 msgstr "Sub"
 
-#: ../modules/addressbook/ldap-config.ui.h:18
+#: ../modules/addressbook/ldap-config.ui.h:20
 msgid "Supported Search Bases"
 msgstr "Bases de bÃºsqueda soportadas"
 
-#: ../modules/addressbook/ldap-config.ui.h:20
+#: ../modules/addressbook/ldap-config.ui.h:22
 msgid "Using distinguished name (DN)"
 msgstr "Usando Nombre distintivo (DN)"
 
-#: ../modules/addressbook/ldap-config.ui.h:21
+#: ../modules/addressbook/ldap-config.ui.h:23
 msgid "Using email address"
 msgstr "Usando direcciÃ³n de correo-e"
 
-#: ../modules/addressbook/ldap-config.ui.h:22
+#: ../modules/addressbook/ldap-config.ui.h:24
 msgid "_Download limit:"
 msgstr "LÃmite de _descarga:"
 
-#: ../modules/addressbook/ldap-config.ui.h:23
+#: ../modules/addressbook/ldap-config.ui.h:25
 msgid "_Find Possible Search Bases"
 msgstr "_Buscar bases de bÃºsqueda posibles"
 
-#: ../modules/addressbook/ldap-config.ui.h:24
+#: ../modules/addressbook/ldap-config.ui.h:26
 msgid "_Login method:"
 msgstr "MÃ©todo de _inicio de sesiÃ³n:"
 
-#: ../modules/addressbook/ldap-config.ui.h:26
+#: ../modules/addressbook/ldap-config.ui.h:28
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../modules/addressbook/ldap-config.ui.h:27
+#: ../modules/addressbook/ldap-config.ui.h:29
 msgid "_Search scope:"
 msgstr "Ã?_mbito de bÃºsqueda:"
 
-#: ../modules/addressbook/ldap-config.ui.h:29
+#: ../modules/addressbook/ldap-config.ui.h:31
 msgid "_Timeout:"
 msgstr "_Tiempo de expiraciÃ³n:"
 
-#: ../modules/addressbook/ldap-config.ui.h:30
+#: ../modules/addressbook/ldap-config.ui.h:32
 msgid "_Use secure connection:"
 msgstr "Usar _conexiÃ³n segura:"
 
-#: ../modules/addressbook/ldap-config.ui.h:31
+#: ../modules/addressbook/ldap-config.ui.h:33
 msgid "cards"
 msgstr "tarjetas"
 
@@ -14610,7 +14703,7 @@ msgid "_Appointment"
 msgstr "_Cita"
 
 #: ../modules/calendar/e-cal-shell-backend.c:426
-#: ../modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Create a new appointment"
 msgstr "Crea una cita nueva"
 
@@ -14638,12 +14731,12 @@ msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
 #: ../modules/calendar/e-cal-shell-backend.c:450
-#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Create a new calendar"
 msgstr "Crea un calendario nuevo"
 
 #: ../modules/calendar/e-cal-shell-backend.c:485
-#: ../plugins/itip-formatter/itip-formatter.c:2642
+#: ../plugins/itip-formatter/itip-formatter.c:2646
 msgid "Calendar and Tasks"
 msgstr "Calendario y tareas"
 
@@ -14696,29 +14789,29 @@ msgstr "Cargando calendarios"
 msgid "Calendar Selector"
 msgstr "Selector de calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:591
+#: ../modules/calendar/e-cal-shell-sidebar.c:598
 msgid "Date Navigator Widget"
 msgstr "Widget de navegaciÃ³n de fecha"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:592
+#: ../modules/calendar/e-cal-shell-sidebar.c:599
 msgid "This widget displays a miniature calendar"
 msgstr "Este widget muestra un calendario en miniatura"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:602
+#: ../modules/calendar/e-cal-shell-sidebar.c:609
 msgid "This widget displays groups of calendars"
 msgstr "Este widget muestra grupos de calendarios"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:763
+#: ../modules/calendar/e-cal-shell-sidebar.c:770
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "Abriendo el calendario en Â«%sÂ»"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:214
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:213
+#: ../modules/calendar/e-cal-shell-view-actions.c:242
 msgid "Print"
 msgstr "Imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:304
+#: ../modules/calendar/e-cal-shell-view-actions.c:301
 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 "
@@ -14730,402 +14823,430 @@ 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:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:318
 msgid "Purge events older than"
 msgstr "Purgar acontecimientos anteriores a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:528
+#: ../modules/calendar/e-cal-shell-view-actions.c:554
 msgid "Copying Items"
 msgstr "Copiando elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:778
+#: ../modules/calendar/e-cal-shell-view-actions.c:804
 msgid "Moving Items"
 msgstr "Moviendo elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1079
-#: ../modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-memo-shell-view-actions.c:500
-#: ../modules/calendar/e-task-shell-view-actions.c:625
+#. To 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:1105
+#| msgid "Sent"
+msgid "event"
+msgstr "acontecimiento"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1107
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-memo-shell-view-actions.c:528
+#: ../modules/calendar/e-task-shell-view-actions.c:653
 msgid "Save as iCalendar"
 msgstr "Guardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1206
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-memo-shell-view-actions.c:630
 msgid "_Copy..."
 msgstr "_Copiarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-cal-shell-view-actions.c:1251
 msgid "Go Back"
 msgstr "Retroceder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Go Forward"
 msgstr "Avanzar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1234
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select today"
 msgstr "Selecciona hoy"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1241
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Select _Date"
 msgstr "Seleccionar _fecha"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Select a specific date"
 msgstr "Selecciona una fecha especÃfica"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1248
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "_New Calendar"
 msgstr "Calendario _nuevo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1262
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Purg_e"
 msgstr "Purg_ar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Purge old appointments and meetings"
 msgstr "Purgar reuniones y acontecimientos antiguos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-task-shell-view-actions.c:782
+msgid "Re_fresh"
+msgstr "Actuali_zar"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1300
+#| msgid "Rename the selected calendar"
+msgid "Refresh the selected calendar"
+msgstr "Actualizar el calendario seleccionado"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1307
 msgid "Rename the selected calendar"
 msgstr "Renombrar el calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Show _Only This Calendar"
 msgstr "Mostrar _sÃ³lo este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar al calendarioâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "_Delegate Meeting..."
 msgstr "_Delegar reuniÃ³nâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 msgid "Delete the appointment"
 msgstr "Borra la cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Delete This _Occurrence"
 msgstr "Borrar esta _repeticiÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "Delete this occurrence"
 msgstr "Borrar esta repeticiÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1334
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Delete all occurrences"
 msgstr "Borra todas las repeticiones"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "New All Day _Event..."
 msgstr "Acont_ecimiento nuevo para todo el dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1341
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 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:1346
-#: ../modules/calendar/e-cal-shell-view-memopad.c:322
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:396
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1382
+#: ../modules/calendar/e-cal-shell-view-memopad.c:325
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:399
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../modules/calendar/e-cal-shell-view-actions.c:1389
 msgid "New _Meeting..."
 msgstr "_ReuniÃ³n nuevaâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Create a new meeting"
 msgstr "Crear una reuniÃ³n nueva"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendarioâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "New _Appointment..."
 msgstr "_Cita nuevaâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1410
 msgid "Make this Occurrence _Movable"
 msgstr "Hacer esta repeticiÃ³n _movible"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
 msgid "_Open Appointment"
 msgstr "_Abrir cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "View the current appointment"
 msgstr "Ver la cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1424
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1402
-#: ../modules/calendar/e-cal-shell-view-memopad.c:350
+#: ../modules/calendar/e-cal-shell-view-actions.c:1438
+#: ../modules/calendar/e-cal-shell-view-memopad.c:353
 msgid "Save as iCalendar..."
 msgstr "Guardar como iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1445
 msgid "_Schedule Meeting..."
 msgstr "_Concertar una reuniÃ³nâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1411
-#| msgid "Purge old appointments and meetings"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
 msgid "Converts an appointment to a meeting"
 msgstr "Convierte una cita en una reuniÃ³n"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
-#| msgid "New _Appointment..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1452
 msgid "Conv_ert to Appointment..."
 msgstr "Con_vertir en una citaâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1418
-#| msgid "%s at the end of the appointment"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "Converts a meeting to an appointment"
 msgstr "Convierte una reuniÃ³n en una cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1550
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show as list"
 msgstr "Mostrar como una lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1564
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1569
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1571
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one week"
 msgstr "Mostrar una semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1578
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show one work week"
 msgstr "Mostrar una semana de trabajo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Next 7 Days' Appointments"
 msgstr "Citas de los prÃ³ximos 7 dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1631
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:836
+#: ../modules/calendar/e-task-shell-view-actions.c:1035
 msgid "Description contains"
 msgstr "La descripciÃ³n contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1638
-#: ../modules/calendar/e-memo-shell-view-actions.c:803
-#: ../modules/calendar/e-task-shell-view-actions.c:1002
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:843
+#: ../modules/calendar/e-task-shell-view-actions.c:1042
 msgid "Summary contains"
 msgstr "El resumen contiene"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1650
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "Imprime este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1657
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar el calendario que imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1772
 msgid "Go To"
 msgstr "Ir a"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:76
-#: ../modules/calendar/e-memo-shell-view-actions.c:96
+#: ../modules/calendar/e-memo-shell-view-actions.c:97
 msgid "Deleting selected memos..."
 msgstr "Borrando las notas seleccionadasâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:296
-#: ../modules/calendar/e-memo-shell-view-actions.c:568
+#. To 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:262
+#: ../modules/calendar/e-memo-shell-view-actions.c:526
+#| msgid "Memo"
+msgid "memo"
+msgstr "nota"
+
+#: ../modules/calendar/e-cal-shell-view-memopad.c:299
+#: ../modules/calendar/e-memo-shell-view-actions.c:597
 msgid "Copy selected memo"
 msgstr "Copia la nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:303
-#: ../modules/calendar/e-memo-shell-view-actions.c:575
+#: ../modules/calendar/e-cal-shell-view-memopad.c:306
+#: ../modules/calendar/e-memo-shell-view-actions.c:604
 msgid "Cut selected memo"
 msgstr "Corta la nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:310
-#: ../modules/calendar/e-memo-shell-view-actions.c:582
+#: ../modules/calendar/e-cal-shell-view-memopad.c:313
+#: ../modules/calendar/e-memo-shell-view-actions.c:611
 msgid "Paste memo from the clipboard"
 msgstr "Pegar notas desde el portapapeles"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:315
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-cal-shell-view-memopad.c:318
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "_Delete Memo"
 msgstr "_Borrar nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:317
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../modules/calendar/e-cal-shell-view-memopad.c:320
+#: ../modules/calendar/e-memo-shell-view-actions.c:618
 msgid "Delete selected memos"
 msgstr "Borra las notas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:329
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-memopad.c:332
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
 msgid "New _Memo"
 msgstr "_Nota nueva"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:331
+#: ../modules/calendar/e-cal-shell-view-memopad.c:334
 #: ../modules/calendar/e-memo-shell-backend.c:318
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:681
 msgid "Create a new memo"
 msgstr "Crea una nota nueva"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:336
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-cal-shell-view-memopad.c:339
+#: ../modules/calendar/e-memo-shell-view-actions.c:686
 msgid "_Open Memo"
 msgstr "_Abrir nota"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:652
+#: ../modules/calendar/e-cal-shell-view-memopad.c:341
+#: ../modules/calendar/e-memo-shell-view-actions.c:688
 msgid "View the selected memo"
 msgstr "Ver la nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:343
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:431
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-memopad.c:346
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:434
+#: ../modules/calendar/e-memo-shell-view-actions.c:693
+#: ../modules/calendar/e-task-shell-view-actions.c:831
 msgid "Open _Web Page"
 msgstr "Abrir pÃ¡gina _web"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:362
-#: ../modules/calendar/e-memo-shell-view-actions.c:829
+#: ../modules/calendar/e-cal-shell-view-memopad.c:365
+#: ../modules/calendar/e-memo-shell-view-actions.c:869
 msgid "Print the selected memo"
 msgstr "Imprimir la nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:444
-#: ../modules/calendar/e-memo-shell-view.c:229
+#: ../modules/calendar/e-cal-shell-view-memopad.c:445
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memo"
 msgid_plural "Delete Memos"
 msgstr[0] "Borrar nota"
 msgstr[1] "Borrar notas"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:99
-#: ../modules/calendar/e-task-shell-view-actions.c:127
+#: ../modules/calendar/e-task-shell-view-actions.c:128
 msgid "Deleting selected tasks..."
 msgstr "Borrando las tareas seleccionadasâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-view-actions.c:683
+#. To 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:330
+#: ../modules/calendar/e-task-shell-view-actions.c:651
+#| msgid "Task"
+msgid "task"
+msgstr "tarea"
+
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "_Assign Task"
 msgstr "_Asignar tarea"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:370
-#: ../modules/calendar/e-task-shell-view-actions.c:692
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../modules/calendar/e-task-shell-view-actions.c:721
 msgid "Copy selected tasks"
 msgstr "Copia las tareas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:377
-#: ../modules/calendar/e-task-shell-view-actions.c:699
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:380
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Cut selected tasks"
 msgstr "Corta las tareas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:706
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:387
+#: ../modules/calendar/e-task-shell-view-actions.c:735
 msgid "Paste tasks from the clipboard"
 msgstr "Pega las tareas del portapapeles"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:389
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "_Delete Task"
 msgstr "_Borrar tarea"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:391
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:394
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Delete selected tasks"
 msgstr "Borra las tareas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:403
-#: ../modules/calendar/e-task-shell-view-actions.c:767
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:406
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "_Mark as Complete"
 msgstr "_Marcar como terminado"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:405
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:408
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Mark selected tasks as complete"
 msgstr "Marcar tareas seleccionadas como terminadas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:410
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:413
 msgid "_Mark as Incomplete"
 msgstr "_Marcar como incompleta"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:412
-#: ../modules/calendar/e-task-shell-view-actions.c:776
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:415
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "Mark selected tasks as incomplete"
 msgstr "Marcar las tareas seleccionadas como incompletas"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:417
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:420
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "New _Task"
 msgstr "_Tarea nueva"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:419
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:422
 #: ../modules/calendar/e-task-shell-backend.c:322
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:819
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:424
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:427
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Open Task"
 msgstr "_Abrir tarea"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:426
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:429
+#: ../modules/calendar/e-task-shell-view-actions.c:826
 msgid "View the selected task"
 msgstr "Ver la tarea seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:438
-#: ../modules/calendar/e-memo-shell-view-actions.c:844
-#: ../modules/calendar/e-task-shell-view-actions.c:1043
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:441
+#: ../modules/calendar/e-memo-shell-view-actions.c:884
+#: ../modules/calendar/e-task-shell-view-actions.c:1083
 msgid "_Save as iCalendar..."
 msgstr "G_uardar como iCalendarâ?¦"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:450
-#: ../modules/calendar/e-task-shell-view-actions.c:1028
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:453
+#: ../modules/calendar/e-task-shell-view-actions.c:1068
 msgid "Print the selected task"
 msgstr "Imprimir la tarea seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:555
-#: ../modules/calendar/e-task-shell-view.c:356
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:556
+#: ../modules/calendar/e-task-shell-view.c:366
 msgid "Delete Task"
 msgid_plural "Delete Tasks"
 msgstr[0] "Borrar tarea"
@@ -15151,7 +15272,7 @@ msgid "Memo Li_st"
 msgstr "Li_sta de notas"
 
 #: ../modules/calendar/e-memo-shell-backend.c:335
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:646
 msgid "Create a new memo list"
 msgstr "Crea una lista de notas nueva"
 
@@ -15159,7 +15280,7 @@ msgstr "Crea una lista de notas nueva"
 msgid "The registry of memo lists"
 msgstr "El registro de lista de notas"
 
-#: ../modules/calendar/e-memo-shell-content.c:602
+#: ../modules/calendar/e-memo-shell-content.c:607
 msgid "The memo table model"
 msgstr "El modelo de la tabla de notas"
 
@@ -15171,70 +15292,75 @@ msgstr "Cargando notas"
 msgid "Memo List Selector"
 msgstr "Selector de lista de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:537
+#: ../modules/calendar/e-memo-shell-sidebar.c:544
 msgid "This widget displays groups of memo lists"
 msgstr "Este widget muestra grupos de listas de notas"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:690
+#: ../modules/calendar/e-memo-shell-sidebar.c:697
 #, c-format
 msgid "Opening memos at %s"
 msgstr "Abriendo notas en %s"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:253
-#: ../modules/calendar/e-memo-shell-view-actions.c:270
+#: ../modules/calendar/e-memo-shell-view-actions.c:251
+#: ../modules/calendar/e-memo-shell-view-actions.c:266
 msgid "Print Memos"
 msgstr "Imprimir notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "_New Memo List"
 msgstr "Lista de notas _nueva"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:631
+#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#| msgid "Rename the selected memo list"
+msgid "Refresh the selected memo list"
+msgstr "Actualizar la lista de notas seleccionada"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:667
 msgid "Rename the selected memo list"
 msgstr "Renombrar la lista de notas seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
+#: ../modules/calendar/e-memo-shell-view-actions.c:672
 msgid "Show _Only This Memo List"
 msgstr "Mostrar _sÃ³lo esta lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:727
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
 msgid "Memo _Preview"
 msgstr "Vista pre_via de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:769
 msgid "Show memo preview pane"
 msgstr "Mostrar el panel de vista previa de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
+#: ../modules/calendar/e-memo-shell-view-actions.c:790
 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:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
 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:815
+#: ../modules/calendar/e-memo-shell-view-actions.c:855
 msgid "Print the list of memos"
 msgstr "Imprime la lista de notas"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-memo-shell-view-actions.c:862
 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-private.c:417
+#: ../modules/calendar/e-memo-shell-view-private.c:413
 #, 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:421
-#: ../modules/calendar/e-task-shell-view-private.c:572
+#: ../modules/calendar/e-memo-shell-view-private.c:417
+#: ../modules/calendar/e-task-shell-view-private.c:568
 #, c-format
 msgid "%d selected"
 msgstr "%d seleccionada"
 
-#: ../modules/calendar/e-memo-shell-view.c:227
+#: ../modules/calendar/e-memo-shell-view.c:236
 msgid "Delete Memos"
 msgstr "Borrar notas"
 
@@ -15258,7 +15384,7 @@ msgid "Tas_k List"
 msgstr "Lista de _tareas"
 
 #: ../modules/calendar/e-task-shell-backend.c:339
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Create a new task list"
 msgstr "Crea una lista de tareas nueva"
 
@@ -15266,7 +15392,7 @@ msgstr "Crea una lista de tareas nueva"
 msgid "The registry of task lists"
 msgstr "El registro de listas de tareas"
 
-#: ../modules/calendar/e-task-shell-content.c:625
+#: ../modules/calendar/e-task-shell-content.c:630
 msgid "The task table model"
 msgstr "El modelo de tablas de tareas"
 
@@ -15296,21 +15422,21 @@ msgstr "Cargando tareas"
 msgid "Task List Selector"
 msgstr "Selector de listas de tareas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:535
+#: ../modules/calendar/e-task-shell-sidebar.c:542
 msgid "This widget displays groups of task lists"
 msgstr "Este widget muestra grupos de listas de tareas"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:688
+#: ../modules/calendar/e-task-shell-sidebar.c:695
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Abriendo tareas en %s"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:284
-#: ../modules/calendar/e-task-shell-view-actions.c:301
+#: ../modules/calendar/e-task-shell-view-actions.c:282
+#: ../modules/calendar/e-task-shell-view-actions.c:297
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:570
+#: ../modules/calendar/e-task-shell-view-actions.c:596
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -15322,86 +15448,91 @@ msgstr ""
 "\n"
 "Â¿Borrar realmente esas tareas?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-task-shell-view-actions.c:754
 msgid "Copy..."
 msgstr "_Copiarâ?¦"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_New Task List"
 msgstr "Lista de tareas _nueva"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:755
+#: ../modules/calendar/e-task-shell-view-actions.c:784
+#| msgid "Rename the selected task list"
+msgid "Refresh the selected task list"
+msgstr "Actualizar la lista de tareas seleccionada"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "Rename the selected task list"
 msgstr "Renombrar la lista de tareas seleccionada"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Show _Only This Task List"
 msgstr "Mostrar _sÃ³lo esta lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:810
 msgid "Mar_k as Incomplete"
 msgstr "_Marcar como incompleto"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:840
 msgid "Delete completed tasks"
 msgstr "Borra las tareas terminadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:891
+#: ../modules/calendar/e-task-shell-view-actions.c:931
 msgid "Task _Preview"
 msgstr "_Vista previa de tarea"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Show task preview pane"
 msgstr "Mostrar el panel de vista previa"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:914
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 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:921
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 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:929
+#: ../modules/calendar/e-task-shell-view-actions.c:969
 msgid "Active Tasks"
 msgstr "Tareas activas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:943
+#: ../modules/calendar/e-task-shell-view-actions.c:983
 msgid "Completed Tasks"
 msgstr "Tareas completadas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:950
+#: ../modules/calendar/e-task-shell-view-actions.c:990
 msgid "Next 7 Days' Tasks"
 msgstr "Tareas de los prÃ³ximos 7 dÃas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:997
 msgid "Overdue Tasks"
 msgstr "Tareas fuera de plazo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:964
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
 msgid "Tasks with Attachments"
 msgstr "Tareas con adjuntos"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1014
+#: ../modules/calendar/e-task-shell-view-actions.c:1054
 msgid "Print the list of tasks"
 msgstr "Imprime la lista de tareas"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1021
+#: ../modules/calendar/e-task-shell-view-actions.c:1061
 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-private.c:464
+#: ../modules/calendar/e-task-shell-view-private.c:462
 msgid "Expunging"
 msgstr "Compactando"
 
-#: ../modules/calendar/e-task-shell-view-private.c:568
+#: ../modules/calendar/e-task-shell-view-private.c:564
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../modules/calendar/e-task-shell-view.c:354
+#: ../modules/calendar/e-task-shell-view.c:364
 msgid "Delete Tasks"
 msgstr "Borrar tareas"
 
@@ -15411,430 +15542,346 @@ msgstr "Borrar tareas"
 msgid "%d attached messages"
 msgstr "%d mensajes adjuntos"
 
-#: ../modules/mail/e-mail-shell-backend.c:174
+#: ../modules/mail/e-mail-shell-backend.c:168
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:176
+#: ../modules/mail/e-mail-shell-backend.c:170
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: ../modules/mail/e-mail-shell-backend.c:184
+#: ../modules/mail/e-mail-shell-backend.c:178
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:186
+#: ../modules/mail/e-mail-shell-backend.c:180
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: ../modules/mail/e-mail-shell-backend.c:205
+#: ../modules/mail/e-mail-shell-backend.c:199
 msgid "Mail Accounts"
 msgstr "Cuentas de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:213
+#: ../modules/mail/e-mail-shell-backend.c:207
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
-#: ../modules/mail/e-mail-shell-backend.c:221
+#: ../modules/mail/e-mail-shell-backend.c:215
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
-#: ../modules/mail/e-mail-shell-backend.c:229
+#: ../modules/mail/e-mail-shell-backend.c:223
 msgid "Network Preferences"
 msgstr "Preferencias de red"
 
-#. green
-#: ../modules/mail/e-mail-shell-migrate.c:959
-msgid "To Do"
-msgstr "Tareas pendientes"
-
-#. blue
-#: ../modules/mail/e-mail-shell-migrate.c:960
-msgid "Later"
-msgstr "MÃ¡s tarde"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1139
-msgid "Migration"
-msgstr "MigraciÃ³n"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1589
-#, c-format
-msgid "Unable to create new folder `%s': %s"
-msgstr "No es posible crear la carpeta nueva: Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1617
-#, c-format
-msgid "Unable to copy folder `%s' to `%s': %s"
-msgstr "No es posible copiar el la carpeta Â«%sÂ» a Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1812
-#, c-format
-msgid "Unable to scan for existing mailboxes at `%s': %s"
-msgstr "No es posible buscar buzones existentes en Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1818
-#: ../modules/mail/e-mail-shell-migrate.c:2915
-msgid "Migrating Folders"
-msgstr "Migrando carpetas"
-
-#: ../modules/mail/e-mail-shell-migrate.c:1819
-msgid ""
-"The location and hierarchy of the Evolution mailbox folders has changed "
-"since Evolution 1.x.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El lugar y jerarquÃa de las carpetas de buzones de correo ha cambiado desde "
-"Evolution 1.x.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2022
-#, c-format
-msgid "Unable to open old POP keep-on-server data `%s': %s"
-msgstr "No es posible abrir los datos antiguos POP keep-on-server Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2038
-#, c-format
-msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
-msgstr "Fallo al crear directorio de datos POP3 keep-on-server Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2070
-#, c-format
-msgid "Unable to copy POP3 keep-on-server data `%s': %s"
-msgstr "No es posible copiar los datos POP3 keep-on-server Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2541
-#: ../modules/mail/e-mail-shell-migrate.c:2555
-#, c-format
-msgid "Failed to create local mail storage `%s': %s"
-msgstr "No es posible crear el almacÃ©n de correo local Â«%sÂ»: %s"
-
-#: ../modules/mail/e-mail-shell-migrate.c:2916
-msgid ""
-"The summary format of the Evolution mailbox folders has been moved to SQLite "
-"since Evolution 2.24.\n"
-"\n"
-"Please be patient while Evolution migrates your folders..."
-msgstr ""
-"El formato de resÃºmenes de las carpetas del buzÃ³n de Evolution se ha movido "
-"a sqlite desde Evolution 2.24.\n"
-"\n"
-"Tenga paciencia mientras Evolution migra sus carpetasâ?¦"
+#: ../modules/mail/e-mail-shell-content.c:702
+#| msgid "_Group By Threads"
+msgid "Group by Threads"
+msgstr "Agrupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-migrate.c:3013
-#, c-format
-msgid "Unable to create local mail folders at `%s': %s"
-msgstr "No es posible crear las carpetas de correo local en: Â«%sÂ»: %s"
+#: ../modules/mail/e-mail-shell-content.c:703
+msgid "Whether to group messages by threads"
+msgstr "Indica si se deben agrupar los mensajes por conversaciones"
 
-#: ../modules/mail/e-mail-shell-migrate.c:3031
-#, c-format
-msgid ""
-"Unable to read settings from previous Evolution install, `evolution/config."
-"xmldb' does not exist or is corrupt."
-msgstr ""
-"No es posible leer la configuraciÃ³n de la instalaciÃ³n anterior de Evolution, "
-"Â«evolution/config.xmldbÂ» no existe o estÃ¡ corrompido."
-
-#: ../modules/mail/e-mail-shell-view-actions.c:984
-#: ../modules/mail/e-mail-shell-view.c:507
+#: ../modules/mail/e-mail-shell-view-actions.c:959
+#: ../modules/mail/e-mail-shell-view.c:515
 msgid "_Disable Account"
 msgstr "_Desactivar cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:986
+#: ../modules/mail/e-mail-shell-view-actions.c:961
 msgid "Disable this account"
 msgstr "Desactivar esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:991
+#: ../modules/mail/e-mail-shell-view-actions.c:966
 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:998
+#: ../modules/mail/e-mail-shell-view-actions.c:973
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar mensajes para trabajar sin conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1000
+#: ../modules/mail/e-mail-shell-view-actions.c:975
 msgid "Download messages of accounts and folders marked for offline"
 msgstr ""
 "Descargar correos para las cuentas y carpetas marcadas como sin conexiÃ³n"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1005
+#: ../modules/mail/e-mail-shell-view-actions.c:980
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1007
-#: ../modules/mail/e-mail-shell-view-actions.c:1014
+#: ../modules/mail/e-mail-shell-view-actions.c:982
+#: ../modules/mail/e-mail-shell-view-actions.c:989
 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:1019
+#: ../modules/mail/e-mail-shell-view-actions.c:994
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1026
+#: ../modules/mail/e-mail-shell-view-actions.c:1001
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta aâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1003
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada en otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1035
+#: ../modules/mail/e-mail-shell-view-actions.c:1010
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1040
+#: ../modules/mail/e-mail-shell-view-actions.c:1015
 msgid "E_xpunge"
 msgstr "C_ompactar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1042
+#: ../modules/mail/e-mail-shell-view-actions.c:1017
 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:1047
+#: ../modules/mail/e-mail-shell-view-actions.c:1022
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar todos los mensajes como _leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1049
+#: ../modules/mail/e-mail-shell-view-actions.c:1024
 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:1054
+#: ../modules/mail/e-mail-shell-view-actions.c:1029
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta aâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1056
+#: ../modules/mail/e-mail-shell-view-actions.c:1031
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1061
+#: ../modules/mail/e-mail-shell-view-actions.c:1036
 msgid "_New..."
 msgstr "_Nuevaâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1063
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nueva para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1070
+#: ../modules/mail/e-mail-shell-view-actions.c:1045
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1077
+#: ../modules/mail/e-mail-shell-view-actions.c:1052
 msgid "Refresh the folder"
 msgstr "Actualizar la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1084
+#: ../modules/mail/e-mail-shell-view-actions.c:1059
 msgid "Change the name of this folder"
 msgstr "Cambia el nombre de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1089
+#: ../modules/mail/e-mail-shell-view-actions.c:1064
 msgid "Select _All Messages"
 msgstr "Seleccionar _todos los mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1091
+#: ../modules/mail/e-mail-shell-view-actions.c:1066
 msgid "Select all visible messages"
 msgstr "Selecciona todos los mensajes visibles"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1096
+#: ../modules/mail/e-mail-shell-view-actions.c:1071
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versaciÃ³n del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1098
+#: ../modules/mail/e-mail-shell-view-actions.c:1073
 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:1103
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar s_ubconversaciÃ³n del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1105
+#: ../modules/mail/e-mail-shell-view-actions.c:1080
 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:1110
+#: ../modules/mail/e-mail-shell-view-actions.c:1085
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1112
+#: ../modules/mail/e-mail-shell-view-actions.c:1087
 msgid "Unsubscribe from the selected folder"
 msgstr "Desuscribirse de la carpeta seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1117
+#: ../modules/mail/e-mail-shell-view-actions.c:1092
 msgid "_New Label"
 msgstr "Etiqueta n_ueva"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1099
 msgid "N_one"
 msgstr "Ning_uno"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1131
+#: ../modules/mail/e-mail-shell-view-actions.c:1106
 msgid "Hide _Read Messages"
 msgstr "Ocultar mensajes _leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1133
+#: ../modules/mail/e-mail-shell-view-actions.c:1108
 msgid "Temporarily hide all messages that have already been read"
 msgstr "Oculta temporalmente todos los mensajes que han sido leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1138
+#: ../modules/mail/e-mail-shell-view-actions.c:1113
 msgid "Hide S_elected Messages"
 msgstr "Ocultar mensajes s_eleccionados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1140
+#: ../modules/mail/e-mail-shell-view-actions.c:1115
 msgid "Temporarily hide the selected messages"
 msgstr "Oculta temporalmente los mensajes seleccionados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1145
+#: ../modules/mail/e-mail-shell-view-actions.c:1120
 msgid "Show Hidde_n Messages"
 msgstr "_Mostrar mensajes ocultos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1147
+#: ../modules/mail/e-mail-shell-view-actions.c:1122
 msgid "Show messages that have been temporarily hidden"
 msgstr "Mostrar los mensajes que han estado ocultos temporalmente"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1168
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operaciÃ³n de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1173
+#: ../modules/mail/e-mail-shell-view-actions.c:1148
 msgid "Collapse All _Threads"
 msgstr "_Contraer todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1175
+#: ../modules/mail/e-mail-shell-view-actions.c:1150
 msgid "Collapse all message threads"
 msgstr "Contrae todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1155
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1157
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1162
 msgid "_Message Filters"
 msgstr "_Filtros de correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1164
 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:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1169
 msgid "Search F_olders"
 msgstr "Carpetas de bÃºsque_da"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1171
 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:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1176
 msgid "_Subscriptions..."
 msgstr "_Suscripcionesâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1178
 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:1210
+#: ../modules/mail/e-mail-shell-view-actions.c:1185
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1192
 msgid "_Label"
 msgstr "Etiq_ueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1257
+#: ../modules/mail/e-mail-shell-view-actions.c:1232
 msgid "_New Folder..."
 msgstr "Carpeta _nuevaâ?¦"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1281
+#: ../modules/mail/e-mail-shell-view-actions.c:1256
 msgid "Hide _Deleted Messages"
 msgstr "Ocultar correos _borrados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1283
+#: ../modules/mail/e-mail-shell-view-actions.c:1258
 msgid ""
 "Hide deleted messages rather than displaying them with a line through them"
 msgstr ""
 "Ocultar los correos borrados en lugar de mostrarlos tachados por una lÃnea"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1290
+#: ../modules/mail/e-mail-shell-view-actions.c:1265
 msgid "Show Message _Preview"
 msgstr "Mostrar vista _previa del correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1267
 msgid "Show message preview pane"
 msgstr "Mostrar el correo en el panel de vista previa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#: ../modules/mail/e-mail-shell-view-actions.c:1275
 msgid "Threaded message list"
 msgstr "Lista de correos por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1321
+#: ../modules/mail/e-mail-shell-view-actions.c:1296
 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:1328
+#: ../modules/mail/e-mail-shell-view-actions.c:1303
 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:1336
+#: ../modules/mail/e-mail-shell-view-actions.c:1311
 msgid "All Messages"
 msgstr "Todos los correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1318
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1325
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los Ãºltimos 5 dÃas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1332
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1339
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1371
+#: ../modules/mail/e-mail-shell-view-actions.c:1346
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1353
 msgid "Read Messages"
 msgstr "Mensajes leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1360
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1367
 msgid "Unread Messages"
 msgstr "Mensajes no leÃdos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1444
+#: ../modules/mail/e-mail-shell-view-actions.c:1419
 msgid "Subject or Addresses contain"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1454
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
@@ -15895,11 +15942,11 @@ msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view.c:505
+#: ../modules/mail/e-mail-shell-view.c:513
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesiÃ³n proxy"
 
-#: ../modules/mail/em-composer-prefs.c:478
+#: ../modules/mail/em-composer-prefs.c:477
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -15959,11 +16006,18 @@ msgstr ""
 msgid "No junk plugin available"
 msgstr "No existe un complemento de SPAM disponible"
 
-#: ../modules/mail/em-mailer-prefs.c:1151
-msgid "Date header:"
-msgstr "Cabecera de fecha:"
+#. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
+#: ../modules/mail/em-mailer-prefs.c:1152
+msgid "_Table column:"
+msgstr "Columna de _tabla:"
+
+#. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
+#: ../modules/mail/em-mailer-prefs.c:1154
+#| msgid "Date header:"
+msgid "_Date header:"
+msgstr "Cabecera de _fecha:"
 
-#: ../modules/mail/em-mailer-prefs.c:1153
+#: ../modules/mail/em-mailer-prefs.c:1155
 msgid "Show _original header value"
 msgstr "Mostrar el valor _original de la cabecera"
 
@@ -16008,7 +16062,7 @@ msgstr ""
 "el cuerpo de un mensaje."
 
 #: ../plugins/attachment-reminder/attachment-reminder.c:514
-#: ../plugins/templates/templates.c:414
+#: ../plugins/templates/templates.c:413
 msgid "Keywords"
 msgstr "Palabras clave"
 
@@ -16051,24 +16105,24 @@ msgid "Play audio attachments directly in mail messages."
 msgstr ""
 "Reproducir los adjuntos de sonido directamente en los mensajes de correo."
 
-#: ../plugins/backup-restore/backup-restore.c:148
+#: ../plugins/backup-restore/backup-restore.c:152
 msgid "Select name of the Evolution backup file"
 msgstr "Seleccione el nombre de archivo de respaldo Evolution"
 
-#: ../plugins/backup-restore/backup-restore.c:179
+#: ../plugins/backup-restore/backup-restore.c:183
 msgid "_Restart Evolution after backup"
 msgstr "_Reiniciar Evolution despuÃ©s del respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:205
+#: ../plugins/backup-restore/backup-restore.c:209
 msgid "Select name of the Evolution backup file to restore"
 msgstr ""
 "Seleccione el nombre del archivo de respaldo de Evolution para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:218
+#: ../plugins/backup-restore/backup-restore.c:222
 msgid "_Restart Evolution after restore"
 msgstr "_Reiniciar Evolution despuÃ©s de la restauraciÃ³n"
 
-#: ../plugins/backup-restore/backup-restore.c:286
+#: ../plugins/backup-restore/backup-restore.c:290
 msgid ""
 "You can restore Evolution from your backup. It can restore all the Mails, "
 "Calendars, Tasks, Memos, Contacts. It also restores all your personal "
@@ -16078,35 +16132,35 @@ msgstr ""
 "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:293
+#: ../plugins/backup-restore/backup-restore.c:297
 msgid "_Restore Evolution from the backup file"
 msgstr "_Restaurar Evolution desde el archivo de respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:300
+#: ../plugins/backup-restore/backup-restore.c:304
 msgid "Please select an Evolution Archive to restore:"
 msgstr "Seleccione un archivador de Evolution para restaurar:"
 
-#: ../plugins/backup-restore/backup-restore.c:303
+#: ../plugins/backup-restore/backup-restore.c:307
 msgid "Choose a file to restore"
 msgstr "Elija un archivador para restaurar"
 
-#: ../plugins/backup-restore/backup-restore.c:311
+#: ../plugins/backup-restore/backup-restore.c:315
 msgid "Restore from backup"
 msgstr "Restaurar desde un respaldo"
 
-#: ../plugins/backup-restore/backup-restore.c:347
+#: ../plugins/backup-restore/backup-restore.c:353
 msgid "_Backup Settings..."
 msgstr "_Respaldar ajustesâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:349
+#: ../plugins/backup-restore/backup-restore.c:355
 msgid "Backup Evolution data and settings to an archive file"
 msgstr "Respaldar y restaurar los datos y la configuraciÃ³n a un archivador"
 
-#: ../plugins/backup-restore/backup-restore.c:354
+#: ../plugins/backup-restore/backup-restore.c:360
 msgid "R_estore Settings..."
 msgstr "R_estaurar ajustesâ?¦"
 
-#: ../plugins/backup-restore/backup-restore.c:356
+#: ../plugins/backup-restore/backup-restore.c:362
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Respaldar y restaurar los datos y la configuraciÃ³n desde un archivador"
 
@@ -16386,22 +16440,153 @@ msgstr "Opciones de Bogofilter"
 msgid "Filter junk messages using Bogofilter."
 msgstr "Filtra mensajes SPAM usando Bogofilter."
 
-#: ../plugins/caldav/caldav-source.c:64
+#: ../plugins/caldav/caldav-browse-server.c:199
+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:201
+msgid "Given URL cannot be found."
+msgstr "No se puede encontrar el URL proporcionado."
+
+#: ../plugins/caldav/caldav-browse-server.c:205
+#, 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:205
+#: ../plugins/caldav/caldav-browse-server.c:1250 ../plugins/face/face.c:169
+msgid "Unknown error"
+msgstr "Error desconocido"
+
+#: ../plugins/caldav/caldav-browse-server.c:335
+#: ../plugins/caldav/caldav-browse-server.c:586
+#| msgid "Failed to update delegates:"
+msgid "Failed to parse server response."
+msgstr "FallÃ³ al analizar la respuesta del servidor."
+
+#: ../plugins/caldav/caldav-browse-server.c:429
+#| msgid "Ends"
+msgid "Events"
+msgstr "Acontecimientos"
+
+#: ../plugins/caldav/caldav-browse-server.c:451
+#| msgid "Web Calendars"
+msgid "User's calendars"
+msgstr "Calendarios del usuario"
+
+#: ../plugins/caldav/caldav-browse-server.c:559
+#: ../plugins/caldav/caldav-browse-server.c:630
+#| msgid "Failed to authenticate with LDAP server."
+msgid "Failed to get server URL."
+msgstr "FallÃ³ al obtener el URL del servidor."
+
+#: ../plugins/caldav/caldav-browse-server.c:628
+#: ../plugins/caldav/caldav-browse-server.c:669
+#: ../plugins/caldav/caldav-browse-server.c:1273
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching for user's calendars..."
+msgstr "Buscando los calendarios del usuarioâ?¦"
+
+#: ../plugins/caldav/caldav-browse-server.c:667
+#| msgid "Unable to find any calendars"
+msgid "Could not find any user calendar."
+msgstr "No se pudo encontrar ningÃºn calendario del usuario."
+
+#: ../plugins/caldav/caldav-browse-server.c:795
+#, c-format
+msgid "Previous attempt failed: %s"
+msgstr "FallÃ³ el intento anterior: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:797
+#, 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:800
+#, c-format
+#| msgid "Enter password for %s (user %s)"
+msgid "Enter password for user <b>%s</b> on server <b>%s</b>"
+msgstr ""
+"Introduzca la contraseÃ±a para el usuario <b>%s</b> en el servidor <b>%s</b>"
+
+#: ../plugins/caldav/caldav-browse-server.c:857
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot create output file: %s:\n"
+#| " %s"
+msgid "Cannot create soup message for URL '%s'"
+msgstr ""
+"No es posible crear el archivo de salida: %s:\n"
+" %s"
+
+#. fetch content
+#: ../plugins/caldav/caldav-browse-server.c:1092
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\n"
+#| "Searching for the Contacts..."
+msgid "Searching folder content..."
+msgstr ""
+"\n"
+"\n"
+"Buscando contactosâ?¦"
+
+#: ../plugins/caldav/caldav-browse-server.c:1135
+#, fuzzy
+#| msgid "Loading calendars"
+msgid "List of available calendars:"
+msgstr "Cargando calendarios"
+
+#: ../plugins/caldav/caldav-browse-server.c:1172
+#, fuzzy
+#| msgid "Suppliers"
+msgid "Supports"
+msgstr "Proveedores"
+
+#: ../plugins/caldav/caldav-browse-server.c:1250
+#, fuzzy, c-format
+#| msgid "Failed to create pipe: %s"
+msgid "Failed to create thread: %s"
+msgstr "FallÃ³ al crear la tuberÃa: %s"
+
+#: ../plugins/caldav/caldav-browse-server.c:1358
+#, c-format
+msgid "Server URL '%s' is not a valid URL"
+msgstr ""
+
+#: ../plugins/caldav/caldav-browse-server.c:1364
+msgid "Browse for a CalDAV calendar"
+msgstr ""
+
+#: ../plugins/caldav/caldav-source.c:66
 msgid "CalDAV"
 msgstr "CalDAV"
 
-#: ../plugins/caldav/caldav-source.c:366
+#: ../plugins/caldav/caldav-source.c:402
 #: ../plugins/calendar-http/calendar-http.c:171
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../plugins/caldav/caldav-source.c:390
+#: ../plugins/caldav/caldav-source.c:426
 #: ../plugins/google-account-setup/google-contacts-source.c:303
 msgid "Use _SSL"
 msgstr "Usar _SSL"
 
+#: ../plugins/caldav/caldav-source.c:468
+msgid "Brows_e server for a calendar"
+msgstr ""
+
 #. add refresh option
-#: ../plugins/caldav/caldav-source.c:433
+#: ../plugins/caldav/caldav-source.c:480
 #: ../plugins/calendar-file/calendar-file.c:274
 #: ../plugins/calendar-http/calendar-http.c:308
 #: ../plugins/calendar-weather/calendar-weather.c:499
@@ -16530,14 +16715,12 @@ msgstr "AÃ±adir calendarios meteorolÃ³gicos a Evolution."
 msgid "Weather Calendars"
 msgstr "Calendario meteorolÃ³gico"
 
-#: ../plugins/contacts-map/contacts-map.c:60
-#: ../plugins/contacts-map/contacts-map.c:196
-#| msgid "Contacts: "
+#: ../plugins/contacts-map/contacts-map.c:59
+#: ../plugins/contacts-map/contacts-map.c:193
 msgid "Contacts map"
 msgstr "Mapa de los contactos"
 
-#: ../plugins/contacts-map/contacts-map.c:61
-#| msgid "Show contact preview below the contact list"
+#: ../plugins/contacts-map/contacts-map.c:60
 msgid "Show a map of all the contacts"
 msgstr "Mostrar un mapa de todos los contactos"
 
@@ -16547,7 +16730,6 @@ msgstr ""
 "AÃ±adir un mapa mostrando la ubicaciÃ³n de los contactos cuando sea posible."
 
 #: ../plugins/contacts-map/org-gnome-contacts-map.eplug.xml.h:2
-#| msgid "No contacts"
 msgid "Map for contacts"
 msgstr "Mapa para los contactos"
 
@@ -16620,33 +16802,33 @@ msgstr ""
 "la cabecera es: el nombre de la cabecera personalizada seguido de un Â«=Â» y "
 "los valores separados por Â«;Â»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:319
+#: ../plugins/email-custom-header/email-custom-header.c:318
 msgid "Security:"
 msgstr "Seguridad:"
 
-#: ../plugins/email-custom-header/email-custom-header.c:324
+#: ../plugins/email-custom-header/email-custom-header.c:323
 msgid "Unclassified"
 msgstr "Sin clasificar"
 
-#: ../plugins/email-custom-header/email-custom-header.c:325
+#: ../plugins/email-custom-header/email-custom-header.c:324
 msgid "Protected"
 msgstr "Protegido"
 
-#: ../plugins/email-custom-header/email-custom-header.c:327
+#: ../plugins/email-custom-header/email-custom-header.c:326
 #: ../widgets/misc/e-send-options.ui.h:17
 msgid "Secret"
 msgstr "Secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:328
+#: ../plugins/email-custom-header/email-custom-header.c:327
 msgid "Top secret"
 msgstr "Alto secreto"
 
-#: ../plugins/email-custom-header/email-custom-header.c:570
+#: ../plugins/email-custom-header/email-custom-header.c:569
 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:895
+#: ../plugins/email-custom-header/email-custom-header.c:894
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -16655,12 +16837,12 @@ msgstr ""
 "es:\n"
 "Valores clave del nombre de la cabecera personalizada separados por Â«;Â»."
 
-#: ../plugins/email-custom-header/email-custom-header.c:949
+#: ../plugins/email-custom-header/email-custom-header.c:948
 msgid "Key"
 msgstr "Clave"
 
-#: ../plugins/email-custom-header/email-custom-header.c:960
-#: ../plugins/templates/templates.c:420
+#: ../plugins/email-custom-header/email-custom-header.c:959
+#: ../plugins/templates/templates.c:419
 msgid "Values"
 msgstr "Valores"
 
@@ -16769,10 +16951,6 @@ msgstr ""
 "forma predeterminada. La imagen deberÃa establecerse antes de seleccionar "
 "esto, de otra forma no sucederÃ¡ nada."
 
-#: ../plugins/face/face.c:169
-msgid "Unknown error"
-msgstr "Error desconocido"
-
 #: ../plugins/face/face.c:286
 msgid "Select a png picture (the best 48*48 of size < 720 bytes)"
 msgstr "Seleccionar una imagen png (el mejor tamaÃ±o es 48*48 < 720bytes)"
@@ -16849,8 +17027,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:623
-#: ../plugins/mail-to-task/mail-to-task.c:724
-#: ../plugins/mail-to-task/mail-to-task.c:942
+#: ../plugins/mail-to-task/mail-to-task.c:725
+#: ../plugins/mail-to-task/mail-to-task.c:941
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -16874,23 +17052,23 @@ msgstr "Calendarios de Google"
 msgid "Checklist"
 msgstr "Lista de comprobaciÃ³n"
 
-#: ../plugins/groupwise-features/gw-ui.c:110
+#: ../plugins/groupwise-features/gw-ui.c:112
 msgid "New _Shared Folder..."
 msgstr "Carpeta compartida _nuevaâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:117
+#: ../plugins/groupwise-features/gw-ui.c:119
 msgid "_Proxy Login..."
 msgstr "SesiÃ³n _proxyâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:168
+#: ../plugins/groupwise-features/gw-ui.c:170
 msgid "Junk Mail Settings..."
 msgstr "Opciones de SPAMâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:175
+#: ../plugins/groupwise-features/gw-ui.c:177
 msgid "Track Message Status..."
 msgstr "Seguir el estado del mensajeâ?¦"
 
-#: ../plugins/groupwise-features/gw-ui.c:181
+#: ../plugins/groupwise-features/gw-ui.c:183
 msgid "Retract Mail"
 msgstr "Retractar correo"
 
@@ -16958,7 +17136,7 @@ msgid "Junk List:"
 msgstr "Lista de SPAM:"
 
 #: ../plugins/groupwise-features/junk-settings.ui.h:5
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.c:596
 msgid "_Disable"
 msgstr "_Desactivar"
 
@@ -16976,11 +17154,11 @@ msgstr "Lista de _SPAM"
 msgid "_Remove"
 msgstr "_Quitar"
 
-#: ../plugins/groupwise-features/mail-retract.c:82
+#: ../plugins/groupwise-features/mail-retract.c:81
 msgid "Message Retract"
 msgstr "Retirada de correo"
 
-#: ../plugins/groupwise-features/mail-retract.c:87
+#: ../plugins/groupwise-features/mail-retract.c:86
 msgid ""
 "Retracting a message may remove it from the recipient's mailbox. Are you "
 "sure you want to do this?"
@@ -16988,7 +17166,7 @@ msgstr ""
 "Retirar un correo puede eliminarlo del buzÃ³n de correo del destinatario. "
 "Â¿EstÃ¡ seguro de que quiere hacer esto?"
 
-#: ../plugins/groupwise-features/mail-retract.c:106
+#: ../plugins/groupwise-features/mail-retract.c:107
 msgid "Message retracted successfully"
 msgstr "Correo retirado con Ã©xito"
 
@@ -17124,11 +17302,6 @@ msgstr "_Personalizar el mensaje de notificaciÃ³n"
 msgid "Con_tacts..."
 msgstr "Con_tactosâ?¦"
 
-#: ../plugins/groupwise-features/properties.ui.h:5
-#: ../widgets/table/e-table-click-to-add.c:512
-msgid "Message"
-msgstr "Mensaje"
-
 #: ../plugins/groupwise-features/properties.ui.h:6
 msgid "Shared Folder Notification"
 msgstr "NotificaciÃ³n de carpeta compartida"
@@ -17203,26 +17376,26 @@ msgstr "SesiÃ³n proxy"
 
 #: ../plugins/groupwise-features/proxy-login.c:209
 #: ../plugins/groupwise-features/proxy-login.c:252
-#: ../plugins/groupwise-features/proxy.c:487
+#: ../plugins/groupwise-features/proxy.c:495
 #: ../plugins/groupwise-features/send-options.c:85
 #, c-format
 msgid "%sEnter password for %s (user %s)"
 msgstr "%s Introduzca la contraseÃ±a para %s (usuario %s)"
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:684
+#: ../plugins/groupwise-features/proxy.c:692
 msgid "The Proxy tab will be available only when the account is online."
 msgstr ""
 "La solapa del Proxy estarÃ¡ disponible sÃ³lo cuando la cuenta estÃ© conectada."
 
 #. To Translators: In this case, Proxy does not mean something like 'HTTP Proxy', but a GroupWise feature by which one person can send/read mails/appointments using another person's identity without knowing his password, for example if that other person is on vacation
-#: ../plugins/groupwise-features/proxy.c:690
+#: ../plugins/groupwise-features/proxy.c:698
 msgid "The Proxy tab will be available only when the account is enabled."
 msgstr ""
 "La solapa del Proxy estarÃ¡ disponible sÃ³lo cuando la cuenta estÃ© activada."
 
-#: ../plugins/groupwise-features/proxy.c:923
-#: ../plugins/groupwise-features/share-folder.c:699
+#: ../plugins/groupwise-features/proxy.c:931
+#: ../plugins/groupwise-features/share-folder.c:702
 msgid "Add User"
 msgstr "AÃ±adir usuario"
 
@@ -17231,7 +17404,7 @@ msgid "Advanced send options"
 msgstr "Opciones de envÃo avanzadas"
 
 #: ../plugins/groupwise-features/share-folder-common.c:317
-#: ../plugins/groupwise-features/share-folder.c:734
+#: ../plugins/groupwise-features/share-folder.c:737
 msgid "Users"
 msgstr "Usuarios"
 
@@ -17243,64 +17416,64 @@ msgstr "Introduzca los usuarios y establezca permisos"
 msgid "Sharing"
 msgstr "Compartir"
 
-#: ../plugins/groupwise-features/share-folder.c:527
+#: ../plugins/groupwise-features/share-folder.c:530
 msgid "Custom Notification"
 msgstr "NotificaciÃ³n personalizada"
 
-#: ../plugins/groupwise-features/share-folder.c:739
+#: ../plugins/groupwise-features/share-folder.c:742
 msgid "Add   "
 msgstr "AÃ±adir   "
 
-#: ../plugins/groupwise-features/share-folder.c:745
+#: ../plugins/groupwise-features/share-folder.c:748
 msgid "Modify"
 msgstr "Modificar"
 
-#: ../plugins/groupwise-features/status-track.c:124
+#: ../plugins/groupwise-features/status-track.c:123
 msgid "Message Status"
 msgstr "Estado del mensaje"
 
 #. Subject
-#: ../plugins/groupwise-features/status-track.c:138
+#: ../plugins/groupwise-features/status-track.c:137
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: ../plugins/groupwise-features/status-track.c:152
+#: ../plugins/groupwise-features/status-track.c:151
 msgid "From:"
 msgstr "De:"
 
-#: ../plugins/groupwise-features/status-track.c:167
+#: ../plugins/groupwise-features/status-track.c:166
 msgid "Creation date:"
 msgstr "Fecha de creaciÃ³n:"
 
-#: ../plugins/groupwise-features/status-track.c:206
+#: ../plugins/groupwise-features/status-track.c:205
 msgid "Recipient: "
 msgstr "Destinatario: "
 
-#: ../plugins/groupwise-features/status-track.c:213
+#: ../plugins/groupwise-features/status-track.c:212
 msgid "Delivered: "
 msgstr "Entregado: "
 
-#: ../plugins/groupwise-features/status-track.c:219
+#: ../plugins/groupwise-features/status-track.c:218
 msgid "Opened: "
 msgstr "Abierto: "
 
-#: ../plugins/groupwise-features/status-track.c:224
+#: ../plugins/groupwise-features/status-track.c:223
 msgid "Accepted: "
 msgstr "Aceptado: "
 
-#: ../plugins/groupwise-features/status-track.c:229
+#: ../plugins/groupwise-features/status-track.c:228
 msgid "Deleted: "
 msgstr "Borrado: "
 
-#: ../plugins/groupwise-features/status-track.c:234
+#: ../plugins/groupwise-features/status-track.c:233
 msgid "Declined: "
 msgstr "Rechazado: "
 
-#: ../plugins/groupwise-features/status-track.c:239
+#: ../plugins/groupwise-features/status-track.c:238
 msgid "Completed: "
 msgstr "Completado: "
 
-#: ../plugins/groupwise-features/status-track.c:244
+#: ../plugins/groupwise-features/status-track.c:243
 msgid "Undelivered: "
 msgstr "Sin entregar: "
 
@@ -17454,61 +17627,61 @@ msgstr "Enviar una notificaciÃ³n de cancelaciÃ³n al delegado"
 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:1369
+#: ../plugins/itip-formatter/itip-formatter.c:1372
 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 es "
 "invÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1398
+#: ../plugins/itip-formatter/itip-formatter.c:1401
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1402
+#: ../plugins/itip-formatter/itip-formatter.c:1405
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1428
+#: ../plugins/itip-formatter/itip-formatter.c:1431
 msgid "Meeting information sent"
 msgstr "InformaciÃ³n de reuniÃ³n enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1431
+#: ../plugins/itip-formatter/itip-formatter.c:1434
 msgid "Task information sent"
 msgstr "InformaciÃ³n de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1434
+#: ../plugins/itip-formatter/itip-formatter.c:1437
 msgid "Memo information sent"
 msgstr "InformaciÃ³n de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1443
+#: ../plugins/itip-formatter/itip-formatter.c:1446
 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:1446
+#: ../plugins/itip-formatter/itip-formatter.c:1449
 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:1449
+#: ../plugins/itip-formatter/itip-formatter.c:1452
 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:1514
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1519
+#: ../plugins/itip-formatter/itip-formatter.c:1522
 msgid "Save Calendar"
 msgstr "Guardar calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1572
-#: ../plugins/itip-formatter/itip-formatter.c:1583
+#: ../plugins/itip-formatter/itip-formatter.c:1575
+#: ../plugins/itip-formatter/itip-formatter.c:1586
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es vÃ¡lido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1573
-#: ../plugins/itip-formatter/itip-formatter.c:1584
+#: ../plugins/itip-formatter/itip-formatter.c:1576
+#: ../plugins/itip-formatter/itip-formatter.c:1587
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -17516,15 +17689,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar vÃ¡lido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:1624
-#: ../plugins/itip-formatter/itip-formatter.c:1652
-#: ../plugins/itip-formatter/itip-formatter.c:1758
+#: ../plugins/itip-formatter/itip-formatter.c:1627
+#: ../plugins/itip-formatter/itip-formatter.c:1655
+#: ../plugins/itip-formatter/itip-formatter.c:1761
 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:1625
-#: ../plugins/itip-formatter/itip-formatter.c:1653
-#: ../plugins/itip-formatter/itip-formatter.c:1759
+#: ../plugins/itip-formatter/itip-formatter.c:1628
+#: ../plugins/itip-formatter/itip-formatter.c:1656
+#: ../plugins/itip-formatter/itip-formatter.c:1762
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -17532,11 +17705,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:1666
+#: ../plugins/itip-formatter/itip-formatter.c:1669
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos mÃºltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1667
+#: ../plugins/itip-formatter/itip-formatter.c:1670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -17544,31 +17717,31 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo deberÃa guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2431
+#: ../plugins/itip-formatter/itip-formatter.c:2435
 msgid "This meeting recurs"
 msgstr "Esta reuniÃ³n se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2434
+#: ../plugins/itip-formatter/itip-formatter.c:2438
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2437
+#: ../plugins/itip-formatter/itip-formatter.c:2441
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
 #. Delete message after acting
 #. FIXME Need a schema for this
-#: ../plugins/itip-formatter/itip-formatter.c:2667
+#: ../plugins/itip-formatter/itip-formatter.c:2671
 msgid "_Delete message after acting"
 msgstr "_Borrar el mensaje despuÃ©s de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2677
-#: ../plugins/itip-formatter/itip-formatter.c:2710
+#: ../plugins/itip-formatter/itip-formatter.c:2681
+#: ../plugins/itip-formatter/itip-formatter.c:2714
 msgid "Conflict Search"
 msgstr "BÃºsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:2692
+#: ../plugins/itip-formatter/itip-formatter.c:2696
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
@@ -17948,7 +18121,6 @@ msgid "All day:"
 msgstr "Todo el dÃa:"
 
 #: ../plugins/itip-formatter/itip-view.c:686
-#| msgid "Sta_rt date:"
 msgid "Start day:"
 msgstr "DÃa de inicio:"
 
@@ -17959,8 +18131,6 @@ msgid "Start time:"
 msgstr "Hora de inicio:"
 
 #: ../plugins/itip-formatter/itip-view.c:698
-#| msgid "%d day"
-#| msgid_plural "%d days"
 msgid "End day:"
 msgstr "DÃa de fin:"
 
@@ -18270,12 +18440,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:165
+#: ../plugins/mail-to-task/mail-to-task.c:166
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:495
+#: ../plugins/mail-to-task/mail-to-task.c:496
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18284,7 +18454,7 @@ msgstr ""
 "El calendario seleccionado ya contiene el acontecimiento Â«%sÂ». Â¿Quiere editar "
 "el acontecimiento antiguo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:498
+#: ../plugins/mail-to-task/mail-to-task.c:499
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18293,7 +18463,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:501
+#: ../plugins/mail-to-task/mail-to-task.c:502
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18302,7 +18472,7 @@ msgstr ""
 "La lista de notas seleccionada ya contiene la nota Â«%sÂ». Â¿Quiere editar la "
 "nota antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:518
+#: ../plugins/mail-to-task/mail-to-task.c:519
 msgid ""
 "Selected calendar contains some events for the given mails already. Would "
 "you like to create new events anyway?"
@@ -18310,7 +18480,7 @@ msgstr ""
 "El calendario seleccionado ya contiene algunos acontecimientos para los "
 "correos proporcionados. Â¿Quiere crear acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:521
+#: ../plugins/mail-to-task/mail-to-task.c:522
 msgid ""
 "Selected task list contains some tasks for the given mails already. Would "
 "you like to create new tasks anyway?"
@@ -18318,7 +18488,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene algunas tareas para los correos "
 "proporcionados. Â¿Quiere crear tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:524
+#: ../plugins/mail-to-task/mail-to-task.c:525
 msgid ""
 "Selected memo list contains some memos for the given mails already. Would "
 "you like to create new memos anyway?"
@@ -18326,7 +18496,7 @@ msgstr ""
 "La lista de notas seleccionada contiene algunas notas para los correos "
 "proporcionados. Â¿Quiere crear notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:542
+#: ../plugins/mail-to-task/mail-to-task.c:543
 msgid ""
 "Selected calendar contains an event for the given mail already. Would you "
 "like to create new event anyway?"
@@ -18340,7 +18510,7 @@ msgstr[1] ""
 "El calendario seleccionada ya contiene acontecimientos para los correos "
 "proporcionados. Â¿Quiere crear los acontecimientos nuevos de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:548
+#: ../plugins/mail-to-task/mail-to-task.c:549
 msgid ""
 "Selected task list contains a task for the given mail already. Would you "
 "like to create new task anyway?"
@@ -18354,7 +18524,7 @@ msgstr[1] ""
 "La lista de tareas seleccionada ya contiene notas para los correos "
 "proporcionados. Â¿Quiere crear las tareas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:554
+#: ../plugins/mail-to-task/mail-to-task.c:555
 msgid ""
 "Selected memo list contains a memo for the given mail already. Would you "
 "like to create new memo anyway?"
@@ -18368,25 +18538,25 @@ msgstr[1] ""
 "La lista de notas seleccionada ya contiene notas para los correos "
 "proporcionados. Â¿Quiere crear las notas nuevas de todas formas?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#: ../plugins/mail-to-task/mail-to-task.c:614
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:625
 msgid "Invalid object returned from a server"
 msgstr "Un servidor devolviÃ³ un objeto no vÃ¡lido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:695
+#: ../plugins/mail-to-task/mail-to-task.c:696
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "OcurriÃ³ un error al procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:724
+#: ../plugins/mail-to-task/mail-to-task.c:725
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:731
+#: ../plugins/mail-to-task/mail-to-task.c:732
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -18394,7 +18564,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:734
+#: ../plugins/mail-to-task/mail-to-task.c:735
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -18402,7 +18572,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:737
+#: ../plugins/mail-to-task/mail-to-task.c:738
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -18410,40 +18580,40 @@ 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:942
+#: ../plugins/mail-to-task/mail-to-task.c:941
 #, 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:1061
+#: ../plugins/mail-to-task/mail-to-task.c:1060
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1063
+#: ../plugins/mail-to-task/mail-to-task.c:1062
 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:1068
+#: ../plugins/mail-to-task/mail-to-task.c:1067
 msgid "Create a Mem_o"
 msgstr "Crear una _nota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1070
+#: ../plugins/mail-to-task/mail-to-task.c:1069
 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:1075
+#: ../plugins/mail-to-task/mail-to-task.c:1074
 msgid "Create a _Task"
 msgstr "Crear una _tarea"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1077
+#: ../plugins/mail-to-task/mail-to-task.c:1076
 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:1085
+#: ../plugins/mail-to-task/mail-to-task.c:1084
 msgid "Create a _Meeting"
 msgstr "Crear una _reuniÃ³n"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1087
+#: ../plugins/mail-to-task/mail-to-task.c:1086
 msgid "Create a new meeting from the selected message"
 msgstr "Crear una reuniÃ³n nueva del mensaje seleccionado"
 
@@ -18451,59 +18621,59 @@ msgstr "Crear una reuniÃ³n nueva del mensaje seleccionado"
 msgid "Convert a mail message to a task."
 msgstr "Convertir el mensaje de correo en una tarea."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:276
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:275
 msgid "Get List _Archive"
 msgstr "Obtener _archivador de la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:278
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:277
 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:283
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:282
 msgid "Get List _Usage Information"
 msgstr "Obtener informaciÃ³n de _uso de la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:285
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:284
 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:290
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:289
 msgid "Contact List _Owner"
 msgstr "_Responsable de la lista de contactos"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:292
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:291
 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:297
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:296
 msgid "_Post Message to List"
 msgstr "_Publicar un mensaje a la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:299
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:298
 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:304
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:303
 msgid "_Subscribe to List"
 msgstr "_Suscribirse a la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:306
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:305
 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:311
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:310
 msgid "_Unsubscribe from List"
 msgstr "_Desuscribirse de la lista"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:313
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:312
 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:320
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:319
 msgid "Mailing _List"
 msgstr "_Lista de correo"
 
@@ -18597,11 +18767,11 @@ msgstr "_Editar mensaje"
 msgid "_Send message"
 msgstr "_Enviar mensaje"
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Â¿Marcar tambiÃ©n los mensajes en las subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18609,15 +18779,15 @@ msgstr ""
 "Â¿Quiere marcar los mensajes como leÃdos sÃ³lo en la carpeta actual o en la "
 "capeta actual y todas sus subcarpetas?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:172
+#: ../plugins/mark-all-read/mark-all-read.c:171
 msgid "In Current Folder and _Subfolders"
 msgstr "En la carpeta actual y _subcarpetas"
 
-#: ../plugins/mark-all-read/mark-all-read.c:186
+#: ../plugins/mark-all-read/mark-all-read.c:185
 msgid "In Current _Folder Only"
 msgstr "SÃ³lo en la ca_rpeta actual"
 
-#: ../plugins/mark-all-read/mark-all-read.c:343
+#: ../plugins/mark-all-read/mark-all-read.c:342
 msgid "Mark Me_ssages as Read"
 msgstr "Marcar los mensajes como _leÃdos"
 
@@ -18765,6 +18935,8 @@ 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:146
+#: ../plugins/publish-calendar/publish-calendar.c:153
 msgid "Calendar Publishing"
 msgstr "PublicaciÃ³n de calendarios"
 
@@ -18776,46 +18948,49 @@ msgstr "Lugares"
 msgid "Publish calendars to the web."
 msgstr "Publicar calendarios en la web."
 
-#: ../plugins/publish-calendar/publish-calendar.c:94
-#: ../plugins/publish-calendar/publish-calendar.c:336
+#: ../plugins/publish-calendar/publish-calendar.c:208
+#: ../plugins/publish-calendar/publish-calendar.c:449
 #, c-format
 msgid "Could not open %s:"
 msgstr "No se pudo abrir Â«%sÂ»:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:96
+#: ../plugins/publish-calendar/publish-calendar.c:210
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "No se ha podido abrir Â«%sÂ»: Error desconocido"
 
-#: ../plugins/publish-calendar/publish-calendar.c:116
+#: ../plugins/publish-calendar/publish-calendar.c:230
 #, 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:118
+#: ../plugins/publish-calendar/publish-calendar.c:232
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "La publicaciÃ³n en %s finalizÃ³ correctamente"
 
-#: ../plugins/publish-calendar/publish-calendar.c:163
+#: ../plugins/publish-calendar/publish-calendar.c:276
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "FallÃ³ al montar %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:484
+#: ../plugins/publish-calendar/publish-calendar.c:596
 #: ../plugins/publish-calendar/publish-calendar.ui.h:4
 msgid "E_nable"
 msgstr "_Activar"
 
-#: ../plugins/publish-calendar/publish-calendar.c:629
+#: ../plugins/publish-calendar/publish-calendar.c:741
 msgid "Are you sure you want to remove this location?"
 msgstr "Â¿Seguro que quiere eliminar este lugar?"
 
-#: ../plugins/publish-calendar/publish-calendar.c:939
+#. 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:1053
 msgid "Could not create publish thread."
 msgstr "No se pudo publicar el hilo de publicaciÃ³n."
 
-#: ../plugins/publish-calendar/publish-calendar.c:946
+#: ../plugins/publish-calendar/publish-calendar.c:1061
 msgid "_Publish Calendar Information"
 msgstr "_Publicar informaciÃ³n del calendario"
 
@@ -18982,79 +19157,79 @@ msgstr "Opciones de SpamAssasin"
 #. * Translator: the %F %T is the thirth argument for a strftime function.
 #. * It lets you define the formatting of the date in the csv-file.
 #. *
-#: ../plugins/save-calendar/csv-format.c:159
+#: ../plugins/save-calendar/csv-format.c:157
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:355
+#: ../plugins/save-calendar/csv-format.c:353
 msgid "UID"
 msgstr "UID"
 
-#: ../plugins/save-calendar/csv-format.c:357
+#: ../plugins/save-calendar/csv-format.c:355
 msgid "Description List"
 msgstr "Lista de descripciÃ³n"
 
-#: ../plugins/save-calendar/csv-format.c:358
+#: ../plugins/save-calendar/csv-format.c:356
 msgid "Categories List"
 msgstr "Lista de categorÃas"
 
-#: ../plugins/save-calendar/csv-format.c:359
+#: ../plugins/save-calendar/csv-format.c:357
 msgid "Comment List"
 msgstr "Lista de comentarios"
 
-#: ../plugins/save-calendar/csv-format.c:362
+#: ../plugins/save-calendar/csv-format.c:360
 msgid "Contact List"
 msgstr "Lista de contactos"
 
-#: ../plugins/save-calendar/csv-format.c:363
+#: ../plugins/save-calendar/csv-format.c:361
 msgid "Start"
 msgstr "Empieza"
 
-#: ../plugins/save-calendar/csv-format.c:364
+#: ../plugins/save-calendar/csv-format.c:362
 msgid "End"
 msgstr "Termina"
 
-#: ../plugins/save-calendar/csv-format.c:366
+#: ../plugins/save-calendar/csv-format.c:364
 msgid "percent Done"
 msgstr "porcentaje terminado"
 
-#: ../plugins/save-calendar/csv-format.c:368
+#: ../plugins/save-calendar/csv-format.c:366
 msgid "URL"
 msgstr "URL"
 
-#: ../plugins/save-calendar/csv-format.c:369
+#: ../plugins/save-calendar/csv-format.c:367
 msgid "Attendees List"
 msgstr "Lista de participantes"
 
-#: ../plugins/save-calendar/csv-format.c:371
+#: ../plugins/save-calendar/csv-format.c:369
 msgid "Modified"
 msgstr "Modificado"
 
-#: ../plugins/save-calendar/csv-format.c:522
+#: ../plugins/save-calendar/csv-format.c:520
 msgid "A_dvanced options for the CSV format"
 msgstr "Opciones avan_zadas para el formato CSV"
 
-#: ../plugins/save-calendar/csv-format.c:529
+#: ../plugins/save-calendar/csv-format.c:527
 msgid "Prepend a _header"
 msgstr "Anteponer una ca_becera"
 
-#: ../plugins/save-calendar/csv-format.c:538
+#: ../plugins/save-calendar/csv-format.c:536
 msgid "_Value delimiter:"
 msgstr "Delimitador de _valor:"
 
-#: ../plugins/save-calendar/csv-format.c:545
+#: ../plugins/save-calendar/csv-format.c:543
 msgid "_Record delimiter:"
 msgstr "Delimitador de _registro:"
 
-#: ../plugins/save-calendar/csv-format.c:552
+#: ../plugins/save-calendar/csv-format.c:550
 msgid "_Encapsulate values with:"
 msgstr "_Encapsular valores con:"
 
-#: ../plugins/save-calendar/csv-format.c:574
+#: ../plugins/save-calendar/csv-format.c:572
 msgid "Comma separated value format (.csv)"
 msgstr "Formato de valores separados por comas (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:163
+#: ../plugins/save-calendar/ical-format.c:162
 msgid "iCalendar format (.ics)"
 msgstr "Formato iCalendar (.ics)"
 
@@ -19071,11 +19246,11 @@ 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:149
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:371
+#: ../plugins/save-calendar/rdf-format.c:369
 msgid "RDF format (.rdf)"
 msgstr "Formato RDF (.rdf)"
 
@@ -19129,12 +19304,12 @@ msgstr ""
 "Por favor pulse el botÃ³n Â«AdelanteÂ» para continuar. "
 
 #: ../plugins/startup-wizard/startup-wizard.c:135
-#: ../widgets/misc/e-import-assistant.c:387
+#: ../widgets/misc/e-import-assistant.c:386
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione la informaciÃ³n que quiera importar:"
 
 #: ../plugins/startup-wizard/startup-wizard.c:150
-#: ../widgets/misc/e-import-assistant.c:544
+#: ../widgets/misc/e-import-assistant.c:543
 #, c-format
 msgid "From %s:"
 msgstr "De %s:"
@@ -19180,15 +19355,15 @@ msgstr ""
 msgid "Drafts based template plugin"
 msgstr "Borradores basados en el complemento de plantillas"
 
-#: ../plugins/templates/templates.c:618
+#: ../plugins/templates/templates.c:617
 msgid "No Title"
 msgstr "Sin tÃtulo"
 
-#: ../plugins/templates/templates.c:689
+#: ../plugins/templates/templates.c:688
 msgid "Save as _Template"
 msgstr "Guardar como plan_tilla"
 
-#: ../plugins/templates/templates.c:691
+#: ../plugins/templates/templates.c:690
 msgid "Save as Template"
 msgstr "Guardar como plantilla"
 
@@ -19407,7 +19582,7 @@ msgstr "La barra lateral es visible"
 msgid "Skip development warning dialog"
 msgstr "Saltar el diÃ¡logo de advertencia de desarrollo"
 
-#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:318
+#: ../shell/apps_evolution_shell.schemas.in.h:33 ../shell/main.c:314
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
@@ -19567,45 +19742,40 @@ msgstr "Estilo de los botones de ventana"
 msgid "Window buttons are visible"
 msgstr "Los botones de la ventana son visibles"
 
+#: ../shell/e-shell-content.c:576 ../shell/e-shell-content.c:577
+msgid "Searches"
+msgstr "BÃºsquedas"
+
+#: ../shell/e-shell-content.c:618
+msgid "Save Search"
+msgstr "Guardar bÃºsqueda"
+
+#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
+#, c-format
+msgid "%ld KB"
+msgstr "%ld KiB"
+
 # #En conflicto con _Mensaje
 #. Translators: The "Show:" label precedes a combo box that
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-content.c:931
+#: ../shell/e-shell-searchbar.c:662
 msgid "Sho_w:"
 msgstr "M_ostrar:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:956
+#: ../shell/e-shell-searchbar.c:689
 msgid "Sear_ch:"
 msgstr "B_uscar:"
 
-#. Scope Combo Widgets
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-content.c:998
+#: ../shell/e-shell-searchbar.c:741
 msgid "i_n"
 msgstr "e_n"
 
-#: ../shell/e-shell-content.c:1494
-msgid "Advanced Search"
-msgstr "BÃºsqueda avanzada"
-
-#: ../shell/e-shell-content.c:1552 ../shell/e-shell-content.c:1553
-msgid "Searches"
-msgstr "BÃºsquedas"
-
-#: ../shell/e-shell-content.c:1598
-msgid "Save Search"
-msgstr "Guardar bÃºsqueda"
-
-#: ../shell/e-shell-migrate.c:242 ../shell/e-shell-migrate.c:243
-#, c-format
-msgid "%ld KB"
-msgstr "%ld KiB"
-
 #: ../shell/e-shell-switcher.c:446
 msgid "Toolbar Style"
 msgstr "Estilo de la barra de herramientas"
@@ -19614,7 +19784,7 @@ msgstr "Estilo de la barra de herramientas"
 msgid "The switcher's toolbar style"
 msgstr "El estilo de la barra de herramientas del selector"
 
-#: ../shell/e-shell-switcher.c:463
+#: ../shell/e-shell-switcher.c:463 ../shell/e-shell-window.c:715
 msgid "Toolbar Visible"
 msgstr "Barra de herramientas visible"
 
@@ -19622,79 +19792,113 @@ msgstr "Barra de herramientas visible"
 msgid "Whether the switcher is visible"
 msgstr "Indica si el selector es visible"
 
-#: ../shell/e-shell-view.c:486
+#: ../shell/e-shell-utils.c:220
+#, fuzzy
+#| msgid "vCard (.vcf, .gcrd)"
+msgid "vCard (.vcf)"
+msgstr "vCard (.vcf, .gcrd)"
+
+#: ../shell/e-shell-utils.c:222
+#, fuzzy
+#| msgid "iCalendar files (.ics)"
+msgid "iCalendar (.ics)"
+msgstr "Archivos iCalendar (.ics)"
+
+#: ../shell/e-shell-utils.c:243
+#, fuzzy
+#| msgid "All files"
+msgid "All Files (*)"
+msgstr "Todos los archivos"
+
+#: ../shell/e-shell-view.c:591
 msgid "Switcher Action"
 msgstr "AcciÃ³n del selector"
 
-#: ../shell/e-shell-view.c:487
+#: ../shell/e-shell-view.c:592
 msgid "The switcher action for this shell view"
 msgstr "La acciÃ³n del selector para esta vista de la shell"
 
-#: ../shell/e-shell-view.c:502
+#: ../shell/e-shell-view.c:607
 msgid "Page Number"
 msgstr "NÃºmero de pÃ¡gina"
 
-#: ../shell/e-shell-view.c:503
+#: ../shell/e-shell-view.c:608
 msgid "The notebook page number of the shell view"
 msgstr "El nÃºmero de pÃ¡gina del libro de notas para esta vista de shell"
 
-#: ../shell/e-shell-view.c:521
-msgid "The title of the shell view"
-msgstr "El tÃtulo de esta vista de shell"
+#: ../shell/e-shell-view.c:624
+#, fuzzy
+#| msgid "Search Filter"
+msgid "Search Rule"
+msgstr "Filtro de bÃºsqueda"
 
-#: ../shell/e-shell-view.c:536
+#: ../shell/e-shell-view.c:625
+#, fuzzy
+#| msgid "Clear the current search parameters"
+msgid "Criteria for the current search results"
+msgstr "Limpiar los parÃ¡metros de bÃºsqueda actuales"
+
+#: ../shell/e-shell-view.c:640
 msgid "The EShellBackend for this shell view"
 msgstr "El Â«EShellBackendÂ» para esta vista de shell"
 
-#: ../shell/e-shell-view.c:551
+#: ../shell/e-shell-view.c:655
 msgid "Shell Content Widget"
 msgstr "Widget de contenido shell"
 
-#: ../shell/e-shell-view.c:552
+#: ../shell/e-shell-view.c:656
 msgid "The content widget appears in a shell window's right pane"
 msgstr ""
 "El widget de contenido aparece en un panel derecho de la ventana de shell"
 
-#: ../shell/e-shell-view.c:568
+#: ../shell/e-shell-view.c:672
 msgid "Shell Sidebar Widget"
 msgstr "Widget de barra lateral de shell"
 
-#: ../shell/e-shell-view.c:569
+#: ../shell/e-shell-view.c:673
 msgid "The sidebar widget appears in a shell window's left pane"
 msgstr ""
 "El widget de barra lateral aparee en un panel izquierdo de la ventana de "
 "shell"
 
-#: ../shell/e-shell-view.c:584
+#: ../shell/e-shell-view.c:688
 msgid "Shell Taskbar Widget"
 msgstr "Widget de barra de tareas de shell"
 
-#: ../shell/e-shell-view.c:585
+#: ../shell/e-shell-view.c:689
 msgid "The taskbar widget appears at the bottom of a shell window"
 msgstr ""
 "El widget de barra de tareas aparece en la parte inferior de una ventana de "
 "shell"
 
-#: ../shell/e-shell-view.c:600
+#: ../shell/e-shell-view.c:704
 msgid "Shell Window"
 msgstr "Ventana shell"
 
-#: ../shell/e-shell-view.c:601
+#: ../shell/e-shell-view.c:705
 msgid "The window to which the shell view belongs"
 msgstr "La ventana a la que pertenece la shell"
 
-#: ../shell/e-shell-view.c:616
+#: ../shell/e-shell-view.c:721
+msgid "The key file holding widget state data"
+msgstr ""
+
+#: ../shell/e-shell-view.c:736
+msgid "The title of the shell view"
+msgstr "El tÃtulo de esta vista de shell"
+
+#: ../shell/e-shell-view.c:750
 msgid "Current View ID"
 msgstr "El ID de la vista actual"
 
-#: ../shell/e-shell-view.c:617
+#: ../shell/e-shell-view.c:751
 msgid "The current GAL view ID"
 msgstr "El ID de la vista GAL actual"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:643
+#: ../shell/e-shell-window-actions.c:644
 msgid "translator-credits"
 msgstr ""
 "Jorge GonzÃ¡lez <jorgegonz svn gnome org>, 2007-2009\n"
@@ -19705,371 +19909,425 @@ 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:655
 msgid "Evolution Website"
 msgstr "PÃ¡gina web de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1295
+#: ../shell/e-shell-window-actions.c:1223
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy no estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1297
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Bug Buddy could not be run."
 msgstr "No se pudo ejecutar Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1399
+#: ../shell/e-shell-window-actions.c:1327
 msgid "GNOME Pilot is not installed."
 msgstr "GNOME Pilot no estÃ¡ instalado."
 
-#: ../shell/e-shell-window-actions.c:1401
+#: ../shell/e-shell-window-actions.c:1329
 msgid "GNOME Pilot could not be run."
 msgstr "No se pudo ejecutar GNOME Pilot."
 
-#: ../shell/e-shell-window-actions.c:1495
+#: ../shell/e-shell-window-actions.c:1423
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃ³n acerca de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1428
 msgid "_Close Window"
 msgstr "_Cerrar ventana"
 
-#: ../shell/e-shell-window-actions.c:1507
+#: ../shell/e-shell-window-actions.c:1435
 msgid "_Contents"
 msgstr "Ã?nd_ice"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1437
 msgid "Open the Evolution User Guide"
 msgstr "Abrir la GuÃa de usuario de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1442
 msgid "Evolution _FAQ"
 msgstr "P+_F de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1444
 msgid "Open the Frequently Asked Questions webpage"
 msgstr "Abrir la pÃ¡gina web de preguntas mÃ¡s frecuentes"
 
-#: ../shell/e-shell-window-actions.c:1521
+#: ../shell/e-shell-window-actions.c:1449
 msgid "_Forget Passwords"
 msgstr "_Olvidar contraseÃ±as"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1451
 msgid "Forget all remembered passwords"
 msgstr "Olvidar todas las contraseÃ±as recordadas"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1456
 msgid "I_mport..."
 msgstr "I_mportarâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1458
 msgid "Import data from other programs"
 msgstr "Importa datos de otros programas"
 
-#: ../shell/e-shell-window-actions.c:1535
+#: ../shell/e-shell-window-actions.c:1463
 msgid "New _Window"
 msgstr "_Ventana nueva"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1465
 msgid "Create a new window displaying this view"
 msgstr "Crear una ventana nueva mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1472
 msgid "Configure Evolution"
 msgstr "Configurar Evolution"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1477
 msgid "_Quick Reference"
 msgstr "_Referencia rÃ¡pida"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1479
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar los atajos de teclas de Evolution"
 
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1486
 msgid "Exit the program"
 msgstr "Sale del programa"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1491
 msgid "_Advanced Search..."
 msgstr "BÃºsqueda _avanzadaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1493
 msgid "Construct a more advanced search"
 msgstr "Construir una bÃºsqueda mÃ¡s avanzada"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1500
 msgid "Clear the current search parameters"
 msgstr "Limpiar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1505
 msgid "_Edit Saved Searches..."
 msgstr "_Editar bÃºsquedas guardadasâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1507
 msgid "Manage your saved searches"
 msgstr "Gestionar sus bÃºsquedas guardadas"
 
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1514
 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:1591
+#: ../shell/e-shell-window-actions.c:1519
 msgid "_Find Now"
 msgstr "B_uscar ahora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1593
+#: ../shell/e-shell-window-actions.c:1521
 msgid "Execute the current search parameters"
 msgstr "Ejecutar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1598
+#: ../shell/e-shell-window-actions.c:1526
 msgid "_Save Search..."
 msgstr "_Guardar bÃºsquedaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1528
 msgid "Save the current search parameters"
 msgstr "Guardar los parÃ¡metros de bÃºsqueda actuales"
 
-#: ../shell/e-shell-window-actions.c:1605
+#: ../shell/e-shell-window-actions.c:1533
 msgid "Send / _Receive"
 msgstr "Enviar / Reci_bir"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1535
 msgid "Send queued items and retrieve new items"
 msgstr "EnvÃa el correo en la cola y obtiene el nuevo"
 
-#: ../shell/e-shell-window-actions.c:1612
+#: ../shell/e-shell-window-actions.c:1540
 msgid "Submit _Bug Report..."
 msgstr "Enviar informe de _falloâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1542
 msgid "Submit a bug report using Bug Buddy"
 msgstr "EnvÃa un informe de fallos usando Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1619
+#: ../shell/e-shell-window-actions.c:1547
 msgid "_Synchronization Options..."
 msgstr "Opciones de _sincronizaciÃ³nâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1549
 msgid "Set up Pilot configuration"
 msgstr "ConfiguraciÃ³n del Pilot"
 
-#: ../shell/e-shell-window-actions.c:1626
+#: ../shell/e-shell-window-actions.c:1554
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1556
 msgid "Put Evolution into offline mode"
 msgstr "Poner Evolution en modo desconectado"
 
-#: ../shell/e-shell-window-actions.c:1633
+#: ../shell/e-shell-window-actions.c:1561
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1563
 msgid "Put Evolution into online mode"
 msgstr "Poner Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1663
+#: ../shell/e-shell-window-actions.c:1591
 msgid "Lay_out"
 msgstr "_DistribuciÃ³n"
 
-#: ../shell/e-shell-window-actions.c:1670
+#: ../shell/e-shell-window-actions.c:1598
 msgid "_New"
 msgstr "_Nuevo"
 
-#: ../shell/e-shell-window-actions.c:1677
+#: ../shell/e-shell-window-actions.c:1605
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1684
+#: ../shell/e-shell-window-actions.c:1612
 msgid "_Switcher Appearance"
 msgstr "Apariencia del _selector"
 
-#: ../shell/e-shell-window-actions.c:1698
+#: ../shell/e-shell-window-actions.c:1626
 msgid "_Window"
 msgstr "_Ventana"
 
-#: ../shell/e-shell-window-actions.c:1708
+#: ../shell/e-shell-window-actions.c:1636
 msgid "Show Side _Bar"
 msgstr "Mostrar barra _lateral"
 
-#: ../shell/e-shell-window-actions.c:1710
+#: ../shell/e-shell-window-actions.c:1638
 msgid "Show the side bar"
 msgstr "Mostrar la barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1716
-msgid "Show _Status Bar"
-msgstr "Mostrar barra de _estado"
-
-#: ../shell/e-shell-window-actions.c:1718
-msgid "Show the status bar"
-msgstr "Mostrar la barra de estado"
-
-#: ../shell/e-shell-window-actions.c:1724
+#: ../shell/e-shell-window-actions.c:1644
 msgid "Show _Buttons"
 msgstr "Mostrar _botones"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1646
 msgid "Show the switcher buttons"
 msgstr "Mostrar los botones del selector"
 
-#: ../shell/e-shell-window-actions.c:1732
+#: ../shell/e-shell-window-actions.c:1652
+msgid "Show _Status Bar"
+msgstr "Mostrar barra de _estado"
+
+#: ../shell/e-shell-window-actions.c:1654
+msgid "Show the status bar"
+msgstr "Mostrar la barra de estado"
+
+#: ../shell/e-shell-window-actions.c:1660
 msgid "Show _Tool Bar"
 msgstr "Mostrar barra de _herramientas"
 
-#: ../shell/e-shell-window-actions.c:1734
-msgid "Show the toolbar"
+#: ../shell/e-shell-window-actions.c:1662
+#, fuzzy
+#| msgid "Show the toolbar"
+msgid "Show the tool bar"
 msgstr "Mostrar la barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1756
+#: ../shell/e-shell-window-actions.c:1684
 msgid "_Icons Only"
 msgstr "SÃ³lo _iconos"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1686
 msgid "Display window buttons with icons only"
 msgstr "Mostrar los botones de la ventana sÃ³lo con iconos"
 
-#: ../shell/e-shell-window-actions.c:1763
+#: ../shell/e-shell-window-actions.c:1691
 msgid "_Text Only"
 msgstr "SÃ³lo _texto"
 
-#: ../shell/e-shell-window-actions.c:1765
+#: ../shell/e-shell-window-actions.c:1693
 msgid "Display window buttons with text only"
 msgstr "Mostrar los botones de la ventana sÃ³lo con texto"
 
-#: ../shell/e-shell-window-actions.c:1770
+#: ../shell/e-shell-window-actions.c:1698
 msgid "Icons _and Text"
 msgstr "Iconos _y texto"
 
-#: ../shell/e-shell-window-actions.c:1772
+#: ../shell/e-shell-window-actions.c:1700
 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:1777
+#: ../shell/e-shell-window-actions.c:1705
 msgid "Tool_bar Style"
 msgstr "Estilo de la _barra de herramientas"
 
-#: ../shell/e-shell-window-actions.c:1779
+#: ../shell/e-shell-window-actions.c:1707
 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:1787
+#: ../shell/e-shell-window-actions.c:1715
 msgid "Define Views..."
 msgstr "Definir vistasâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1789
+#: ../shell/e-shell-window-actions.c:1717
 msgid "Create or edit views"
 msgstr "Crear o editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1794
+#: ../shell/e-shell-window-actions.c:1722
 msgid "Save Custom View..."
 msgstr "Guardar vista personalizadaâ?¦"
 
-#: ../shell/e-shell-window-actions.c:1796
+#: ../shell/e-shell-window-actions.c:1724
 msgid "Save current custom view"
 msgstr "Guardar la vista actual personalizada"
 
-#: ../shell/e-shell-window-actions.c:1803
+#: ../shell/e-shell-window-actions.c:1731
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1813
+#: ../shell/e-shell-window-actions.c:1741
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1815
+#: ../shell/e-shell-window-actions.c:1743
 msgid "Current view is a customized view"
 msgstr "La vista actual es una vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1753
 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:2097
+#: ../shell/e-shell-window-actions.c:2041
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2300
+#: ../shell/e-shell-window-actions.c:2251
 msgid "Execute these search parameters"
 msgstr "Ejecutar estos parÃ¡metros de bÃºsqueda"
 
-#: ../shell/e-shell-window-private.c:254
-msgid "New"
-msgstr "Nuevo"
-
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:588
+#: ../shell/e-shell-window-private.c:551
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
-#: ../shell/e-shell-window.c:308
+#: ../shell/e-shell-window.c:353
+msgid "New"
+msgstr "Nuevo"
+
+#: ../shell/e-shell-window.c:606
 msgid "Active Shell View"
 msgstr "Vista activa de shell"
 
-#: ../shell/e-shell-window.c:309
+#: ../shell/e-shell-window.c:607
 msgid "Name of the active shell view"
 msgstr "Nombre de la vista activa de la shell"
 
-#: ../shell/e-shell-window.c:323 ../shell/e-shell.c:743
+#: ../shell/e-shell-window.c:621 ../shell/e-shell.c:772
 msgid "Geometry"
 msgstr "GeometrÃa"
 
-#: ../shell/e-shell-window.c:324 ../shell/e-shell.c:744
+#: ../shell/e-shell-window.c:622 ../shell/e-shell.c:773
 msgid "Initial window geometry string"
 msgstr "Cadena de geometrÃa inicial de la ventana"
 
-#: ../shell/e-shell-window.c:339
+#: ../shell/e-shell-window.c:637
 msgid "Safe Mode"
 msgstr "Modo seguro"
 
-#: ../shell/e-shell-window.c:340
+#: ../shell/e-shell-window.c:638
 msgid "Whether the shell window is in safe mode"
 msgstr "Indica si la ventana de shell estÃ¡ en modo seguro"
 
-#: ../shell/e-shell-window.c:371
+#: ../shell/e-shell-window.c:669
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Sidebar Visible"
+msgstr "La barra lateral es visible"
+
+#: ../shell/e-shell-window.c:670
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's side bar is visible"
+msgstr "Indica si el selector es visible"
+
+#: ../shell/e-shell-window.c:684
+#, fuzzy
+#| msgid "Sidebar is visible"
+msgid "Switcher Visible"
+msgstr "La barra lateral es visible"
+
+#: ../shell/e-shell-window.c:685
+#, fuzzy
+#| msgid "Whether the window buttons should be visible."
+msgid "Whether the shell window's switcher buttons are visible"
+msgstr "Indica si la los botones de la ventana deben ser visibles."
+
+#: ../shell/e-shell-window.c:700
+#, fuzzy
+#| msgid "Toolbar Visible"
+msgid "Taskbar Visible"
+msgstr "Barra de herramientas visible"
+
+#: ../shell/e-shell-window.c:701
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's task bar is visible"
+msgstr "Indica si el selector es visible"
+
+#: ../shell/e-shell-window.c:716
+#, fuzzy
+#| msgid "Whether the switcher is visible"
+msgid "Whether the shell window's tool bar is visible"
+msgstr "Indica si el selector es visible"
+
+#: ../shell/e-shell-window.c:730
 msgid "UI Manager"
 msgstr "Gestor de IU"
 
-#: ../shell/e-shell-window.c:372
+#: ../shell/e-shell-window.c:731
 msgid "The shell window's GtkUIManager"
 msgstr "El GtkUIManager de la ventana shell"
 
-#: ../shell/e-shell.c:211
+#: ../shell/e-shell.c:213
 msgid "Preparing to go offline..."
 msgstr "PreparÃ¡ndose para desconectarseâ?¦"
 
-#: ../shell/e-shell.c:265
+#: ../shell/e-shell.c:267
 msgid "Preparing to go online..."
 msgstr "PreparÃ¡ndose para conectarseâ?¦"
 
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:339
 msgid "Preparing to quit..."
 msgstr "PreparÃ¡ndose para salirâ?¦"
 
-#: ../shell/e-shell.c:759
+#: ../shell/e-shell.c:788
+#, fuzzy
+#| msgid "Save directory"
+msgid "Module Directory"
+msgstr "Directorio donde guardar"
+
+#: ../shell/e-shell.c:789
+msgid "The directory from which to load EModules"
+msgstr ""
+
+#: ../shell/e-shell.c:804
 msgid "Network Available"
 msgstr "Red disponible"
 
-#: ../shell/e-shell.c:760
+#: ../shell/e-shell.c:805
 msgid "Whether the network is available"
 msgstr "Indica si la red estÃ¡ disponible"
 
-#: ../shell/e-shell.c:775 ../widgets/misc/e-online-button.c:130
+#: ../shell/e-shell.c:820 ../widgets/misc/e-online-button.c:130
 msgid "Online"
 msgstr "En lÃnea"
 
-#: ../shell/e-shell.c:776
+#: ../shell/e-shell.c:821
 msgid "Whether the shell is online"
 msgstr "Indica si la shell estÃ¡ conectada"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:163
+#: ../shell/main.c:159
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20105,7 +20363,7 @@ msgstr ""
 "Esperamos que disfrute del resultado de nuestro duro trabajo y \n"
 "esperamos su contribuciÃ³n.\n"
 
-#: ../shell/main.c:187
+#: ../shell/main.c:183
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20113,56 +20371,55 @@ msgstr ""
 "Gracias\n"
 "El equipo de Evolution\n"
 
-#: ../shell/main.c:194
+#: ../shell/main.c:190
 msgid "Do not tell me again"
 msgstr "No preguntarme mÃ¡s veces"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:310
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: ../shell/main.c:316
+#: ../shell/main.c:312
 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:316
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:319
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar el cierre de Evolution"
 
-#: ../shell/main.c:327
+#: ../shell/main.c:323
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la reemigraciÃ³n desde Evolution 1.4"
 
-#: ../shell/main.c:330
+#: ../shell/main.c:326
 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."
 
-#: ../shell/main.c:332
+#: ../shell/main.c:328
 msgid "Disable loading of any plugins."
 msgstr "Desactivar la carga de cualquier complemento."
 
-#: ../shell/main.c:334
+#: ../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:338
+#: ../shell/main.c:334
 msgid "Import URIs or file names given as rest of arguments."
 msgstr "Importar URI o nombres de archivos proporcionados como argumentos."
 
-#: ../shell/main.c:340
-#| msgid "Restarting Evolution"
+#: ../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:513
+#: ../shell/main.c:492
 msgid "- The Evolution PIM and Email Client"
 msgstr "El cliente de correo-e y GIP Evolution"
 
-#: ../shell/main.c:538
+#: ../shell/main.c:517
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20419,8 +20676,8 @@ msgstr "Nombre del certificado"
 msgid "Purposes"
 msgstr "PropÃ³sito"
 
-#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:35
-#: ../smime/lib/e-cert.c:552
+#: ../smime/gui/certificate-manager.c:292 ../smime/gui/smime-ui.ui.h:34
+#: ../smime/lib/e-cert.c:565
 msgid "Serial Number"
 msgstr "NÃºmero de serie"
 
@@ -20440,7 +20697,7 @@ msgstr "DirecciÃ³n de correo-e"
 msgid "All CA certificate files"
 msgstr "Todos los archivos de certificados AC"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1050
 msgid "Certificates"
 msgstr "Certificados"
 
@@ -20510,7 +20767,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:6 ../smime/lib/e-cert.c:1058
+#: ../smime/gui/smime-ui.ui.h:6 ../smime/lib/e-cert.c:1071
 msgid "Certificate"
 msgstr "Certificado"
 
@@ -20547,293 +20804,289 @@ msgid "Do not trust the authenticity of this certificate"
 msgstr "No confiar en la autenticidad de este certificado"
 
 #: ../smime/gui/smime-ui.ui.h:16
-msgid "Dummy window only"
-msgstr "Ventana muda Ãºnicamente"
-
-#: ../smime/gui/smime-ui.ui.h:17
 msgid "Edit"
 msgstr "Editar"
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Email Certificate Trust Settings"
 msgstr "Ajustes de confianza de certificados de correo-e"
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Email Recipient Certificate"
 msgstr "Certificado del destinatario del correo-e"
 
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Email Signer Certificate"
 msgstr "Certificado del firmante del correo-e"
 
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Expires On"
 msgstr "Caduca el"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:21
 msgid "Field Value"
 msgstr "Valor del campo"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Fingerprints"
 msgstr "Huellas"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Import"
 msgstr "Importar"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Issued By"
 msgstr "Emitido por"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Issued On"
 msgstr "Emitido el"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Issued To"
 msgstr "Emitido a"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "MD5 Fingerprint"
 msgstr "Huella MD5"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Organization (O)"
 msgstr "OrganizaciÃ³n (O)"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "Organizational Unit (OU)"
 msgstr "Unidad organizativa (OU)"
 
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../smime/gui/smime-ui.ui.h:31
 msgid "SHA1 Fingerprint"
 msgstr "Huella SHA1"
 
-#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:800
+#: ../smime/gui/smime-ui.ui.h:32 ../smime/lib/e-cert.c:813
 msgid "SSL Client Certificate"
 msgstr "Certificado de cliente SSL"
 
-#: ../smime/gui/smime-ui.ui.h:34 ../smime/lib/e-cert.c:804
+#: ../smime/gui/smime-ui.ui.h:33 ../smime/lib/e-cert.c:817
 msgid "SSL Server Certificate"
 msgstr "Certificado de servidor SSL"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:35
 msgid "This certificate has been verified for the following uses:"
 msgstr "Este certificado ha sido verificado para los siguientes usos:"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:36
 msgid "Trust the authenticity of this certificate"
 msgstr "Confiar en la autenticidad de este certificado"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:37
 msgid "Trust this CA to identify email users."
 msgstr "Confiar en esta AC para identificar a usuarios de correo-e."
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:38
 msgid "Trust this CA to identify software developers."
 msgstr "Confiar en esta AC para identificar a desarrolladores de software."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:39
 msgid "Trust this CA to identify web sites."
 msgstr "Confiar en esta AC para identificar sitios web."
 
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.ui.h:40
 msgid "Validity"
 msgstr "Validez"
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:41
 msgid "View"
 msgstr "Ver"
 
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../smime/gui/smime-ui.ui.h:42
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Tiene certificados de estas organizaciones que le identifican:"
 
-#: ../smime/gui/smime-ui.ui.h:44
+#: ../smime/gui/smime-ui.ui.h:43
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr ""
 "Tiene archivados los certificados que identifican a estas autoridades de "
 "certificaciÃ³n:"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:44
 msgid "You have certificates on file that identify these people:"
 msgstr "Tiene archivados los certificados que identifican a estas personas:"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:45
 msgid "Your Certificates"
 msgstr "Sus certificados"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:46
 msgid "_Edit CA Trust"
 msgstr "_Editar confianza en la AC"
 
 #. XXX we shouldn't be popping up dialogs in this code.
-#: ../smime/lib/e-cert-db.c:652
+#: ../smime/lib/e-cert-db.c:655
 msgid "Certificate already exists"
 msgstr "El certificado ya existe"
 
-#: ../smime/lib/e-cert.c:222 ../smime/lib/e-cert.c:232
+#: ../smime/lib/e-cert.c:227 ../smime/lib/e-cert.c:237
 msgid "%d/%m/%Y"
 msgstr "%e/%m/%Y"
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:407
+#: ../smime/lib/e-cert.c:413
 msgid "Sign"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:408
+#: ../smime/lib/e-cert.c:414
 msgid "Encrypt"
 msgstr "Cifrado"
 
-#: ../smime/lib/e-cert.c:513
+#: ../smime/lib/e-cert.c:526
 msgid "Version"
 msgstr "VersiÃ³n"
 
-#: ../smime/lib/e-cert.c:528
+#: ../smime/lib/e-cert.c:541
 msgid "Version 1"
 msgstr "VersiÃ³n 1"
 
-#: ../smime/lib/e-cert.c:531
+#: ../smime/lib/e-cert.c:544
 msgid "Version 2"
 msgstr "VersiÃ³n 2"
 
-#: ../smime/lib/e-cert.c:534
+#: ../smime/lib/e-cert.c:547
 msgid "Version 3"
 msgstr "VersiÃ³n 3"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-cert.c:629
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-cert.c:632
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-cert.c:635
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 con cifrado RSA"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-cert.c:662
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 cifrado RSA"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-cert.c:665
 msgid "Certificate Key Usage"
 msgstr "Uso de la clave del certificado"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-cert.c:668
 msgid "Netscape Certificate Type"
 msgstr "Tipo de certificado Netscape"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-cert.c:671
 msgid "Certificate Authority Key Identifier"
 msgstr "Identificador de la clave de la autoridad del certificado"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-cert.c:683
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Identificador del objeto (%s)"
 
-#: ../smime/lib/e-cert.c:720
+#: ../smime/lib/e-cert.c:733
 msgid "Algorithm Identifier"
 msgstr "Identificador del algoritmo"
 
-#: ../smime/lib/e-cert.c:728
+#: ../smime/lib/e-cert.c:741
 msgid "Algorithm Parameters"
 msgstr "ParÃ¡metros del algoritmo"
 
-#: ../smime/lib/e-cert.c:750
+#: ../smime/lib/e-cert.c:763
 msgid "Subject Public Key Info"
 msgstr "InformaciÃ³n del propÃ³sito de la clave pÃºblica"
 
-#: ../smime/lib/e-cert.c:755
+#: ../smime/lib/e-cert.c:768
 msgid "Subject Public Key Algorithm"
 msgstr "PropÃ³sito del algoritmo de clave pÃºblica"
 
-#: ../smime/lib/e-cert.c:770
+#: ../smime/lib/e-cert.c:783
 msgid "Subject's Public Key"
 msgstr "Clave pÃºblica del propÃ³sito"
 
-#: ../smime/lib/e-cert.c:791 ../smime/lib/e-cert.c:840
+#: ../smime/lib/e-cert.c:804 ../smime/lib/e-cert.c:853
 msgid "Error: Unable to process extension"
 msgstr "Erro: No es posible procesar la extensiÃ³n"
 
-#: ../smime/lib/e-cert.c:812 ../smime/lib/e-cert.c:824
+#: ../smime/lib/e-cert.c:825 ../smime/lib/e-cert.c:837
 msgid "Object Signer"
 msgstr "Firmante del objeto"
 
-#: ../smime/lib/e-cert.c:816
+#: ../smime/lib/e-cert.c:829
 msgid "SSL Certificate Authority"
 msgstr "Autoridad certificadora SSL"
 
-#: ../smime/lib/e-cert.c:820
+#: ../smime/lib/e-cert.c:833
 msgid "Email Certificate Authority"
 msgstr "Autoridad certificadora de correo"
 
-#: ../smime/lib/e-cert.c:848
+#: ../smime/lib/e-cert.c:861
 msgid "Signing"
 msgstr "Firma"
 
-#: ../smime/lib/e-cert.c:852
+#: ../smime/lib/e-cert.c:865
 msgid "Non-repudiation"
 msgstr "No repudio"
 
-#: ../smime/lib/e-cert.c:856
+#: ../smime/lib/e-cert.c:869
 msgid "Key Encipherment"
 msgstr "Cifrado de la clave"
 
-#: ../smime/lib/e-cert.c:860
+#: ../smime/lib/e-cert.c:873
 msgid "Data Encipherment"
 msgstr "Cifrado de datos"
 
-#: ../smime/lib/e-cert.c:864
+#: ../smime/lib/e-cert.c:877
 msgid "Key Agreement"
 msgstr "Acuerdo de claves"
 
-#: ../smime/lib/e-cert.c:868
+#: ../smime/lib/e-cert.c:881
 msgid "Certificate Signer"
 msgstr "Firmante del certificado"
 
-#: ../smime/lib/e-cert.c:872
+#: ../smime/lib/e-cert.c:885
 msgid "CRL Signer"
 msgstr "Firmante de la LRC"
 
-#: ../smime/lib/e-cert.c:920
+#: ../smime/lib/e-cert.c:933
 msgid "Critical"
 msgstr "CrÃtico"
 
-#: ../smime/lib/e-cert.c:922 ../smime/lib/e-cert.c:925
+#: ../smime/lib/e-cert.c:935 ../smime/lib/e-cert.c:938
 msgid "Not Critical"
 msgstr "No crÃtico"
 
-#: ../smime/lib/e-cert.c:946
+#: ../smime/lib/e-cert.c:959
 msgid "Extensions"
 msgstr "Extensiones"
 
-#: ../smime/lib/e-cert.c:1017
+#: ../smime/lib/e-cert.c:1030
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1072 ../smime/lib/e-cert.c:1192
+#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1205
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritmo de firma del certificado"
 
-#: ../smime/lib/e-cert.c:1081
+#: ../smime/lib/e-cert.c:1094
 msgid "Issuer"
 msgstr "Emisor"
 
-#: ../smime/lib/e-cert.c:1135
+#: ../smime/lib/e-cert.c:1148
 msgid "Issuer Unique ID"
 msgstr "ID Ãºnico del emisor"
 
-#: ../smime/lib/e-cert.c:1154
+#: ../smime/lib/e-cert.c:1167
 msgid "Subject Unique ID"
 msgstr "ID Ãºnico del propÃ³sito"
 
-#: ../smime/lib/e-cert.c:1197
+#: ../smime/lib/e-cert.c:1210
 msgid "Certificate Signature Value"
 msgstr "Valor de la firma del certificado"
 
@@ -20961,14 +21214,14 @@ msgstr "_SelecciÃ³n"
 msgid "Collection"
 msgstr "ColecciÃ³n"
 
-#: ../widgets/menus/gal-define-views-dialog.c:350
+#: ../widgets/menus/gal-define-views-dialog.c:327
 #: ../widgets/menus/gal-define-views.ui.h:4
 #, no-c-format
 msgid "Define Views for %s"
 msgstr "Definir vistas para %s"
 
-#: ../widgets/menus/gal-define-views-dialog.c:358
-#: ../widgets/menus/gal-define-views-dialog.c:360
+#: ../widgets/menus/gal-define-views-dialog.c:335
+#: ../widgets/menus/gal-define-views-dialog.c:337
 msgid "Define Views"
 msgstr "Definir vistas"
 
@@ -20978,8 +21231,6 @@ msgid "Define Views for \"%s\""
 msgstr "Definir vistas para Â«%sÂ»"
 
 #: ../widgets/menus/gal-view-factory-etable.c:37
-#: ../widgets/table/e-table-scrolled.c:215
-#: ../widgets/table/e-table-scrolled.c:216
 msgid "Table"
 msgstr "Tabla"
 
@@ -20999,11 +21250,11 @@ msgstr "_Crear vista nueva"
 msgid "_Replace existing view"
 msgstr "_Reemplazar vista existente"
 
-#: ../widgets/menus/gal-view-new-dialog.c:68
+#: ../widgets/menus/gal-view-new-dialog.c:67
 msgid "Factory"
 msgstr "FÃ¡brica"
 
-#: ../widgets/menus/gal-view-new-dialog.c:99
+#: ../widgets/menus/gal-view-new-dialog.c:98
 msgid "Define New View"
 msgstr "Definir vistas nuevas"
 
@@ -21089,10 +21340,13 @@ msgid "Saving"
 msgstr "Guardando"
 
 #: ../widgets/misc/e-attachment-paned.c:87
-msgid "Hide _Attachment Bar"
+msgid "Hide Attachment _Bar"
 msgstr "Ocultar _barra de adjuntos"
 
 #: ../widgets/misc/e-attachment-paned.c:89
+msgid "Show Attachment _Bar"
+msgstr "Mostrar _barra de adjuntos"
+
 #: ../widgets/misc/e-attachment-paned.c:626
 msgid "Show _Attachment Bar"
 msgstr "Mostrar _barra de adjuntos"
@@ -21113,7 +21367,7 @@ msgstr[1] "Guardar los adjuntos"
 
 #. Translators: Default attachment filename.
 #: ../widgets/misc/e-attachment-store.c:636
-#: ../widgets/misc/e-attachment.c:1768 ../widgets/misc/e-attachment.c:2294
+#: ../widgets/misc/e-attachment.c:1772 ../widgets/misc/e-attachment.c:2298
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
@@ -21143,48 +21397,52 @@ msgstr "Abrir con Â«%sÂ»"
 msgid "Open this attachment in %s"
 msgstr "Abrir este adjunto en %s"
 
-#: ../widgets/misc/e-attachment.c:990
+#. To Translators: This text is set as a description of an attached message,
+#. when, for example, attaching it to a composer. When the message to be
+#. attached has also filled Subject, then this text is of form
+#. "Attached message - Subject", otherwise it's left as is.
+#: ../widgets/misc/e-attachment.c:994
 msgid "Attached message"
 msgstr "Mensaje adjunto"
 
-#: ../widgets/misc/e-attachment.c:1814 ../widgets/misc/e-attachment.c:2596
+#: ../widgets/misc/e-attachment.c:1818 ../widgets/misc/e-attachment.c:2600
 msgid "A load operation is already in progress"
 msgstr "Existe una operaciÃ³n de carga en progreso"
 
-#: ../widgets/misc/e-attachment.c:1822 ../widgets/misc/e-attachment.c:2604
+#: ../widgets/misc/e-attachment.c:1826 ../widgets/misc/e-attachment.c:2608
 msgid "A save operation is already in progress"
 msgstr "Existe una operaciÃ³n de guardado en progreso"
 
-#: ../widgets/misc/e-attachment.c:1914
+#: ../widgets/misc/e-attachment.c:1918
 #, c-format
 msgid "Could not load '%s'"
 msgstr "No se pudo cargar Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment.c:1917
+#: ../widgets/misc/e-attachment.c:1921
 #, c-format
 msgid "Could not load the attachment"
 msgstr "No se pudo cargar el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2174
+#: ../widgets/misc/e-attachment.c:2178
 #, c-format
 msgid "Could not open '%s'"
 msgstr "No se pudo abrir Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment.c:2177
+#: ../widgets/misc/e-attachment.c:2181
 #, c-format
 msgid "Could not open the attachment"
 msgstr "No se pudo abrir el adjunto"
 
-#: ../widgets/misc/e-attachment.c:2612
+#: ../widgets/misc/e-attachment.c:2616
 msgid "Attachment contents not loaded"
 msgstr "No se cargÃ³ el contenido del adjunto"
 
-#: ../widgets/misc/e-attachment.c:2688
+#: ../widgets/misc/e-attachment.c:2692
 #, c-format
 msgid "Could not save '%s'"
 msgstr "No se pudo guardar Â«%sÂ»"
 
-#: ../widgets/misc/e-attachment.c:2691
+#: ../widgets/misc/e-attachment.c:2695
 #, c-format
 msgid "Could not save the attachment"
 msgstr "No se pudo guardar el adjunto"
@@ -21247,14 +21505,14 @@ msgstr "Y2"
 #: ../widgets/misc/e-canvas-vbox.c:89
 #: ../widgets/table/e-table-group-container.c:1001
 #: ../widgets/table/e-table-group-leaf.c:649
-#: ../widgets/table/e-table-item.c:3062
+#: ../widgets/table/e-table-item.c:3012
 msgid "Minimum width"
 msgstr "Ancho mÃnimo"
 
 #: ../widgets/misc/e-canvas-vbox.c:90
 #: ../widgets/table/e-table-group-container.c:1002
 #: ../widgets/table/e-table-group-leaf.c:650
-#: ../widgets/table/e-table-item.c:3063
+#: ../widgets/table/e-table-item.c:3013
 msgid "Minimum Width"
 msgstr "Ancho mÃnimo"
 
@@ -21312,7 +21570,7 @@ msgstr "Valor de fecha invÃ¡lido"
 msgid "Invalid Time Value"
 msgstr "Valor de hora invÃ¡lido"
 
-#: ../widgets/misc/e-import-assistant.c:240
+#: ../widgets/misc/e-import-assistant.c:239
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
 "of file it is from the list."
@@ -21320,40 +21578,40 @@ msgstr ""
 "Elija el archivo que quiere importar en Evolution y seleccione de la lista "
 "el tipo de archivo que es."
 
-#: ../widgets/misc/e-import-assistant.c:257
+#: ../widgets/misc/e-import-assistant.c:256
 msgid "F_ilename:"
 msgstr "Nombre del _archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:267
+#: ../widgets/misc/e-import-assistant.c:266
 msgid "Select a file"
 msgstr "Elija un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:281
-#: ../widgets/misc/e-import-assistant.c:457
+#: ../widgets/misc/e-import-assistant.c:280
+#: ../widgets/misc/e-import-assistant.c:456
 msgid "File _type:"
 msgstr "_Tipo de archivo:"
 
-#: ../widgets/misc/e-import-assistant.c:324
+#: ../widgets/misc/e-import-assistant.c:323
 msgid "Choose the destination for this import"
 msgstr "Elija el destino de esta importaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:349
+#: ../widgets/misc/e-import-assistant.c:348
 msgid "Choose the type of importer to run:"
 msgstr "Elija el tipo de importador a ejecutar:"
 
-#: ../widgets/misc/e-import-assistant.c:357
+#: ../widgets/misc/e-import-assistant.c:356
 msgid "Import data and settings from _older programs"
 msgstr "Importar datos y configuraciÃ³n de programas _antiguos"
 
-#: ../widgets/misc/e-import-assistant.c:365
+#: ../widgets/misc/e-import-assistant.c:364
 msgid "Import a _single file"
 msgstr "Importar un _Ãºnico archivo"
 
-#: ../widgets/misc/e-import-assistant.c:441
+#: ../widgets/misc/e-import-assistant.c:440
 msgid "Select what type of file you want to import from the list."
 msgstr "Seleccionar quÃ© tipo de archivo quiere importar de la lista"
 
-#: ../widgets/misc/e-import-assistant.c:518
+#: ../widgets/misc/e-import-assistant.c:517
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
@@ -21364,17 +21622,17 @@ msgstr ""
 "configuraciÃ³n que se pueda importar. Si quiere intentarlo de nuevo, pulse el "
 "botÃ³n Â«AtrÃ¡sÂ»."
 
-#: ../widgets/misc/e-import-assistant.c:1182
-#: ../widgets/misc/e-import-assistant.c:1209
+#: ../widgets/misc/e-import-assistant.c:1181
+#: ../widgets/misc/e-import-assistant.c:1208
 msgid "Evolution Import Assistant"
 msgstr "Asistente de importaciÃ³n de Evolution"
 
-#: ../widgets/misc/e-import-assistant.c:1191
-#: ../widgets/misc/e-import-assistant.c:1243
+#: ../widgets/misc/e-import-assistant.c:1190
+#: ../widgets/misc/e-import-assistant.c:1242
 msgid "Import Location"
 msgstr "Lugar de importaciÃ³n"
 
-#: ../widgets/misc/e-import-assistant.c:1202
+#: ../widgets/misc/e-import-assistant.c:1201
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -21384,24 +21642,24 @@ msgstr ""
 "Este asistente le guiarÃ¡ a travÃ©s del proceso de importaciÃ³n de archivos "
 "externos dentro de Evolution."
 
-#: ../widgets/misc/e-import-assistant.c:1218
+#: ../widgets/misc/e-import-assistant.c:1217
 msgid "Importer Type"
 msgstr "Tipo de importador"
 
-#: ../widgets/misc/e-import-assistant.c:1227
+#: ../widgets/misc/e-import-assistant.c:1226
 msgid "Select Information to Import"
 msgstr "Seleccione la imformaciÃ³n para importar"
 
-#: ../widgets/misc/e-import-assistant.c:1235
+#: ../widgets/misc/e-import-assistant.c:1234
 msgid "Select a File"
 msgstr "Seleccione un archivo"
 
-#: ../widgets/misc/e-import-assistant.c:1250
+#: ../widgets/misc/e-import-assistant.c:1249
 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:1256
-#: ../widgets/misc/e-import-assistant.c:1266
+#: ../widgets/misc/e-import-assistant.c:1255
+#: ../widgets/misc/e-import-assistant.c:1265
 msgid "Import Data"
 msgstr "Importar datos"
 
@@ -21774,23 +22032,23 @@ msgstr "Color de fondo de la columna"
 msgid "click to add"
 msgstr "pulse para aÃ±adir"
 
-#: ../widgets/table/e-table-config.c:151
+#: ../widgets/table/e-table-config.c:150
 msgid "State"
 msgstr "Estado"
 
-#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Ascending)"
 msgstr "(Ascendente)"
 
-#: ../widgets/table/e-table-config.c:382 ../widgets/table/e-table-config.c:424
+#: ../widgets/table/e-table-config.c:381 ../widgets/table/e-table-config.c:423
 msgid "(Descending)"
 msgstr "(Descendente)"
 
-#: ../widgets/table/e-table-config.c:389
+#: ../widgets/table/e-table-config.c:388
 msgid "Not sorted"
 msgstr "Sin ordenar"
 
-#: ../widgets/table/e-table-config.c:430
+#: ../widgets/table/e-table-config.c:429
 msgid "No grouping"
 msgstr "Sin agrupar"
 
@@ -21799,7 +22057,7 @@ msgstr "Sin agrupar"
 msgid "Show Fields"
 msgstr "Mostrar campos"
 
-#: ../widgets/table/e-table-config.c:657
+#: ../widgets/table/e-table-config.c:658
 msgid "Available Fields"
 msgstr "Campos disponibles"
 
@@ -21882,8 +22140,10 @@ msgid "_Sort..."
 msgstr "_Ordenarâ?¦"
 
 #: ../widgets/table/e-table-field-chooser-dialog.c:114
-msgid "Add a column..."
-msgstr "AÃ±adir una columnaâ?¦"
+#, fuzzy
+#| msgid "Add a C_olumn..."
+msgid "Add a Column"
+msgstr "AÃ±adir una c_olumnaâ?¦"
 
 #: ../widgets/table/e-table-field-chooser.c:151
 msgid ""
@@ -21911,7 +22171,7 @@ msgstr[1] "%s (%d elementos)"
 #: ../widgets/table/e-table-group-container.c:925
 #: ../widgets/table/e-table-group-leaf.c:586
 #: ../widgets/table/e-table-group-leaf.c:587
-#: ../widgets/table/e-table-item.c:3020 ../widgets/table/e-table-item.c:3021
+#: ../widgets/table/e-table-item.c:2970 ../widgets/table/e-table-item.c:2971
 msgid "Alternating Row Colors"
 msgstr "Alternar colores de las filas"
 
@@ -21919,7 +22179,7 @@ msgstr "Alternar colores de las filas"
 #: ../widgets/table/e-table-group-container.c:932
 #: ../widgets/table/e-table-group-leaf.c:593
 #: ../widgets/table/e-table-group-leaf.c:594
-#: ../widgets/table/e-table-item.c:3027 ../widgets/table/e-table-item.c:3028
+#: ../widgets/table/e-table-item.c:2977 ../widgets/table/e-table-item.c:2978
 #: ../widgets/table/e-tree.c:3339 ../widgets/table/e-tree.c:3340
 msgid "Horizontal Draw Grid"
 msgstr "Dibujar rejilla horizontal"
@@ -21928,7 +22188,7 @@ msgstr "Dibujar rejilla horizontal"
 #: ../widgets/table/e-table-group-container.c:939
 #: ../widgets/table/e-table-group-leaf.c:600
 #: ../widgets/table/e-table-group-leaf.c:601
-#: ../widgets/table/e-table-item.c:3034 ../widgets/table/e-table-item.c:3035
+#: ../widgets/table/e-table-item.c:2984 ../widgets/table/e-table-item.c:2985
 #: ../widgets/table/e-tree.c:3345 ../widgets/table/e-tree.c:3346
 msgid "Vertical Draw Grid"
 msgstr "Dibujar rejilla vertical"
@@ -21937,7 +22197,7 @@ msgstr "Dibujar rejilla vertical"
 #: ../widgets/table/e-table-group-container.c:946
 #: ../widgets/table/e-table-group-leaf.c:607
 #: ../widgets/table/e-table-group-leaf.c:608
-#: ../widgets/table/e-table-item.c:3041 ../widgets/table/e-table-item.c:3042
+#: ../widgets/table/e-table-item.c:2991 ../widgets/table/e-table-item.c:2992
 #: ../widgets/table/e-tree.c:3351 ../widgets/table/e-tree.c:3352
 msgid "Draw focus"
 msgstr "Dibujar el foco"
@@ -21946,7 +22206,7 @@ msgstr "Dibujar el foco"
 #: ../widgets/table/e-table-group-container.c:953
 #: ../widgets/table/e-table-group-leaf.c:614
 #: ../widgets/table/e-table-group-leaf.c:615
-#: ../widgets/table/e-table-item.c:3048 ../widgets/table/e-table-item.c:3049
+#: ../widgets/table/e-table-item.c:2998 ../widgets/table/e-table-item.c:2999
 msgid "Cursor mode"
 msgstr "Modo del cursor"
 
@@ -21954,7 +22214,7 @@ msgstr "Modo del cursor"
 #: ../widgets/table/e-table-group-container.c:960
 #: ../widgets/table/e-table-group-leaf.c:628
 #: ../widgets/table/e-table-group-leaf.c:629
-#: ../widgets/table/e-table-item.c:3013 ../widgets/table/e-table-item.c:3014
+#: ../widgets/table/e-table-item.c:2963 ../widgets/table/e-table-item.c:2964
 msgid "Selection model"
 msgstr "Modelo de selecciÃ³n"
 
@@ -21962,7 +22222,7 @@ msgstr "Modelo de selecciÃ³n"
 #: ../widgets/table/e-table-group-container.c:967
 #: ../widgets/table/e-table-group-leaf.c:621
 #: ../widgets/table/e-table-group-leaf.c:622
-#: ../widgets/table/e-table-item.c:3055 ../widgets/table/e-table-item.c:3056
+#: ../widgets/table/e-table-item.c:3005 ../widgets/table/e-table-item.c:3006
 #: ../widgets/table/e-table.c:3316 ../widgets/table/e-tree.c:3333
 #: ../widgets/table/e-tree.c:3334
 msgid "Length Threshold"
@@ -21972,7 +22232,7 @@ msgstr "Umbral de longitud"
 #: ../widgets/table/e-table-group-container.c:974
 #: ../widgets/table/e-table-group-leaf.c:663
 #: ../widgets/table/e-table-group-leaf.c:664
-#: ../widgets/table/e-table-item.c:3089 ../widgets/table/e-table-item.c:3090
+#: ../widgets/table/e-table-item.c:3039 ../widgets/table/e-table-item.c:3040
 #: ../widgets/table/e-table.c:3323 ../widgets/table/e-tree.c:3365
 #: ../widgets/table/e-tree.c:3366
 msgid "Uniform row height"
@@ -22042,15 +22302,15 @@ msgstr "_Ordenar por"
 msgid "_Custom"
 msgstr "_Personalizado"
 
-#: ../widgets/table/e-table-item.c:2999 ../widgets/table/e-table-item.c:3000
+#: ../widgets/table/e-table-item.c:2949 ../widgets/table/e-table-item.c:2950
 msgid "Table header"
 msgstr "Cabecera de la tabla"
 
-#: ../widgets/table/e-table-item.c:3006 ../widgets/table/e-table-item.c:3007
+#: ../widgets/table/e-table-item.c:2956 ../widgets/table/e-table-item.c:2957
 msgid "Table model"
 msgstr "Modelo de la tabla"
 
-#: ../widgets/table/e-table-item.c:3082 ../widgets/table/e-table-item.c:3083
+#: ../widgets/table/e-table-item.c:3032 ../widgets/table/e-table-item.c:3033
 msgid "Cursor row"
 msgstr "Fila del cursor"
 
@@ -22077,11 +22337,6 @@ msgstr ""
 "Espacio vertical entre filas. Si aÃ±ade en la parte superior e inferior de "
 "una fila."
 
-#: ../widgets/table/e-tree-scrolled.c:225
-#: ../widgets/table/e-tree-scrolled.c:226
-msgid "Tree"
-msgstr "Ã?rbol"
-
 #: ../widgets/table/e-tree.c:3358 ../widgets/table/e-tree.c:3359
 msgid "ETree table adapter"
 msgstr "Adaptador de tabla Etree"
@@ -22269,6 +22524,41 @@ msgstr "Contexto IM"
 msgid "Handle Popup"
 msgstr "Tirador emergente"
 
+# #En conflicto con _Mensaje
+#~ msgid "Show CC"
+#~ msgstr "Mostrar Cc"
+
+# #En conflicto con _Mensaje
+#~ msgid "Show BCC"
+#~ msgstr "Mostrar Cco"
+
+#~ msgid "Show the \"Preview\" pane"
+#~ msgstr "Mostrar el panel de vista previa"
+
+#~ msgid "Show the \"Preview\" pane."
+#~ msgstr "Mostrar el panel de vista previa."
+
+#~ msgid "Thread the message list."
+#~ msgstr "Agrupar la lista de mensajes."
+
+#~ msgid "Thread the message-list"
+#~ msgstr "Agrupar la lista de mensajes"
+
+#~ msgid "Advanced search"
+#~ msgstr "BÃºsqueda avanzada"
+
+#~ msgid "Dummy window only"
+#~ msgstr "Ventana muda Ãºnicamente"
+
+#~ msgid "Hide _Attachment Bar"
+#~ msgstr "Ocultar _barra de adjuntos"
+
+#~ msgid "Add a column..."
+#~ msgstr "AÃ±adir una columnaâ?¦"
+
+#~ msgid "Tree"
+#~ msgstr "Ã?rbol"
+
 #~ msgid "<b>Email</b>"
 #~ msgstr "<b>Correo-e</b>"
 
@@ -22727,10 +23017,6 @@ msgstr "Tirador emergente"
 #~ "Este nombre que identificarÃ¡ este servidor en la lista de carpetas de "
 #~ "Evolution. Es sÃ³lo para poder mostrarlo en pantalla. "
 
-#~| msgid "Table column:"
-#~ msgid "_Table column:"
-#~ msgstr "Columna de _tabla:"
-
 #~ msgid "<b>Junk List:</b>"
 #~ msgstr "<b>Lista de SPAM:</b>"
 
@@ -23156,13 +23442,6 @@ msgstr "Tirador emergente"
 #~ msgid "Tas_k list"
 #~ msgstr "Lista de ta_reas"
 
-# #En conflicto con _Mensaje
-#~ msgid "Show"
-#~ msgstr "Mostrar"
-
-#~ msgid "Hide"
-#~ msgstr "Ocultar"
-
 #~ msgid ""
 #~ "Send options available only for Novell GroupWise and Microsoft Exchange "
 #~ "accounts."
@@ -23258,9 +23537,6 @@ msgstr "Tirador emergente"
 #~ msgid "_Move..."
 #~ msgstr "_Moverâ?¦"
 
-#~ msgid "Re_fresh"
-#~ msgstr "Actuali_zar"
-
 #~ msgid "_Unread Search Folder"
 #~ msgstr "Carpeta de bÃºsqueda de _no leÃdos"
 
@@ -23923,9 +24199,6 @@ msgstr "Tirador emergente"
 #~ "{0}\n"
 #~ "  "
 
-#~ msgid "Failed to update delegates:"
-#~ msgstr "FallÃ³ al actualizar delegados:"
-
 #~ msgid "Folder already exists"
 #~ msgstr "La carpeta ya existe"
 
@@ -25724,12 +25997,6 @@ msgstr "Tirador emergente"
 #~ msgstr[0] "<b>%d</b> adjunto"
 #~ msgstr[1] "<b>%d</b> adjuntos"
 
-#~ msgid "Hide Attachment _Bar"
-#~ msgstr "Ocultar _barra de adjuntos"
-
-#~ msgid "Show Attachment _Bar"
-#~ msgstr "Mostrar _barra de adjuntos"
-
 #~ msgid "Show Attachments"
 #~ msgstr "Mostrar adjuntos"
 
@@ -25944,9 +26211,6 @@ msgstr "Tirador emergente"
 #~ msgid "Strategies"
 #~ msgstr "Estrategias"
 
-#~ msgid "Suppliers"
-#~ msgstr "Proveedores"
-
 #~ msgid "Time &amp; Expenses"
 #~ msgstr "Tiempo y gastos"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]