Updated Spanish translation

svn path=/trunk/; revision=7509

2 files changed, 609 insertions, 421 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 5412dde482..81ef5e623c 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-15  Héctor García Álvarez <hector@scouts-es.org>
+
+        * es.po: Updated Spanish translation.
+	
 2001-01-15  Christopher R. Gabriel  <cgabriel@softwarelibero.org>
 
 	* it.po: Updated italian translation from Clara Tattoni
diff --git a/po/es.po b/po/es.po
index f39b1e13d9..85dbfb14de 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2001-01-11 11:51+0100\n"
+"POT-Creation-Date: 2001-01-15 19:48+0100\n"
 "PO-Revision-Date: 2000-09-26 16:58-04:00\n"
 "Last-Translator: Héctor García Álvarez <hector@scouts-es.org>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -305,10 +305,10 @@ msgstr ""
 #: addressbook/backend/ebook/load-pine-addressbook.c:17
 #: addressbook/backend/ebook/test-client-list.c:18
 #: addressbook/backend/ebook/test-client.c:29
-#: addressbook/conduit/address-conduit.c:1083
+#: addressbook/conduit/address-conduit.c:1090
 #: addressbook/gui/component/addressbook-factory.c:38
-#: calendar/conduits/calendar/calendar-conduit.c:1151
-#: calendar/conduits/todo/todo-conduit.c:966 calendar/gui/main.c:55
+#: calendar/conduits/calendar/calendar-conduit.c:1155
+#: calendar/conduits/todo/todo-conduit.c:976 calendar/gui/main.c:55
 msgid "Could not initialize Bonobo"
 msgstr "No se puede inicializar Bonobo"
 
@@ -431,28 +431,28 @@ msgstr ""
 "Se ha producido un error cuando se intentaba\n"
 "obtener del demonio gnome-pilot la lista del pilot"
 
-#: addressbook/conduit/address-conduit.c:195
+#: addressbook/conduit/address-conduit.c:201
 msgid "Cursor could not be loaded\n"
 msgstr "No pude cargar el cursor\n"
 
-#: addressbook/conduit/address-conduit.c:208
+#: addressbook/conduit/address-conduit.c:214
 msgid "EBook not loaded\n"
 msgstr "EBook no esta cargado\n"
 
-#: addressbook/conduit/address-conduit.c:646
-#: calendar/conduits/calendar/calendar-conduit.c:730
-#: calendar/conduits/todo/todo-conduit.c:545
+#: addressbook/conduit/address-conduit.c:653
+#: calendar/conduits/calendar/calendar-conduit.c:734
+#: calendar/conduits/todo/todo-conduit.c:555
 msgid "Could not start wombat server"
 msgstr "No se ha podido iniciar el servidor wombat"
 
-#: addressbook/conduit/address-conduit.c:647
-#: calendar/conduits/calendar/calendar-conduit.c:731
-#: calendar/conduits/todo/todo-conduit.c:546
+#: addressbook/conduit/address-conduit.c:654
+#: calendar/conduits/calendar/calendar-conduit.c:735
+#: calendar/conduits/todo/todo-conduit.c:556
 msgid "Could not start wombat"
 msgstr "No se puede inicializar wombat"
 
-#: addressbook/conduit/address-conduit.c:679
-#: addressbook/conduit/address-conduit.c:682
+#: addressbook/conduit/address-conduit.c:686
+#: addressbook/conduit/address-conduit.c:689
 msgid "Could not read pilot's Address application block"
 msgstr "No pude leer información de la aplicación de direcciones del pilot"
 
@@ -618,19 +618,23 @@ msgid "Details"
 msgstr "Detalles"
 
 #: addressbook/contact-editor/e-contact-editor.c:1274
+#: addressbook/gui/widgets/e-addressbook-view.c:588
 msgid "Assistant"
 msgstr "Asistente"
 
 #: addressbook/contact-editor/e-contact-editor.c:1275
 #: addressbook/contact-editor/e-contact-editor.c:1379
+#: addressbook/gui/widgets/e-addressbook-view.c:568
 msgid "Business"
 msgstr "Trabajo"
 
 #: addressbook/contact-editor/e-contact-editor.c:1276
+#: addressbook/gui/widgets/e-addressbook-view.c:575
 msgid "Business 2"
 msgstr "Trabajo 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1277
+#: addressbook/gui/widgets/e-addressbook-view.c:573
 msgid "Business Fax"
 msgstr "Fax del trabajo"
 
@@ -639,6 +643,7 @@ msgid "Callback"
 msgstr "Rellamada"
 
 #: addressbook/contact-editor/e-contact-editor.c:1279
+#: addressbook/gui/widgets/e-addressbook-view.c:572
 msgid "Car"
 msgstr "Coche"
 
@@ -648,27 +653,33 @@ msgstr "Compañía"
 
 #: addressbook/contact-editor/e-contact-editor.c:1281
 #: addressbook/contact-editor/e-contact-editor.c:1380
+#: addressbook/gui/widgets/e-addressbook-view.c:569
 msgid "Home"
 msgstr "Casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1282
+#: addressbook/gui/widgets/e-addressbook-view.c:576
 msgid "Home 2"
 msgstr "Casa 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1283
+#: addressbook/gui/widgets/e-addressbook-view.c:574
 msgid "Home Fax"
 msgstr "Fax de casa"
 
 #: addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/e-addressbook-view.c:577
 msgid "ISDN"
 msgstr "RDSI"
 
 #: addressbook/contact-editor/e-contact-editor.c:1285
+#: addressbook/gui/widgets/e-addressbook-view.c:571
 msgid "Mobile"
 msgstr "Móvil"
 
 #: addressbook/contact-editor/e-contact-editor.c:1286
 #: addressbook/contact-editor/e-contact-editor.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.c:578
 msgid "Other"
 msgstr "Otro"
 
@@ -677,10 +688,12 @@ msgid "Other Fax"
 msgstr "Otro fax"
 
 #: addressbook/contact-editor/e-contact-editor.c:1288
+#: addressbook/gui/widgets/e-addressbook-view.c:579
 msgid "Pager"
 msgstr "Papel"
 
 #: addressbook/contact-editor/e-contact-editor.c:1289
+#: addressbook/gui/widgets/e-addressbook-view.c:567
 msgid "Primary"
 msgstr "Principal"
 
@@ -697,10 +710,12 @@ msgid "TTY/TDD"
 msgstr "TTY/TDD"
 
 #: addressbook/contact-editor/e-contact-editor.c:1337
+#: addressbook/gui/widgets/e-addressbook-view.c:580
 msgid "Email 2"
 msgstr "Correo electrónico 2"
 
 #: addressbook/contact-editor/e-contact-editor.c:1338
+#: addressbook/gui/widgets/e-addressbook-view.c:581
 msgid "Email 3"
 msgstr "Correo electrónico 3"
 
@@ -857,27 +872,27 @@ msgstr ""
 "LDAP, necesitará descargar e instalar OpenLDAP y recompilar\n"
 "e instalar evolution.\n"
 
-#: addressbook/gui/component/addressbook.c:528 mail/folder-browser.c:219
+#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
 msgid "Show All"
 msgstr "Mostrar todo"
 
-#: addressbook/gui/component/addressbook.c:530 mail/folder-browser.c:221
+#: addressbook/gui/component/addressbook.c:532 mail/folder-browser.c:223
 msgid "Advanced..."
 msgstr "Avanzado..."
 
-#: addressbook/gui/component/addressbook.c:560
+#: addressbook/gui/component/addressbook.c:562
 msgid "Any field contains"
 msgstr "Cualquier campo contiene"
 
-#: addressbook/gui/component/addressbook.c:561
+#: addressbook/gui/component/addressbook.c:563
 msgid "Name contains"
 msgstr "El nombre contiene"
 
-#: addressbook/gui/component/addressbook.c:562
+#: addressbook/gui/component/addressbook.c:564
 msgid "Email contains"
 msgstr "El mensaje contiene"
 
-#: addressbook/gui/component/addressbook.c:705
+#: addressbook/gui/component/addressbook.c:707
 msgid "The URI that the Folder Browser will display"
 msgstr "La URI que mostrará el visor de carpetas"
 
@@ -1001,8 +1016,8 @@ msgstr "Descripción:"
 msgid "Addressbook Sources"
 msgstr "Fuentes de la agenda de direcciones"
 
-#: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:685 mail/mail-view.c:150
+#: calendar/gui/e-calendar-table.c:381 filter/libfilter-i18n.h:7
+#: mail/folder-browser.c:673 mail/mail-view.c:150
 #: po/tmp/addressbook-config.glade.h:8 po/tmp/event-editor-dialog.glade.h:13
 #: po/tmp/evolution-addressbook.xml.h:8 po/tmp/evolution-event-editor.xml.h:19
 #: po/tmp/evolution-mail.xml.h:11 po/tmp/filter.glade.h:7
@@ -1010,11 +1025,12 @@ msgstr "Fuentes de la agenda de direcciones"
 msgid "Delete"
 msgstr "Borrar"
 
-#: mail/folder-browser.c:671 po/tmp/addressbook-config.glade.h:9
+#: mail/folder-browser.c:659 po/tmp/addressbook-config.glade.h:9
 #: po/tmp/filter.glade.h:8 po/tmp/mail-config.glade.h:27
 msgid "Edit"
 msgstr "Editar"
 
+#: addressbook/gui/widgets/e-addressbook-view.c:565
 #: po/tmp/addressbook-config.glade.h:10
 msgid "Name"
 msgstr "Nombre"
@@ -1165,7 +1181,55 @@ msgstr "z"
 msgid "Save as VCard"
 msgstr "Guardar como vCard"
 
-#: addressbook/gui/widgets/e-minicard-control.c:278
+#: addressbook/gui/widgets/e-addressbook-view.c:566
+msgid "Email"
+msgstr "Correo electrónico"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:570
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:582
+msgid "Web Site"
+msgstr "Sitio Web"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:583
+msgid "Department"
+msgstr "Departamento"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:584
+msgid "Office"
+msgstr "Oficina"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:585
+msgid "Title"
+msgstr "Título"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:586
+msgid "Profession"
+msgstr "Profesión"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:587
+msgid "Manager"
+msgstr "Encargado"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:589
+msgid "Nickname"
+msgstr "Nick"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:590
+msgid "Spouse"
+msgstr "Cónyuge"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:591
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:592
+msgid "Free-busy URL"
+msgstr ""
+
+#: addressbook/gui/widgets/e-minicard-control.c:280
 msgid "Save in addressbook"
 msgstr "Guardar en la agenda de direcciones"
 
@@ -1343,7 +1407,7 @@ msgstr "Nombre del estilo:"
 msgid "Top:"
 msgstr "Encabezado:"
 
-#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:73
+#: po/tmp/e-contact-print.glade.h:45 po/tmp/mail-config.glade.h:72
 msgid "Type:"
 msgstr "Tipo:"
 
@@ -1364,13 +1428,13 @@ msgid "Configuration utility for the evolution calendar conduit.\n"
 msgstr ""
 "Utilidad de configuración para el enlace <<calendario>> de evolution.\n"
 
-#: calendar/conduits/calendar/calendar-conduit.c:686
-#: calendar/conduits/todo/todo-conduit.c:501
+#: calendar/conduits/calendar/calendar-conduit.c:690
+#: calendar/conduits/todo/todo-conduit.c:511
 msgid "Error while communicating with calendar server"
 msgstr "Error mientras me comunicaba con el servidor de calendario"
 
-#: calendar/conduits/calendar/calendar-conduit.c:785
-#: calendar/conduits/calendar/calendar-conduit.c:788
+#: calendar/conduits/calendar/calendar-conduit.c:789
+#: calendar/conduits/calendar/calendar-conduit.c:792
 msgid "Could not read pilot's Calendar application block"
 msgstr "No pude leer información de la aplicación de calendario del pilot"
 
@@ -1382,8 +1446,8 @@ msgstr "Enlace Por Hacer de Evolution"
 msgid "Configuration utility for the evolution todo conduit.\n"
 msgstr "Utilidad de configuración para el enlace \"todo\" de evolution.\n"
 
-#: calendar/conduits/todo/todo-conduit.c:600
-#: calendar/conduits/todo/todo-conduit.c:603
+#: calendar/conduits/todo/todo-conduit.c:610
+#: calendar/conduits/todo/todo-conduit.c:613
 msgid "Could not read pilot's ToDo application block"
 msgstr "No pude leer los datos de la aplicación ToDo de la pilot"
 
@@ -1420,7 +1484,7 @@ msgid ""
 msgstr "No pude mostrar el calendario.  Por favor compruebe su ORBit y su OAF."
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:284
+#: calendar/gui/calendar-model.c:328
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2499
 msgid "%a %m/%d/%Y"
@@ -1428,57 +1492,57 @@ msgstr "%a %m %d %Y"
 
 #. strftime format of a weekday, a date and a time,
 #. in 24-hour format.
-#: calendar/gui/calendar-model.c:288 calendar/gui/calendar-model.c:718
+#: calendar/gui/calendar-model.c:332 calendar/gui/calendar-model.c:762
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %m/%d/%Y %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time,
 #. in 12-hour format.
-#: calendar/gui/calendar-model.c:292 calendar/gui/calendar-model.c:721
+#: calendar/gui/calendar-model.c:336 calendar/gui/calendar-model.c:765
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:326 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:370 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:329 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:373 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:332 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:376 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:335 calendar/gui/calendar-model.c:503
+#: calendar/gui/calendar-model.c:379 calendar/gui/calendar-model.c:547
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:467
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:423
+#: calendar/gui/calendar-model.c:467
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:469
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:425
+#: calendar/gui/calendar-model.c:469
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:497
+#: calendar/gui/calendar-model.c:541
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:500
+#: calendar/gui/calendar-model.c:544
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:726
+#: calendar/gui/calendar-model.c:770
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1490,7 +1554,7 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:827 calendar/gui/calendar-model.c:875
+#: calendar/gui/calendar-model.c:871 calendar/gui/calendar-model.c:919
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
 #: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
@@ -1498,27 +1562,27 @@ msgstr "%m/%d/%Y"
 
 #. strptime format for a time of day, in 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:845
+#: calendar/gui/calendar-model.c:889
 msgid "%I:%M:%S %p%n"
 msgstr "%I:%M:%S %p%n"
 
 #. strptime format for a time of day, in 24-hour format.
-#: calendar/gui/calendar-model.c:848
+#: calendar/gui/calendar-model.c:892
 msgid "%H:%M:%S%n"
 msgstr "%H:%M:%S%n"
 
 #. strptime format for time of day, without seconds, 12-hour format.
 #. If it is is not appropriate in the locale set to an empty string.
-#: calendar/gui/calendar-model.c:852
+#: calendar/gui/calendar-model.c:896
 msgid "%I:%M %p%n"
 msgstr "%I:%M %p%n"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: calendar/gui/calendar-model.c:855
+#: calendar/gui/calendar-model.c:899
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:975
+#: calendar/gui/calendar-model.c:1019
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1528,11 +1592,11 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1015
+#: calendar/gui/calendar-model.c:1059
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "El valor del porcentaje debe estar entre 0 y 100"
 
-#: calendar/gui/calendar-model.c:1055
+#: calendar/gui/calendar-model.c:1099
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioridad debe estar entre 1 y 9"
 
@@ -1544,35 +1608,35 @@ msgstr "%A, %e %B %Y"
 msgid "%I:%M%p"
 msgstr "%I:%M%p"
 
-#: calendar/gui/calendar-summary.c:298
+#: calendar/gui/calendar-summary.c:299
 msgid "<b>Error loading calendar</b>"
 msgstr "<b>Error cargando el calendario</b>"
 
-#: calendar/gui/calendar-summary.c:303
+#: calendar/gui/calendar-summary.c:304
 msgid "<b>Error loading calendar:<br>Calendar in use."
 msgstr "<b>Error cargando el calendario:<br>Calendario en uso."
 
-#: calendar/gui/calendar-summary.c:309
+#: calendar/gui/calendar-summary.c:310
 msgid "<b>Error loading calendar:<br>Method not supported"
 msgstr "<b>Error cargando el calendario:<br>Metodo no soportado"
 
-#: calendar/gui/calendar-summary.c:475
+#: calendar/gui/calendar-summary.c:476
 msgid "Display"
 msgstr "Mostrar"
 
-#: calendar/gui/calendar-summary.c:480
+#: calendar/gui/calendar-summary.c:481
 msgid "Show appointments"
 msgstr "Mostrar citas"
 
-#: calendar/gui/calendar-summary.c:488
+#: calendar/gui/calendar-summary.c:489
 msgid "Show tasks"
 msgstr "Mostar tareas"
 
-#: calendar/gui/calendar-summary.c:580
+#: calendar/gui/calendar-summary.c:581
 msgid "Loading Calendar"
 msgstr "Cargando calendario"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:127
 msgid "The URI that the calendar will display"
 msgstr "La URI que mostrará el calendario"
 
@@ -1679,7 +1743,7 @@ msgstr "Valores predeterminados"
 msgid "Display options"
 msgstr "Mostrar opciones"
 
-#: po/tmp/cal-prefs-dialog.glade.h:23
+#: calendar/gui/e-calendar-table.c:158 po/tmp/cal-prefs-dialog.glade.h:23
 msgid "Due Date"
 msgstr "Fecha de plazo"
 
@@ -1743,7 +1807,7 @@ msgstr "Elementos fuera de plazo:"
 msgid "Pick a color"
 msgstr "Elije un color"
 
-#: po/tmp/cal-prefs-dialog.glade.h:39
+#: calendar/gui/e-calendar-table.c:161 po/tmp/cal-prefs-dialog.glade.h:39
 msgid "Priority"
 msgstr "Prioridad"
 
@@ -1910,7 +1974,7 @@ msgstr "Baja"
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
 #: po/tmp/mail-config.glade.h:46 po/tmp/task-editor-dialog.glade.h:17
-#: shell/e-shell-view.c:1073 widgets/misc/e-dateedit.c:421
+#: shell/e-shell-view.c:1089 widgets/misc/e-dateedit.c:421
 #: widgets/misc/e-dateedit.c:1330 widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ninguno"
@@ -1940,69 +2004,118 @@ msgid "URL:"
 msgstr "URL:"
 
 #: po/tmp/task-editor-dialog.glade.h:26
+msgid "Undefined"
+msgstr "Sin definir"
+
+#: po/tmp/task-editor-dialog.glade.h:27
 msgid "_Contacts..."
 msgstr "_Contactos..."
 
-#: po/tmp/task-editor-dialog.glade.h:27
+#: po/tmp/task-editor-dialog.glade.h:28
 msgid "_Due Date:"
 msgstr "Fecha _de Fin:"
 
-#: po/tmp/task-editor-dialog.glade.h:28
+#: po/tmp/task-editor-dialog.glade.h:29
 msgid "_Priority:"
 msgstr "_Prioridad:"
 
-#: po/tmp/task-editor-dialog.glade.h:29
+#: po/tmp/task-editor-dialog.glade.h:30
 msgid "_Status:"
 msgstr "E_stado:"
 
-#: po/tmp/task-editor-dialog.glade.h:30
+#: po/tmp/task-editor-dialog.glade.h:31
 msgid "task-editor-dialog"
 msgstr "dialogo del editor de tareas"
 
-#: calendar/gui/dialogs/task-editor.c:690
+#: calendar/gui/dialogs/task-editor.c:689
 msgid "Edit Task"
 msgstr "Editar Tarea"
 
-#: calendar/gui/dialogs/task-editor.c:696 calendar/gui/event-editor.c:336
+#: calendar/gui/dialogs/task-editor.c:695 calendar/gui/event-editor.c:336
 msgid "No summary"
 msgstr "Sin resumen"
 
-#: calendar/gui/dialogs/task-editor.c:702 calendar/gui/event-editor.c:342
+#: calendar/gui/dialogs/task-editor.c:701 calendar/gui/event-editor.c:342
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/task-editor.c:705 calendar/gui/event-editor.c:345
+#: calendar/gui/dialogs/task-editor.c:704 calendar/gui/event-editor.c:345
 #, c-format
 msgid "Task - %s"
 msgstr "Tarea - %s"
 
-#: calendar/gui/dialogs/task-editor.c:708 calendar/gui/event-editor.c:348
+#: calendar/gui/dialogs/task-editor.c:707 calendar/gui/event-editor.c:348
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1293 calendar/gui/event-editor.c:3269
+#: calendar/gui/dialogs/task-editor.c:1292 calendar/gui/event-editor.c:3269
 msgid "Do you want to save changes?"
 msgstr "¿Desea guardar los cambios?"
 
-#: calendar/gui/e-calendar-table.c:336
+#: calendar/gui/e-calendar-table.c:153
+msgid "Categories"
+msgstr "Categorías"
+
+#: calendar/gui/e-calendar-table.c:154 po/tmp/event-editor-dialog.glade.h:10
+msgid "Classification"
+msgstr "Clasificación"
+
+#: calendar/gui/e-calendar-table.c:155
+msgid "Completion Date"
+msgstr "Fecha de vencimiento"
+
+#: calendar/gui/e-calendar-table.c:156
+msgid "End Date"
+msgstr "Fecha fin"
+
+#: calendar/gui/e-calendar-table.c:157
+msgid "Start Date"
+msgstr "Fecha de Inicio"
+
+#: calendar/gui/e-calendar-table.c:159
+msgid "Geographical Position"
+msgstr "Posición geográfica"
+
+#: calendar/gui/e-calendar-table.c:160
+#, fuzzy
+msgid "Precent complete"
+msgstr "Marcar la tarea como completa"
+
+#: calendar/gui/e-calendar-table.c:162
+msgid "Summary"
+msgstr "Resumen"
+
+#: calendar/gui/e-calendar-table.c:163
+msgid "Transparency"
+msgstr "Transparencia"
+
+#: calendar/gui/e-calendar-table.c:164
+msgid "URL"
+msgstr "URL"
+
+#: calendar/gui/e-calendar-table.c:165
+msgid "Alarms"
+msgstr "Alarmas"
+
+#: calendar/gui/e-calendar-table.c:375
 msgid "Open..."
 msgstr "Abrir..."
 
-#: calendar/gui/e-calendar-table.c:337
+#: calendar/gui/e-calendar-table.c:376
 msgid "Open the task"
 msgstr "Abrir la tarea"
 
-#: calendar/gui/e-calendar-table.c:339
+#: calendar/gui/e-calendar-table.c:378
 msgid "Mark Complete"
 msgstr "Marcar como completa"
 
-#: calendar/gui/e-calendar-table.c:340
+#: calendar/gui/e-calendar-table.c:379
 msgid "Mark the task complete"
 msgstr "Marcar la tarea como completa"
 
-#: calendar/gui/e-calendar-table.c:343
+#: calendar/gui/e-calendar-table.c:382
 msgid "Delete the task"
 msgstr "Borrar la tarea"
 
@@ -2013,21 +2126,21 @@ msgstr "%02i divisiones por minuto"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1211
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1213
 #: calendar/gui/e-week-view-main-item.c:325
 msgid "%A %d %B"
 msgstr "%A %b de %B"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1225
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1227
 #: calendar/gui/e-week-view-main-item.c:334
 msgid "%a %d %b"
 msgstr "%a, %d de %b de %Y"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1238
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1240
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
@@ -2044,45 +2157,52 @@ msgstr "am"
 msgid "pm"
 msgstr "pm"
 
-#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
-#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3169
-#: calendar/gui/e-week-view.c:3176 calendar/gui/e-week-view.c:3185
+#: calendar/gui/e-day-view.c:2950 calendar/gui/e-day-view.c:2957
+#: calendar/gui/e-day-view.c:2966 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-week-view.c:3177 calendar/gui/e-week-view.c:3186
 msgid "New appointment..."
 msgstr "Nueva cita..."
 
-#: calendar/gui/e-day-view.c:2952 calendar/gui/e-day-view.c:2959
-#: calendar/gui/e-week-view.c:3173 calendar/gui/e-week-view.c:3180
+#: calendar/gui/e-day-view.c:2954 calendar/gui/e-day-view.c:2961
+#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3181
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3174
+#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3175
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3182
 msgid "Make this appointment movable"
 msgstr "Hacer esta cita movible"
 
-#: calendar/gui/e-day-view.c:2961 calendar/gui/e-week-view.c:3182
+#: calendar/gui/e-day-view.c:2963 calendar/gui/e-week-view.c:3183
 msgid "Delete this occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: calendar/gui/e-day-view.c:2962 calendar/gui/e-week-view.c:3183
+#: calendar/gui/e-day-view.c:2964 calendar/gui/e-week-view.c:3184
 msgid "Delete all occurrences"
 msgstr "Borrar todas las ocurrencias"
 
-#: calendar/gui/e-tasks.c:281
-#, c-format
+#: calendar/gui/e-tasks.c:156 calendar/gui/e-tasks.c:573
+#: calendar/gui/e-tasks.c:608
+msgid "All"
+msgstr "Todo"
+
+#: calendar/gui/e-tasks.c:162
+msgid "Category:"
+msgstr "Categorías:"
+
+#: calendar/gui/e-tasks.c:333
 msgid "Could not load the tasks in `%s'"
-msgstr "No puedo cargar la tarea en `%s'"
+msgstr "No puedo cargar las tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:292
-#, c-format
+#: calendar/gui/e-tasks.c:345
 msgid "Could not create a tasks file in `%s'"
 msgstr "No puedo crear un archivo de tareas en `%s'"
 
-#: calendar/gui/e-tasks.c:304 calendar/gui/gnome-cal.c:698
+#: calendar/gui/e-tasks.c:358 calendar/gui/gnome-cal.c:731
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "El método necesario para cargar `%s' no esta soportado"
@@ -2106,10 +2226,6 @@ msgstr "Evento para todo e_l día"
 msgid "Appointment Basics"
 msgstr "Bases de la citas"
 
-#: po/tmp/event-editor-dialog.glade.h:10
-msgid "Classification"
-msgstr "Clasificación"
-
 #: po/tmp/event-editor-dialog.glade.h:11
 msgid "Custom recurrence"
 msgstr "Recurrencia personalizada"
@@ -2291,15 +2407,13 @@ msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/gnome-cal.c:676
-#, c-format
-msgid "Could not load the calendar in `%s'"
-msgstr "No puedo cargar el calendario en `%s'"
+#: calendar/gui/gnome-cal.c:709
+msgid "Could not load the folder in `%s'"
+msgstr "No puedo cargar la carpeta en `%s'"
 
-#: calendar/gui/gnome-cal.c:687
-#, c-format
-msgid "Could not create a calendar in `%s'"
-msgstr "No puedo crear un calendario en `%s'"
+#: calendar/gui/gnome-cal.c:720
+msgid "Could not create a folder in `%s'"
+msgstr "No puedo crear una carpeta en `%s'"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -2553,11 +2667,11 @@ msgstr "Año actual (%Y)"
 msgid "Print Calendar"
 msgstr "Imprimir calendario"
 
-#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1002
+#: calendar/gui/print.c:1314 mail/mail-callbacks.c:1042
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#: calendar/gui/tasks-control.c:103
+#: calendar/gui/tasks-control.c:105
 msgid "The URI of the tasks folder to display"
 msgstr "La URI que mostrará la carpeta de tareas"
 
@@ -2651,29 +2765,35 @@ msgstr "No puedo cargar %s: %s"
 msgid "Could not load %s: No initialization code in module."
 msgstr "No pude cagar %s: No hay código de inicialización en el módulo."
 
-#: camel/camel-remote-store.c:183
+#: camel/camel-remote-store.c:184
 #, c-format
 msgid "%s server %s"
 msgstr "%s servidor %s"
 
-#: camel/camel-remote-store.c:187
+#: camel/camel-remote-store.c:188
 #, c-format
 msgid "%s service for %s on %s"
 msgstr "%s servico para %s en %s"
 
-#: camel/camel-remote-store.c:235
+#: camel/camel-remote-store.c:315
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+
+#: camel/camel-remote-store.c:318 camel/camel-remote-store.c:331
 #: camel/providers/smtp/camel-smtp-transport.c:160
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
 
-#: camel/camel-remote-store.c:236
+#: camel/camel-remote-store.c:319 camel/camel-remote-store.c:332
 msgid "(unknown host)"
 msgstr "(servidor desconocido)"
 
-#: camel/camel-remote-store.c:460
-msgid "Server disconnected."
-msgstr "Servidor desconectado."
+#: camel/camel-remote-store.c:423 camel/camel-remote-store.c:485
+#: camel/camel-remote-store.c:553
+msgid "Operation cancelled"
+msgstr "Operación cancelada"
 
 #: camel/camel-service.c:137
 #, c-format
@@ -2742,30 +2862,30 @@ msgstr ""
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autentificación erronea desde el servidor."
 
-#: camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap/camel-imap-command.c:233
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Respuesta inexperada del servidor IMAP: %s"
 
-#: camel/providers/imap/camel-imap-command.c:240
+#: camel/providers/imap/camel-imap-command.c:241
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "El comando IMAP ha fallado: %s"
 
-#: camel/providers/imap/camel-imap-command.c:241 shell/e-storage.c:411
+#: camel/providers/imap/camel-imap-command.c:242 shell/e-storage.c:411
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: camel/providers/imap/camel-imap-command.c:287
+#: camel/providers/imap/camel-imap-command.c:288
 msgid "Server response ended too soon."
 msgstr "La respuesta del servidor termino demasiado pronto."
 
-#: camel/providers/imap/camel-imap-command.c:423
+#: camel/providers/imap/camel-imap-command.c:424
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "La respuesta del servidor IMAP no contenia información de %s"
 
-#: camel/providers/imap/camel-imap-command.c:459
+#: camel/providers/imap/camel-imap-command.c:460
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
@@ -2775,7 +2895,7 @@ msgstr "El servidor IMAP inesperadamente a respondido OK: %s"
 msgid "Could not load summary for %s"
 msgstr "No puedo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:532
+#: camel/providers/imap/camel-imap-folder.c:625
 msgid "Could not find message body in FETCH response."
 msgstr "No pude encontrar el cuerpo del mensaje en la respuesta de FETCH"
 
@@ -3285,7 +3405,7 @@ msgid "No such folder `%s'."
 msgstr "No existe la carpeta `%s'."
 
 #: camel/providers/sendmail/camel-sendmail-provider.c:34
-#: po/tmp/mail-config.glade.h:62
+#: po/tmp/mail-config.glade.h:61
 msgid "Sendmail"
 msgstr "Sendmail"
 
@@ -3506,7 +3626,7 @@ msgid "Attach a file"
 msgstr "Adjuntar un fichero"
 
 #: composer/e-msg-composer-attachment-bar.c:460 po/tmp/filter.glade.h:14
-#: shell/e-shortcuts-view.c:239 shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:254 shell/e-shortcuts-view.c:377
 msgid "Remove"
 msgstr "Quitar"
 
@@ -3538,40 +3658,40 @@ msgstr "Nombre del fichero:"
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:305
-#: mail/mail-format.c:626
+#: composer/e-msg-composer-hdrs.c:147 composer/e-msg-composer-hdrs.c:312
+#: mail/mail-format.c:624
 msgid "From:"
 msgstr "De:"
 
-#: composer/e-msg-composer-hdrs.c:249
+#: composer/e-msg-composer-hdrs.c:257
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
-#: composer/e-msg-composer-hdrs.c:306
+#: composer/e-msg-composer-hdrs.c:313
 msgid "Enter the identity you wish to send this message from"
 msgstr "Elija la identidad desde la que quiere enviar el mensaje"
 
-#: composer/e-msg-composer-hdrs.c:310 mail/mail-format.c:630
+#: composer/e-msg-composer-hdrs.c:317 mail/mail-format.c:628
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:311
+#: composer/e-msg-composer-hdrs.c:318
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:315 mail/mail-format.c:632
+#: composer/e-msg-composer-hdrs.c:322 mail/mail-format.c:630
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:316
+#: composer/e-msg-composer-hdrs.c:323
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Escriba las direcciones que recibirán una copia del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:321
+#: composer/e-msg-composer-hdrs.c:328
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:322
+#: composer/e-msg-composer-hdrs.c:329
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3579,11 +3699,11 @@ msgstr ""
 "Escriba las direcciones que recibirán una copia del mensaje sin aparecer en "
 "la lista de destinatarios del mensaje."
 
-#: composer/e-msg-composer-hdrs.c:328 mail/mail-format.c:634
+#: composer/e-msg-composer-hdrs.c:335 mail/mail-format.c:632
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:329
+#: composer/e-msg-composer-hdrs.c:336
 msgid "Enter the subject of the mail"
 msgstr "Escriba el asunto del mensaje"
 
@@ -3623,7 +3743,7 @@ msgstr "Guardar cambios en el mensaje..."
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error guardando el mensaje en 'Drafts': %s"
 
-#: composer/e-msg-composer.c:754 shell/e-shell-view-menu.c:167
+#: composer/e-msg-composer.c:754 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
@@ -3677,7 +3797,7 @@ msgstr "Nuevo mensaje"
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
-#: composer/evolution-composer.c:307
+#: composer/evolution-composer.c:345
 msgid "Cannot initialize Evolution's composer."
 msgstr "No puedo inicializar el componente de escritura correo de Evolution."
 
@@ -4002,6 +4122,7 @@ msgid "Regex Match"
 msgstr "Expresión regular"
 
 #: filter/libfilter-i18n.h:17 filter/score-rule.c:192 filter/score-rule.c:194
+#: mail/message-list.c:1107
 msgid "Score"
 msgstr "Puntuación"
 
@@ -4021,7 +4142,7 @@ msgstr "Fuente"
 msgid "Specific header"
 msgstr "Cabecera específica"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:22 mail/message-list.c:1107
 msgid "Status"
 msgstr "Estado"
 
@@ -4029,7 +4150,7 @@ msgstr "Estado"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:24 mail/message-list.c:1108
 msgid "Subject"
 msgstr "Asunto"
 
@@ -4129,173 +4250,133 @@ msgstr "Añadir regla para carpeta virtual"
 msgid "Edit VFolder Rule"
 msgstr "Editar regla de VFolder"
 
-#: mail/component-factory.c:280
+#: mail/component-factory.c:282
 msgid "Cannot initialize Evolution's mail component."
 msgstr "No puedo inicializar el componente de correo de Evolution."
 
-#: mail/component-factory.c:319
+#: mail/component-factory.c:318
 msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
-#: mail/folder-browser.c:223 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:19
-msgid "Save"
-msgstr "Guardar"
+#: mail/folder-browser.c:225
+msgid "Store search as vFolder"
+msgstr "Guardar la busqueda como una carpeta virtual"
 
-#: mail/folder-browser.c:236
+#: mail/folder-browser.c:238
 msgid "Body or subject contains"
 msgstr "El cuerpo y el asunto contienen"
 
-#: mail/folder-browser.c:237
+#: mail/folder-browser.c:239
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
-#: mail/folder-browser.c:238
+#: mail/folder-browser.c:240
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
-#: mail/folder-browser.c:239
+#: mail/folder-browser.c:241
 msgid "Body does not contain"
 msgstr "El cuerpo no contiene"
 
-#: mail/folder-browser.c:240
+#: mail/folder-browser.c:242
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: mail/folder-browser.c:643
+#: mail/folder-browser.c:645
 msgid "VFolder on Subject"
 msgstr "VFolder según el asunto"
 
-#: mail/folder-browser.c:644
+#: mail/folder-browser.c:646
 msgid "VFolder on Sender"
 msgstr "VFolder según el remitente"
 
-#: mail/folder-browser.c:645
+#: mail/folder-browser.c:647
 msgid "VFolder on Recipients"
 msgstr "VFolder según los destinatarios"
 
-#: mail/folder-browser.c:647
+#: mail/folder-browser.c:649
 msgid "Filter on Subject"
 msgstr "Filtrar según el asunto"
 
-#: mail/folder-browser.c:648
+#: mail/folder-browser.c:650
 msgid "Filter on Sender"
 msgstr "Filtrar según el remitente"
 
-#: mail/folder-browser.c:649
+#: mail/folder-browser.c:651
 msgid "Filter on Recipients"
 msgstr "Filtrar según los destinatarios"
 
-#: mail/folder-browser.c:650 mail/folder-browser.c:779
+#: mail/folder-browser.c:652 mail/folder-browser.c:766
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:655
-msgid "Show all hidden"
-msgstr "Mostrar todo lo oculto"
-
-#: mail/folder-browser.c:657
-msgid "Hide selected"
-msgstr "Ocultar la selección"
-
-#. could use another mask, but not enough api do to it
-#: mail/folder-browser.c:660
-msgid "Hide read"
-msgstr "Ocultar lo leído"
-
-#: mail/folder-browser.c:661
-msgid "Hide deleted"
-msgstr "Ocultar lo borrado"
-
-#: mail/folder-browser.c:663 mail/folder-browser.c:790
-msgid "Hide Subject"
-msgstr "Ocultar el asunto"
-
-#: mail/folder-browser.c:665 mail/folder-browser.c:796
-msgid "Hide from Sender"
-msgstr "Ocultar el remitente"
-
-#: mail/folder-browser.c:670 po/tmp/evolution-message-composer.xml.h:15
+#: mail/folder-browser.c:658 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Abrir"
 
-#: mail/folder-browser.c:672
+#: mail/folder-browser.c:660
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/folder-browser.c:673 mail/mail-view.c:148
+#: mail/folder-browser.c:661 mail/mail-view.c:148
 #: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:32
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:675
+#: mail/folder-browser.c:663
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/folder-browser.c:676 mail/mail-view.c:141
-#: po/tmp/evolution-mail.xml.h:38
+#: mail/folder-browser.c:664 mail/mail-view.c:141
+#: po/tmp/evolution-mail.xml.h:37
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/folder-browser.c:677 mail/mail-view.c:144
+#: mail/folder-browser.c:665 mail/mail-view.c:144
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:678 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:666 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
-#: mail/folder-browser.c:680
+#: mail/folder-browser.c:668
 msgid "Mark as Read"
 msgstr "Marcar como leído"
 
-#: mail/folder-browser.c:681
+#: mail/folder-browser.c:669
 msgid "Mark as Unread"
 msgstr "Marcar como no leído"
 
-#: mail/folder-browser.c:683
+#: mail/folder-browser.c:671
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: mail/folder-browser.c:684
+#: mail/folder-browser.c:672
 msgid "Copy to Folder..."
 msgstr "Copiar a la carpeta..."
 
-#: mail/folder-browser.c:686
+#: mail/folder-browser.c:674
 msgid "Undelete"
 msgstr "Recuperar"
 
 #. { _("Add Sender to Address Book"), NULL, GTK_SIGNAL_FUNC (addrbook_sender),   NULL,  0 },
 #. { "",                              NULL, GTK_SIGNAL_FUNC (NULL),              NULL,  0 },
-#: mail/folder-browser.c:690
+#: mail/folder-browser.c:678
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:692 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:680
 msgid "Create Rule From Message"
 msgstr "Crear una regla con el mensaje"
 
-#: mail/folder-browser.c:693 po/tmp/evolution-mail.xml.h:21
-msgid "Hide Messages"
-msgstr "Ocultar mensajes"
-
-#: mail/folder-browser.c:781
+#: mail/folder-browser.c:768
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
-#: mail/folder-browser.c:787
-#, c-format
-msgid "Hide Subject \"%s\""
-msgstr "Ocultar asunto \"%s\""
-
-#: mail/folder-browser.c:793
-#, c-format
-msgid "Hide from Sender <%s>"
-msgstr "Ocultar del remitente <%s>"
-
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -4316,14 +4397,6 @@ msgstr "Nuevo formato de almacenamiento:"
 msgid "Note: When converting between mailbox formats, a failure\n"
 msgstr "Nota: Cuando se convierte entre distintos tipos de formato, fallos\n"
 
-#: po/tmp/local-config.glade.h:10
-msgid "(such as lack of disk space) may not be automatically\n"
-msgstr "(como la falta de espacio en disco) puede que no sean recuperados\n"
-
-#: po/tmp/local-config.glade.h:11
-msgid "recoverable.  Please use this feature with care."
-msgstr "automaticamente.  Por favor use esta opción con cuidado."
-
 #: po/tmp/local-config.glade.h:12
 msgid "maildir"
 msgstr "maildir"
@@ -4337,12 +4410,12 @@ msgid "mh"
 msgstr "mh"
 
 #. give our dialog an OK button and title
-#: mail/mail-accounts.c:343
+#: mail/mail-accounts.c:341
 msgid "Evolution Account Manager"
 msgstr "Administrador de cuentas de Evolution"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:592
+#: mail/mail-account-editor.c:605
 msgid "Evolution Account Editor"
 msgstr "Editor de cuentas de Evolution"
 
@@ -4366,7 +4439,7 @@ msgstr "Correo de %s"
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-callbacks.c:75
+#: mail/mail-callbacks.c:82
 msgid ""
 "You have not configured the mail client.\n"
 "You need to do this before you can send,\n"
@@ -4378,7 +4451,7 @@ msgstr ""
 "recibir o escribir mensajes.\n"
 "¿Querría configurarlo ahora?"
 
-#: mail/mail-callbacks.c:116
+#: mail/mail-callbacks.c:135
 msgid ""
 "You need to configure an identity\n"
 "before you can compose mail."
@@ -4386,7 +4459,7 @@ msgstr ""
 "Necesita configurar una identidad para\n"
 "poder escribir mensajes de correo."
 
-#: mail/mail-callbacks.c:128
+#: mail/mail-callbacks.c:147
 msgid ""
 "You need to configure a mail transport\n"
 "before you can compose mail."
@@ -4394,15 +4467,15 @@ msgstr ""
 "Necesita configurar un transporte de\n"
 "correo para poder enviarlo."
 
-#: mail/mail-callbacks.c:203
+#: mail/mail-callbacks.c:222
 msgid "You have not set a mail transport method"
 msgstr "No has definido un sistema para enviar el correo"
 
-#: mail/mail-callbacks.c:212
+#: mail/mail-callbacks.c:231
 msgid "You have no Outbox configured"
 msgstr "No tiene Outbox configurado"
 
-#: mail/mail-callbacks.c:239
+#: mail/mail-callbacks.c:258
 msgid ""
 "This message has no subject.\n"
 "Really send?"
@@ -4410,23 +4483,27 @@ msgstr ""
 "Este mensaje no tiene asunto.\n"
 "¿Quiere enviarlo?"
 
-#: mail/mail-callbacks.c:307
+#: mail/mail-callbacks.c:318
+msgid "You must configure an account before you can send this email."
+msgstr "Debe configurar una cuenta antes de poder enviar este mensaje."
+
+#: mail/mail-callbacks.c:338
 msgid "You must specify recipients in order to send this message."
 msgstr "Debes especificar destinatarios para poder enviar el mensaje."
 
-#: mail/mail-callbacks.c:527
+#: mail/mail-callbacks.c:567
 msgid "Forwarded message:\n"
 msgstr "Mensaje reenviado:\n"
 
-#: mail/mail-callbacks.c:608
+#: mail/mail-callbacks.c:648
 msgid "Move message(s) to"
 msgstr "Mover Mensaje(s) a"
 
-#: mail/mail-callbacks.c:610
+#: mail/mail-callbacks.c:650
 msgid "Copy message(s) to"
 msgstr "Copiar mensaje(s) a"
 
-#: mail/mail-callbacks.c:745
+#: mail/mail-callbacks.c:785
 msgid ""
 "You may only edit messages saved\n"
 "in the Drafts folder."
@@ -4434,11 +4511,11 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Drafts."
 
-#: mail/mail-callbacks.c:778 mail/mail-display.c:79
+#: mail/mail-callbacks.c:818 mail/mail-display.c:79
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:782 mail/mail-display.c:83
+#: mail/mail-callbacks.c:822 mail/mail-display.c:83
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4446,15 +4523,15 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Sobreescribirlo?"
 
-#: mail/mail-callbacks.c:827
+#: mail/mail-callbacks.c:867
 msgid "Save Message As..."
 msgstr "Guardar mensaje como..."
 
-#: mail/mail-callbacks.c:829
+#: mail/mail-callbacks.c:869
 msgid "Save Messages As..."
 msgstr "Guardar mensajes como..."
 
-#: mail/mail-callbacks.c:913
+#: mail/mail-callbacks.c:953
 #, c-format
 msgid ""
 "Error loading filter information:\n"
@@ -4463,11 +4540,11 @@ msgstr ""
 "Error cargando la información del filtro:\n"
 "%s"
 
-#: mail/mail-callbacks.c:962
+#: mail/mail-callbacks.c:1002
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/mail-callbacks.c:1009
+#: mail/mail-callbacks.c:1049
 msgid "Printing of message failed"
 msgstr "Ha fallado la impresión del mensaje"
 
@@ -4507,23 +4584,6 @@ msgstr "Tipo de autentificación:"
 msgid "Congratulations, your mail configuration is complete.\n"
 msgstr "Enhorabuena, se ha completado la configuración de su correo.\n"
 
-#: po/tmp/mail-config.glade.h:17 po/tmp/mail-config.glade.h:20
-#: po/tmp/mail-config.glade.h:77
-msgid "\n"
-msgstr "\n"
-
-#: po/tmp/mail-config.glade.h:18
-msgid "You are now ready to send and receive email \n"
-msgstr "Ahora esta listo para recivir y enviar mensajes de correo \n"
-
-#: po/tmp/mail-config.glade.h:19
-msgid "using Evolution. \n"
-msgstr "usando Evolution. \n"
-
-#: po/tmp/mail-config.glade.h:21
-msgid "Click \"Finish\" to save your settings."
-msgstr "Pulsa \"Fin\" para guardar la configuración."
-
 #: po/tmp/mail-config.glade.h:22
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
@@ -4628,71 +4688,67 @@ msgstr "Reciviendo mensajes"
 msgid "Remember my password"
 msgstr "Recuerda mi contraseña"
 
-#: mail/mail-format.c:628 po/tmp/mail-config.glade.h:55
+#: mail/mail-format.c:626 po/tmp/mail-config.glade.h:55
 msgid "Reply-To:"
 msgstr "Responder a:"
 
 #: po/tmp/mail-config.glade.h:56
-msgid "Reply-to:"
-msgstr "Responder a:"
-
-#: po/tmp/mail-config.glade.h:57
 msgid "Required"
 msgstr "Requerido"
 
-#: po/tmp/mail-config.glade.h:58
+#: po/tmp/mail-config.glade.h:57
 msgid "SMTP"
 msgstr "SMTP"
 
-#: po/tmp/mail-config.glade.h:59
+#: po/tmp/mail-config.glade.h:58
 msgid "Save password"
 msgstr "Guardar clave"
 
-#: po/tmp/mail-config.glade.h:60
+#: po/tmp/mail-config.glade.h:59
 msgid "Select signature file"
 msgstr "Elegir archivo de firma"
 
-#: po/tmp/mail-config.glade.h:61
+#: po/tmp/mail-config.glade.h:60
 msgid "Sending Email"
 msgstr "Enviando correo"
 
-#: po/tmp/mail-config.glade.h:63
+#: po/tmp/mail-config.glade.h:62
 msgid "Server Configuration"
 msgstr "Configuración del servidor"
 
-#: po/tmp/mail-config.glade.h:64
+#: po/tmp/mail-config.glade.h:63
 msgid "Server Type: "
 msgstr "Tipo de servidor:"
 
-#: po/tmp/mail-config.glade.h:65
+#: po/tmp/mail-config.glade.h:64
 msgid "Server requires authentication"
 msgstr "El servidor requiere autentificación"
 
-#: po/tmp/mail-config.glade.h:66
+#: po/tmp/mail-config.glade.h:65
 msgid "Servers"
 msgstr "Servidores"
 
-#: po/tmp/mail-config.glade.h:67
+#: po/tmp/mail-config.glade.h:66
 msgid "Signature file:"
 msgstr "Archivo de firma:"
 
-#: po/tmp/mail-config.glade.h:68
+#: po/tmp/mail-config.glade.h:67
 msgid "Signature:"
 msgstr "Firma:"
 
-#: po/tmp/mail-config.glade.h:69
+#: po/tmp/mail-config.glade.h:68
 msgid "Sources"
 msgstr "Fuentes"
 
-#: po/tmp/mail-config.glade.h:70
+#: po/tmp/mail-config.glade.h:69
 msgid "This server requires a secure connection (SSL)"
 msgstr "Este servidor requiere una conexión segura (SSL)"
 
-#: po/tmp/mail-config.glade.h:71
+#: po/tmp/mail-config.glade.h:70
 msgid "Type"
 msgstr "Tipo"
 
-#: po/tmp/mail-config.glade.h:72
+#: po/tmp/mail-config.glade.h:71
 msgid ""
 "Type the name by which you would like to refer to these servers. For "
 "example: \"Work\" or \"Home\"."
@@ -4700,24 +4756,34 @@ msgstr ""
 "Escriba el nombre por el cual le gustatía referirse a estos servidores. Por "
 "ejemplo: \"Trabajo\" o \"Casa\"."
 
-#: po/tmp/mail-config.glade.h:74
+#: po/tmp/mail-config.glade.h:73
 msgid "User Information"
 msgstr "Información del usuario"
 
-#: po/tmp/mail-config.glade.h:75
+#: po/tmp/mail-config.glade.h:74
 msgid "Username:"
 msgstr "Nombre:"
 
-#: po/tmp/mail-config.glade.h:76
+#: po/tmp/mail-config.glade.h:75
 msgid "Welcome to the Evolution Mail Configuration Druid.\n"
 msgstr "Bienvenido al ayudante de configuración de correo de Evolution.\n"
 
-#: po/tmp/mail-config.glade.h:78
-msgid "Click \"Next\" to begin. "
-msgstr "Pulse \"Siguiente\" para comenzar. "
+#: mail/mail-config-druid.c:346
+#, c-format
+msgid ""
+"Failed to verify the incoming mail configuration.\n"
+"You may experience problems retrieving your mail from %s"
+msgstr ""
+
+#: mail/mail-config-druid.c:612
+#, c-format
+msgid ""
+"Failed to verify the outgoing mail configuration.\n"
+"You may experience problems sending your mail using %s"
+msgstr ""
 
 #. set window title
-#: mail/mail-config-druid.c:863
+#: mail/mail-config-druid.c:889
 msgid "Evolution Account Wizard"
 msgstr "Configurador de cuentas de Evolution"
 
@@ -4770,48 +4836,48 @@ msgstr "Ver incluido (vía %s)"
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-format.c:503
+#: mail/mail-format.c:504
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:858
+#: mail/mail-format.c:856
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:862
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:865
+#: mail/mail-format.c:863
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1440
+#: mail/mail-format.c:1438
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1452
+#: mail/mail-format.c:1450
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en \"%s\""
 
-#: mail/mail-format.c:1456
+#: mail/mail-format.c:1454
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1490
+#: mail/mail-format.c:1488
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1495
+#: mail/mail-format.c:1493
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-format.c:1665
+#: mail/mail-format.c:1663
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribió:\n"
@@ -4942,103 +5008,103 @@ msgstr "Enviando cola de correo"
 msgid "Send queue"
 msgstr "Enviar cola"
 
-#: mail/mail-ops.c:805 mail/mail-ops.c:812
+#: mail/mail-ops.c:813 mail/mail-ops.c:820
 #, c-format
 msgid "Appending \"%s\""
 msgstr "Añadiendo \"%s\""
 
-#: mail/mail-ops.c:809 mail/mail-ops.c:815
+#: mail/mail-ops.c:817 mail/mail-ops.c:823
 msgid "Appending a message without a subject"
 msgstr "Añadiendo un mensaje sin asunto"
 
-#: mail/mail-ops.c:898
+#: mail/mail-ops.c:906
 #, c-format
 msgid "Moving messages from \"%s\" into \"%s\""
 msgstr "Moviendo mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:900
+#: mail/mail-ops.c:908
 #, c-format
 msgid "Copying messages from \"%s\" into \"%s\""
 msgstr "Copiando mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:903
+#: mail/mail-ops.c:911
 #, c-format
 msgid "Move messages from \"%s\" into \"%s\""
 msgstr "Mover mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:905
+#: mail/mail-ops.c:913
 #, c-format
 msgid "Copy messages from \"%s\" into \"%s\""
 msgstr "Copiar mensajes de \"%s\" a \"%s\""
 
-#: mail/mail-ops.c:936
+#: mail/mail-ops.c:944
 msgid "Moving"
 msgstr "Moviendo"
 
-#: mail/mail-ops.c:939
+#: mail/mail-ops.c:947
 msgid "Copying"
 msgstr "Copiando"
 
-#: mail/mail-ops.c:959
+#: mail/mail-ops.c:967
 #, c-format
 msgid "%s message %d of %d (uid \"%s\")"
 msgstr "%s mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1034
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Escaneando carpetas en \"%s\""
 
-#: mail/mail-ops.c:1100 mail/subscribe-dialog.c:341
+#: mail/mail-ops.c:1108 mail/subscribe-dialog.c:348
 msgid "(No description)"
 msgstr "(Sin descripción)"
 
-#: mail/mail-ops.c:1165
+#: mail/mail-ops.c:1173
 msgid "Forwarded messages"
 msgstr "Mensaje reenviados"
 
-#: mail/mail-ops.c:1206 mail/mail-ops.c:1275
+#: mail/mail-ops.c:1214 mail/mail-ops.c:1283
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abriendo carpeta %s"
 
-#: mail/mail-ops.c:1337
+#: mail/mail-ops.c:1345
 msgid "Synchronising folder"
 msgstr "Sincronizando carpeta"
 
-#: mail/mail-ops.c:1387
+#: mail/mail-ops.c:1395
 msgid "Expunging folder"
 msgstr "Comprimiendo carpeta"
 
-#: mail/mail-ops.c:1435
+#: mail/mail-ops.c:1443
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recogiendo mensaje %s"
 
-#: mail/mail-ops.c:1498
+#: mail/mail-ops.c:1506
 msgid "Retrieving messages"
 msgstr "Recogiendo mensajes"
 
-#: mail/mail-ops.c:1508
+#: mail/mail-ops.c:1516
 #, c-format
 msgid "Retrieving message number %d of %d (uid \"%s\")"
 msgstr "Recogiendo mensaje número %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1656
+#: mail/mail-ops.c:1664
 #, c-format
 msgid "Loading %s Folder for %s"
 msgstr "Cargando carpeta %s para %s"
 
-#: mail/mail-ops.c:1658
+#: mail/mail-ops.c:1666
 #, c-format
 msgid "Load %s Folder for %s"
 msgstr "Cargar carpeta %s para %s"
 
-#: mail/mail-ops.c:1824
+#: mail/mail-ops.c:1832
 msgid "Saving messages"
 msgstr "Guardando mensajes"
 
-#: mail/mail-ops.c:1903
+#: mail/mail-ops.c:1911
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -5047,12 +5113,12 @@ msgstr ""
 "No pude crear el archivo de salida: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1916
+#: mail/mail-ops.c:1924
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 
-#: mail/mail-ops.c:1930
+#: mail/mail-ops.c:1938
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -5174,15 +5240,15 @@ msgstr "Nueva carpeta virtual"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:36
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:42
+#: mail/mail-view.c:138 po/tmp/evolution-mail.xml.h:41
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:41
+#: mail/mail-view.c:141 po/tmp/evolution-mail.xml.h:40
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
@@ -5190,7 +5256,7 @@ msgstr "Responder a todos los destinatarios de este mensaje"
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:36
+#: mail/mail-view.c:148 po/tmp/evolution-mail.xml.h:35
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
@@ -5198,57 +5264,85 @@ msgstr "Imprimir el mensaje seleccionado"
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-list.c:593
+#: mail/message-list.c:594
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:596
+#: mail/message-list.c:597
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:599
+#: mail/message-list.c:600
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:884
+#: mail/message-list.c:885
 #, c-format
 msgid "[ %s ]"
 msgstr "[ %s ]"
 
 #. well, we could scan more children, build up a (more accurate) list, but this should do ok
-#: mail/message-list.c:896 mail/message-list.c:912
+#: mail/message-list.c:897 mail/message-list.c:913
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:899 mail/message-list.c:915
+#: mail/message-list.c:900 mail/message-list.c:916
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: mail/message-list.c:968
+#: mail/message-list.c:969
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:975
+#: mail/message-list.c:976
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:984
+#: mail/message-list.c:985
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:996
+#: mail/message-list.c:997
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1004
+#: mail/message-list.c:1005
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1006
+#: mail/message-list.c:1007
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
+#: mail/message-list.c:1107
+msgid "Flagged"
+msgstr ""
+
+#: mail/message-list.c:1107
+msgid "Attachment"
+msgstr "Adjunto"
+
+#: mail/message-list.c:1108
+msgid "From"
+msgstr "De"
+
+#: mail/message-list.c:1108
+msgid "Date"
+msgstr "Fecha"
+
+#: mail/message-list.c:1108
+msgid "Received"
+msgstr "Recivido"
+
+#: mail/message-list.c:1109
+msgid "To"
+msgstr "A"
+
+#: mail/message-list.c:1109
+msgid "Size"
+msgstr "Tamaño"
+
 #: mail/openpgp-utils.c:76
 #, c-format
 msgid "Please enter your %s passphrase%s%s"
@@ -5283,36 +5377,44 @@ msgstr "No ha especificado destinatarios"
 msgid "Couldn't create temp file: %s"
 msgstr "No pude crear archivo temporal: %s"
 
-#: mail/subscribe-dialog.c:139
+#: mail/subscribe-dialog.c:63 shell/e-storage-set-view.c:44
+msgid "Folder"
+msgstr "Carpeta"
+
+#: mail/subscribe-dialog.c:64
+msgid "Store"
+msgstr "Almacenar"
+
+#: mail/subscribe-dialog.c:146
 msgid "Display folders starting with:"
 msgstr "Mostrar carpetas que comiencen por:"
 
-#: mail/subscribe-dialog.c:172
+#: mail/subscribe-dialog.c:179
 #, c-format
 msgid "Getting store for \"%s\""
 msgstr "Obteniendo sitio para \"%s\""
 
-#: mail/subscribe-dialog.c:175
+#: mail/subscribe-dialog.c:182
 #, c-format
 msgid "Get store for \"%s\""
 msgstr "Obtiene sitio para \"%s\""
 
-#: mail/subscribe-dialog.c:283
+#: mail/subscribe-dialog.c:290
 #, c-format
 msgid "Subscribing to folder \"%s\""
 msgstr "Suscribiendo a carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:287
+#: mail/subscribe-dialog.c:294
 #, c-format
 msgid "Unsubscribing from folder \"%s\""
 msgstr "Dessuscribiendo de carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:291
+#: mail/subscribe-dialog.c:298
 #, c-format
 msgid "Subscribe to folder \"%s\""
 msgstr "Suscribir a carpeta \"%s\""
 
-#: mail/subscribe-dialog.c:294
+#: mail/subscribe-dialog.c:301
 #, c-format
 msgid "Unsubscribe from folder \"%s\""
 msgstr "Dessuscribir de carpeta \"%s\""
@@ -5428,19 +5530,19 @@ msgstr "Nuevo..."
 msgid "(Untitled)"
 msgstr "(Sin título)"
 
-#: shell/e-shell-view-menu.c:111
+#: shell/e-shell-view-menu.c:114
 msgid "Bug buddy was not found in your $PATH."
 msgstr "No se ha encontrado a bug buddy en su $PATH."
 
-#: shell/e-shell-view-menu.c:117
+#: shell/e-shell-view-menu.c:120
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug buddy"
 
-#: shell/e-shell-view-menu.c:169
-msgid "Copyright 1999, 2000 Helix Code, Inc."
-msgstr "Copyright 1999, 2000 Helix Code, Inc."
+#: shell/e-shell-view-menu.c:172
+msgid "Copyright 1999, 2000, 2001 Ximian, Inc."
+msgstr "Copyright 1999, 2000, 2001 Ximian, Inc."
 
-#: shell/e-shell-view-menu.c:171
+#: shell/e-shell-view-menu.c:174
 msgid ""
 "Evolution is a suite of groupware applications\n"
 "for mail, calendaring, and contact management\n"
@@ -5450,7 +5552,7 @@ msgstr ""
 "groupware para manejar el correo, el calendario y la\n"
 "lista de contactos en el entorno del escritorio GNOME."
 
-#: shell/e-shell-view-menu.c:332
+#: shell/e-shell-view-menu.c:334
 msgid "Go to folder..."
 msgstr "Ir a la carpeta..."
 
@@ -5458,11 +5560,11 @@ msgstr "Ir a la carpeta..."
 msgid "(No folder displayed)"
 msgstr "(No hay carpetas mostrandose)"
 
-#: shell/e-shell-view.c:455
+#: shell/e-shell-view.c:468
 msgid "Folders"
 msgstr "Carpetas"
 
-#: shell/e-shell-view.c:1077
+#: shell/e-shell-view.c:1093
 #, c-format
 msgid "Evolution - %s"
 msgstr "Evolution - %s"
@@ -5472,7 +5574,7 @@ msgstr "Evolution - %s"
 msgid "Cannot set up local storage -- %s"
 msgstr "No puedo configurar una carpeta local -- %s"
 
-#: shell/e-shell.c:1208
+#: shell/e-shell.c:1212
 #, c-format
 msgid ""
 "Ooops!  The view for `%s' have died unexpectedly.  :-(\n"
@@ -5481,15 +5583,15 @@ msgstr ""
 "Ooops!  La vista `%s' ha cesado inesperadamente. :-(\n"
 "Esto probablemente significa que el componente %s se ha roto."
 
-#: shell/e-shortcuts-view.c:122
+#: shell/e-shortcuts-view.c:123
 msgid "Create new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:125
+#: shell/e-shortcuts-view.c:126
 msgid "Group name:"
 msgstr "Nombre del grupo:"
 
-#: shell/e-shortcuts-view.c:234
+#: shell/e-shortcuts-view.c:249
 #, c-format
 msgid ""
 "Do you really want to remove group\n"
@@ -5498,51 +5600,59 @@ msgstr ""
 "¿Realmente quiere quitar el grupo\n"
 "`%s' del menú de atajos?"
 
-#: shell/e-shortcuts-view.c:239
+#: shell/e-shortcuts-view.c:254
 msgid "Don't remove"
 msgstr "No quitar"
 
-#: shell/e-shortcuts-view.c:250
+#: shell/e-shortcuts-view.c:265
 msgid "_Small Icons"
 msgstr "Icono_s pequeños"
 
-#: shell/e-shortcuts-view.c:251
+#: shell/e-shortcuts-view.c:266
 msgid "Show the shortcuts as small icons"
 msgstr "Mostrar los atajos como iconos pequeños"
 
-#: shell/e-shortcuts-view.c:253
+#: shell/e-shortcuts-view.c:268
 msgid "_Large Icons"
 msgstr "Iconos _grandes"
 
-#: shell/e-shortcuts-view.c:254
+#: shell/e-shortcuts-view.c:269
 msgid "Show the shortcuts as large icons"
 msgstr "Mostrar los atajos como iconos grandes"
 
-#: shell/e-shortcuts-view.c:265
+#: shell/e-shortcuts-view.c:280
 msgid "_New Group..."
 msgstr "_Nuevo grupo..."
 
-#: shell/e-shortcuts-view.c:266
+#: shell/e-shortcuts-view.c:281
 msgid "Create a new shortcut group"
 msgstr "Crear un nuevo grupo de atajos"
 
-#: shell/e-shortcuts-view.c:268
+#: shell/e-shortcuts-view.c:283
 msgid "_Remove This Group..."
 msgstr "_Quitar este grupo..."
 
-#: shell/e-shortcuts-view.c:269
+#: shell/e-shortcuts-view.c:284
 msgid "Remove this shortcut group"
 msgstr "Quitar este grupo de atajos"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:289
+msgid "_Hide the Shortcut Bar"
+msgstr "_Ocultar la barra de atajos"
+
+#: shell/e-shortcuts-view.c:290
+msgid "Hide the shortcut bar"
+msgstr "Ocultar la barra de atajos"
+
+#: shell/e-shortcuts-view.c:374
 msgid "Activate"
 msgstr "Activar"
 
-#: shell/e-shortcuts-view.c:353
+#: shell/e-shortcuts-view.c:374
 msgid "Activate this shortcut"
 msgstr "Activar este atajo"
 
-#: shell/e-shortcuts-view.c:356
+#: shell/e-shortcuts-view.c:377
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Quitar este atajo de la lista de atajos"
 
@@ -5551,12 +5661,12 @@ msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
 #: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:49 po/tmp/evolution.xml.h:34
-#: shell/e-storage-set-view.c:235
+#: po/tmp/evolution-message-composer.xml.h:49 po/tmp/evolution.xml.h:36
+#: shell/e-storage-set-view.c:335
 msgid "_View"
 msgstr "_Ver"
 
-#: shell/e-storage-set-view.c:235
+#: shell/e-storage-set-view.c:335
 msgid "View the selected folder"
 msgstr "Ver la carpeta seleccionada"
 
@@ -5828,7 +5938,7 @@ msgstr "Hoy"
 msgid "Week"
 msgstr "Semana"
 
-#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:31
+#: po/tmp/evolution-calendar.xml.h:32 po/tmp/evolution.xml.h:33
 msgid "_New"
 msgstr "_Nuevo"
 
@@ -5902,7 +6012,7 @@ msgstr "Enviar un _mensaje al contacto..."
 #: po/tmp/evolution-contact-editor.xml.h:19
 #: po/tmp/evolution-event-editor.xml.h:110
 #: po/tmp/evolution-message-composer.xml.h:43
-#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
+#: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:26
 msgid "_File"
 msgstr "_Archivo"
 
@@ -6221,6 +6331,11 @@ msgstr "Remplazar"
 msgid "Replace a string"
 msgstr "Remplazar una cadena"
 
+#: po/tmp/evolution-event-editor.xml.h:88
+#: po/tmp/evolution-message-composer.xml.h:19
+msgid "Save"
+msgstr "Guardar"
+
 #: po/tmp/evolution-event-editor.xml.h:91
 msgid "Save the appointment and close the dialog box"
 msgstr "Guardar la cita y cerrar la ventana de diálogo"
@@ -6291,7 +6406,7 @@ msgstr "_Depurar"
 
 #: po/tmp/evolution-event-editor.xml.h:109
 #: po/tmp/evolution-message-composer.xml.h:42
-#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
+#: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:25
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -6304,7 +6419,7 @@ msgid "_Forms"
 msgstr "_Formularios"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:44 po/tmp/evolution.xml.h:29
 msgid "_Help"
 msgstr "_Ayuda"
 
@@ -6360,6 +6475,10 @@ msgstr "Escribir un nuevo mensaje"
 msgid "Copy message to a new folder"
 msgstr "Copiar mensaje a una nueva carpeta"
 
+#: po/tmp/evolution-mail.xml.h:10
+msgid "Create Rule"
+msgstr "Crear una regla"
+
 #: po/tmp/evolution-mail.xml.h:13 po/tmp/evolution-subscribe.xml.h:8
 msgid "F_older"
 msgstr "_Carpetas"
@@ -6380,8 +6499,12 @@ msgstr "Olvidar _contraseña"
 msgid "Get Mail"
 msgstr "Obtener"
 
+#: po/tmp/evolution-mail.xml.h:21
+msgid "Hide S_elected Messages"
+msgstr "Ocultar los mensajes _seleccionados"
+
 #: po/tmp/evolution-mail.xml.h:22
-msgid "Hide _Deleted messages"
+msgid "Hide _Deleted Messages"
 msgstr "Ocultar mensajes _borrados"
 
 #: po/tmp/evolution-mail.xml.h:23
@@ -6389,57 +6512,57 @@ msgid "Hide _Read messages"
 msgstr "Ocultar mensajes _leidos"
 
 #: po/tmp/evolution-mail.xml.h:24
-msgid "Hide _Selected messages"
-msgstr "Ocultar los mensajes _seleccionados"
-
-#: po/tmp/evolution-mail.xml.h:25
 msgid "Mail _Filters..."
 msgstr "_Filtros de correo..."
 
-#: po/tmp/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:25
 msgid "Manage Subscriptions..."
 msgstr "Administrar suscripciones..."
 
-#: po/tmp/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Mar_k As Read"
 msgstr "Mar_car como leído"
 
-#: po/tmp/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Mark As U_nread"
 msgstr "Marcar como _no leído"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Move"
 msgstr "Mover"
 
-#: po/tmp/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Move message to a new folder"
 msgstr "Mover mensaje a una nueva carpeta"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: po/tmp/evolution-mail.xml.h:33
+#: po/tmp/evolution-mail.xml.h:32
 msgid "Print Preview of message..."
 msgstr "Vista previa del mensaje..."
 
-#: po/tmp/evolution-mail.xml.h:34
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: po/tmp/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Print message..."
 msgstr "Imprimir mensaje..."
 
-#: po/tmp/evolution-mail.xml.h:39
+#: po/tmp/evolution-mail.xml.h:38
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:39
 msgid "Reply to _Sender"
 msgstr "Resp. _Remitente"
 
+#: po/tmp/evolution-mail.xml.h:42
+msgid "Source"
+msgstr "Fuente"
+
 #: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Seleccionar _todo"
@@ -6449,7 +6572,7 @@ msgid "Send queued mail and retrieve new mail"
 msgstr "Enviar el correo en la cola y obtener el nuevo"
 
 #: po/tmp/evolution-mail.xml.h:45
-msgid "Show _All messages"
+msgid "Show _All Messages"
 msgstr "Mostrar _todos los mensajes"
 
 #: po/tmp/evolution-mail.xml.h:46
@@ -6525,22 +6648,18 @@ msgid "_Save Message As..."
 msgstr "_Guardar mensaje como..."
 
 #: po/tmp/evolution-mail.xml.h:65
-msgid "_Source"
-msgstr "_Fuente"
-
-#: po/tmp/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Encadenados"
 
-#: po/tmp/evolution-mail.xml.h:67
+#: po/tmp/evolution-mail.xml.h:66
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: po/tmp/evolution-mail.xml.h:68
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_VFolder on Subject"
 msgstr "_VFolder según el asunto"
 
-#: po/tmp/evolution-mail.xml.h:69
+#: po/tmp/evolution-mail.xml.h:68
 msgid "_Virtual Folder Editor..."
 msgstr "Editor de carpetas _virtuales..."
 
@@ -6717,78 +6836,86 @@ msgid "Getting _Started"
 msgstr "Comenzando"
 
 #: po/tmp/evolution.xml.h:11
+msgid "Import an external file format"
+msgstr "Importar un formato de archivo externo"
+
+#: po/tmp/evolution.xml.h:12
 msgid "Show information about Evolution"
 msgstr "Mostrar información acerca de Evolution"
 
-#: po/tmp/evolution.xml.h:12
+#: po/tmp/evolution.xml.h:13
 msgid "Show the _Folder Bar"
 msgstr "Mostrar la barra de _carpetas"
 
-#: po/tmp/evolution.xml.h:13
+#: po/tmp/evolution.xml.h:14
 msgid "Show the _Shortcut Bar"
 msgstr "Mostrar la barra de _atajos"
 
-#: po/tmp/evolution.xml.h:14
+#: po/tmp/evolution.xml.h:15
 msgid "Submit _Bug Report"
 msgstr "Enviar reporte de _fallo"
 
-#: po/tmp/evolution.xml.h:15
+#: po/tmp/evolution.xml.h:16
 msgid "Submit bug report using Bug Buddy."
 msgstr "Enviar un reporte de fallo usando Bug Buddy."
 
-#: po/tmp/evolution.xml.h:16
+#: po/tmp/evolution.xml.h:17
 msgid "Toggle whether to show the folder bar"
 msgstr "Activar si se muestra la barra de carpetas"
 
-#: po/tmp/evolution.xml.h:17
+#: po/tmp/evolution.xml.h:18
 msgid "Toggle whether to show the shortcut bar"
 msgstr "Activar si se muestra la barra de atajos"
 
-#: po/tmp/evolution.xml.h:18
+#: po/tmp/evolution.xml.h:19
 msgid "Using the C_ontact Manager"
 msgstr "Usando el administrador de c_ontactos"
 
-#: po/tmp/evolution.xml.h:19
+#: po/tmp/evolution.xml.h:20
 msgid "Using the _Calendar"
 msgstr "Usando el _calendario"
 
-#: po/tmp/evolution.xml.h:20
+#: po/tmp/evolution.xml.h:21
 msgid "Using the _Mailer"
 msgstr "Usando el _correo"
 
-#: po/tmp/evolution.xml.h:21
+#: po/tmp/evolution.xml.h:22
 msgid "_About Evolution..."
 msgstr "_Acerca de Evolution..."
 
-#: po/tmp/evolution.xml.h:22
+#: po/tmp/evolution.xml.h:23
 msgid "_Appointment (FIXME)"
 msgstr "_Appointment (FIXME)"
 
-#: po/tmp/evolution.xml.h:23
+#: po/tmp/evolution.xml.h:24
 msgid "_Contact (FIXME)"
 msgstr "_Contact (FIXME)"
 
-#: po/tmp/evolution.xml.h:26
+#: po/tmp/evolution.xml.h:27
 msgid "_Folder"
 msgstr "_Carpeta"
 
-#: po/tmp/evolution.xml.h:27
+#: po/tmp/evolution.xml.h:28
 msgid "_Go to Folder..."
 msgstr "_Ir a la carpeta..."
 
-#: po/tmp/evolution.xml.h:29
+#: po/tmp/evolution.xml.h:30
+msgid "_Import file"
+msgstr "_Importar archivo"
+
+#: po/tmp/evolution.xml.h:31
 msgid "_Index"
 msgstr "_Indexar"
 
-#: po/tmp/evolution.xml.h:30
-msgid "_Mail message (FIXME)"
-msgstr "_Mail message (FIXME)"
-
 #: po/tmp/evolution.xml.h:32
+msgid "_Mail message"
+msgstr "_Enviar mensaje"
+
+#: po/tmp/evolution.xml.h:34
 msgid "_Settings"
 msgstr "_Configuración"
 
-#: po/tmp/evolution.xml.h:33
+#: po/tmp/evolution.xml.h:35
 msgid "_Task (FIXME)"
 msgstr "_Task (FIXME)"
 
@@ -6910,3 +7037,60 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
+
+#~ msgid "Server disconnected."
+#~ msgstr "Servidor desconectado."
+
+#~ msgid "Show all hidden"
+#~ msgstr "Mostrar todo lo oculto"
+
+#~ msgid "Hide selected"
+#~ msgstr "Ocultar la selección"
+
+#~ msgid "Hide read"
+#~ msgstr "Ocultar lo leído"
+
+#~ msgid "Hide deleted"
+#~ msgstr "Ocultar lo borrado"
+
+#~ msgid "Hide Subject"
+#~ msgstr "Ocultar el asunto"
+
+#~ msgid "Hide from Sender"
+#~ msgstr "Ocultar el remitente"
+
+#~ msgid "Hide Messages"
+#~ msgstr "Ocultar mensajes"
+
+#~ msgid "Hide Subject \"%s\""
+#~ msgstr "Ocultar asunto \"%s\""
+
+#~ msgid "Hide from Sender <%s>"
+#~ msgstr "Ocultar del remitente <%s>"
+
+#~ msgid "_Source"
+#~ msgstr "_Fuente"
+
+#~ msgid "(such as lack of disk space) may not be automatically\n"
+#~ msgstr "(como la falta de espacio en disco) puede que no sean recuperados\n"
+
+#~ msgid "recoverable.  Please use this feature with care."
+#~ msgstr "automaticamente.  Por favor use esta opción con cuidado."
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "You are now ready to send and receive email \n"
+#~ msgstr "Ahora esta listo para recivir y enviar mensajes de correo \n"
+
+#~ msgid "using Evolution. \n"
+#~ msgstr "usando Evolution. \n"
+
+#~ msgid "Click \"Finish\" to save your settings."
+#~ msgstr "Pulsa \"Fin\" para guardar la configuración."
+
+#~ msgid "Reply-to:"
+#~ msgstr "Responder a:"
+
+#~ msgid "Click \"Next\" to begin. "
+#~ msgstr "Pulse \"Siguiente\" para comenzar. "