Updated Spanish translation

svn path=/trunk/; revision=7071

2 files changed, 548 insertions, 583 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 87cda70385..9bba9f4d13 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-18  Héctor García Álvarez <hector@scouts-es.org>
+
+        * es.po: Updated Spanish translation.
+	
 2000-12-18  Christian Rose  <menthos@menthos.com>
 
 	* sv.po: Updated Swedish translation.
diff --git a/po/es.po b/po/es.po
index 4e752baa17..6290e331f5 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,10 +3,11 @@
 # Héctor García Álvarez <hector@scouts-es.org>, 2000.
 # Carlos Perelló Marín <carlos@hispalinux.es>, 2000.
 #
+#: camel/providers/smtp/camel-smtp-transport.c:287
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 0.7.0\n"
-"POT-Creation-Date: 2000-12-13 16:26-0600\n"
+"POT-Creation-Date: 2000-12-18 22:30+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"
@@ -490,7 +491,7 @@ msgid "_Add"
 msgstr "_Añadir"
 
 #: addressbook/contact-editor/e-contact-editor-strings.h:8
-#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:48
+#: po/tmp/evolution-event-editor.xml.h:108 po/tmp/evolution-mail.xml.h:53
 msgid "_Delete"
 msgstr "_Borrar"
 
@@ -979,7 +980,7 @@ msgstr "f"
 msgid "g"
 msgstr "g"
 
-#: calendar/cal-util/timeutil.c:100 po/tmp/alphabet.glade.h:14
+#: calendar/cal-util/timeutil.c:66 po/tmp/alphabet.glade.h:14
 msgid "h"
 msgstr "h"
 
@@ -1251,13 +1252,13 @@ msgid "label26"
 msgstr "label26"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:550
+#: calendar/cal-util/timeutil.c:64 calendar/gui/e-day-view.c:551
 #: calendar/gui/e-week-view.c:288 calendar/gui/print.c:605
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/cal-util/timeutil.c:98 calendar/gui/e-day-view.c:553
+#: calendar/cal-util/timeutil.c:64 calendar/gui/e-day-view.c:554
 #: calendar/gui/e-week-view.c:291 calendar/gui/print.c:604
 msgid "pm"
 msgstr "pm"
@@ -1347,7 +1348,7 @@ msgid "Save calendar"
 msgstr "Guardar calendario"
 
 #. strftime format of a weekday and a date.
-#: calendar/gui/calendar-model.c:282
+#: calendar/gui/calendar-model.c:283
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:467
 #: widgets/meeting-time-sel/e-meeting-time-sel.c:2498
 msgid "%a %m/%d/%Y"
@@ -1355,57 +1356,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:286 calendar/gui/calendar-model.c:736
+#: calendar/gui/calendar-model.c:287 calendar/gui/calendar-model.c:737
 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:290 calendar/gui/calendar-model.c:739
+#: calendar/gui/calendar-model.c:291 calendar/gui/calendar-model.c:740
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: calendar/gui/calendar-model.c:344 po/tmp/task-editor-dialog.glade.h:21
+#: calendar/gui/calendar-model.c:345 po/tmp/task-editor-dialog.glade.h:21
 msgid "Public"
 msgstr "Público"
 
-#: calendar/gui/calendar-model.c:347 po/tmp/task-editor-dialog.glade.h:20
+#: calendar/gui/calendar-model.c:348 po/tmp/task-editor-dialog.glade.h:20
 msgid "Private"
 msgstr "Privado"
 
-#: calendar/gui/calendar-model.c:350 po/tmp/task-editor-dialog.glade.h:11
+#: calendar/gui/calendar-model.c:351 po/tmp/task-editor-dialog.glade.h:11
 msgid "Confidential"
 msgstr "Confidencial"
 
-#: calendar/gui/calendar-model.c:353 calendar/gui/calendar-model.c:521
+#: calendar/gui/calendar-model.c:354 calendar/gui/calendar-model.c:522
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:442
 msgid "N"
 msgstr "N"
 
-#: calendar/gui/calendar-model.c:441
+#: calendar/gui/calendar-model.c:442
 msgid "S"
 msgstr "S"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:444
 msgid "E"
 msgstr "E"
 
-#: calendar/gui/calendar-model.c:443
+#: calendar/gui/calendar-model.c:444
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/calendar-model.c:515
+#: calendar/gui/calendar-model.c:516
 msgid "Transparent"
 msgstr "Transparente"
 
-#: calendar/gui/calendar-model.c:518
+#: calendar/gui/calendar-model.c:519
 msgid "Opaque"
 msgstr "Opaco"
 
-#: calendar/gui/calendar-model.c:744
+#: calendar/gui/calendar-model.c:745
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -1417,35 +1418,35 @@ msgstr ""
 "%s"
 
 #. strptime format for a date.
-#: calendar/gui/calendar-model.c:845 calendar/gui/calendar-model.c:893
+#: calendar/gui/calendar-model.c:846 calendar/gui/calendar-model.c:894
 #: widgets/meeting-time-sel/e-meeting-time-sel-item.c:471
-#: widgets/misc/e-dateedit.c:1274 widgets/misc/e-dateedit.c:1455
+#: widgets/misc/e-dateedit.c:1273 widgets/misc/e-dateedit.c:1454
 msgid "%m/%d/%Y"
 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:863
+#: calendar/gui/calendar-model.c:864
 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:866
+#: calendar/gui/calendar-model.c:867
 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:870
+#: calendar/gui/calendar-model.c:871
 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:873
+#: calendar/gui/calendar-model.c:874
 msgid "%H:%M%n"
 msgstr "%H:%M%n"
 
-#: calendar/gui/calendar-model.c:993
+#: calendar/gui/calendar-model.c:994
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -1455,11 +1456,11 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-#: calendar/gui/calendar-model.c:1033
+#: calendar/gui/calendar-model.c:1034
 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:1073
+#: calendar/gui/calendar-model.c:1074
 msgid "The priority must be between 1 and 9, inclusive"
 msgstr "La prioridad debe estar entre 1 y 9"
 
@@ -1739,6 +1740,28 @@ msgstr "minutos antes de que ocurra."
 msgid "seconds."
 msgstr "segundos."
 
+#: calendar/gui/dialogs/delete-comp.c:57
+msgid "appointment"
+msgstr "citas"
+
+#: calendar/gui/dialogs/delete-comp.c:61
+msgid "task"
+msgstr "tarea"
+
+#: calendar/gui/dialogs/delete-comp.c:65
+msgid "journal entry"
+msgstr "entrada del diario"
+
+#: calendar/gui/dialogs/delete-comp.c:74
+#, c-format
+msgid "Are you sure you want to delete the %s `%s'?"
+msgstr "Esta seguro que quiere borrar %s `%s'?"
+
+#: calendar/gui/dialogs/delete-comp.c:77
+#, c-format
+msgid "Are you sure you want to delete this %s?"
+msgstr "Esta seguro que quiere borrar %s?"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -1778,8 +1801,8 @@ msgstr "Baja"
 #. Note that we don't show this here, since by default a 'None' date
 #. is not permitted.
 #: po/tmp/task-editor-dialog.glade.h:17 shell/e-shell-view.c:1073
-#: widgets/misc/e-dateedit.c:422 widgets/misc/e-dateedit.c:1331
-#: widgets/misc/e-dateedit.c:1446
+#: widgets/misc/e-dateedit.c:421 widgets/misc/e-dateedit.c:1330
+#: widgets/misc/e-dateedit.c:1445
 msgid "None"
 msgstr "Ninguno"
 
@@ -1850,9 +1873,9 @@ msgstr "Tarea - %s"
 msgid "Journal entry - %s"
 msgstr "Entrada del diario - %s"
 
-#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3277
+#: calendar/gui/dialogs/task-editor.c:1275 calendar/gui/event-editor.c:3254
 msgid "Do you want to save changes?"
-msgstr ""
+msgstr "¿Desea guardar los cambios?"
 
 #: calendar/gui/e-calendar-table.c:336
 msgid "Open..."
@@ -1871,7 +1894,7 @@ msgid "Mark the task complete"
 msgstr "Marcar la tarea como completa"
 
 #: calendar/gui/e-calendar-table.c:342 filter/libfilter-i18n.h:7
-#: mail/folder-browser.c:479 mail/mail-view.c:165
+#: mail/folder-browser.c:608 mail/mail-view.c:165
 #: po/tmp/event-editor-dialog.glade.h:12 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 po/tmp/mail-config.glade.h:8
@@ -1889,50 +1912,50 @@ 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:1208
+#: calendar/gui/e-day-view-top-item.c:261 calendar/gui/e-day-view.c:1209
 #: 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:1222
+#: calendar/gui/e-day-view-top-item.c:265 calendar/gui/e-day-view.c:1223
 #: 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:1235
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1236
 #: calendar/gui/e-week-view-main-item.c:348
 msgid "%d %b"
 msgstr "%d de %b"
 
-#: calendar/gui/e-day-view.c:2941 calendar/gui/e-day-view.c:2948
-#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3165
-#: calendar/gui/e-week-view.c:3172 calendar/gui/e-week-view.c:3181
+#: calendar/gui/e-day-view.c:2944 calendar/gui/e-day-view.c:2951
+#: calendar/gui/e-day-view.c:2960 calendar/gui/e-week-view.c:3167
+#: calendar/gui/e-week-view.c:3174 calendar/gui/e-week-view.c:3183
 msgid "New appointment..."
 msgstr "Nueva cita..."
 
-#: calendar/gui/e-day-view.c:2945 calendar/gui/e-day-view.c:2952
-#: calendar/gui/e-week-view.c:3169 calendar/gui/e-week-view.c:3176
+#: calendar/gui/e-day-view.c:2948 calendar/gui/e-day-view.c:2955
+#: calendar/gui/e-week-view.c:3171 calendar/gui/e-week-view.c:3178
 msgid "Edit this appointment..."
 msgstr "Editar esta cita..."
 
-#: calendar/gui/e-day-view.c:2946 calendar/gui/e-week-view.c:3170
+#: calendar/gui/e-day-view.c:2949 calendar/gui/e-week-view.c:3172
 #: po/tmp/evolution-event-editor.xml.h:20
 msgid "Delete this appointment"
 msgstr "Borrar esta cita"
 
-#: calendar/gui/e-day-view.c:2953 calendar/gui/e-week-view.c:3177
+#: calendar/gui/e-day-view.c:2956 calendar/gui/e-week-view.c:3179
 msgid "Make this appointment movable"
 msgstr "Hacer esta cita movible"
 
-#: calendar/gui/e-day-view.c:2954 calendar/gui/e-week-view.c:3178
+#: calendar/gui/e-day-view.c:2957 calendar/gui/e-week-view.c:3180
 msgid "Delete this occurrence"
 msgstr "Borrar esta ocurrencia"
 
-#: calendar/gui/e-day-view.c:2955 calendar/gui/e-week-view.c:3179
+#: calendar/gui/e-day-view.c:2958 calendar/gui/e-week-view.c:3181
 msgid "Delete all occurrences"
 msgstr "Borrar todas las ocurrencias"
 
@@ -2111,8 +2134,7 @@ msgstr "Editar Cita"
 msgid "on"
 msgstr "en"
 
-#: calendar/gui/event-editor.c:432 calendar/gui/getdate.y:424
-#: filter/filter-datespec.c:65
+#: calendar/gui/event-editor.c:432 filter/filter-datespec.c:65
 msgid "day"
 msgstr "día"
 
@@ -2124,229 +2146,19 @@ msgstr "en el"
 msgid "th"
 msgstr "º"
 
-#: calendar/gui/event-editor.c:722
+#: calendar/gui/event-editor.c:720
 msgid "occurrences"
 msgstr "ocurrencias"
 
-#: calendar/gui/event-editor.c:839
+#: calendar/gui/event-editor.c:837
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Esta cita tiene recurrencias que no pueden ser editadas por Evolution."
 
-#: calendar/gui/event-editor.c:3079 calendar/gui/print.c:1085
+#: calendar/gui/event-editor.c:3077 calendar/gui/print.c:1085
 #: calendar/gui/print.c:1087 calendar/gui/print.c:1088
 msgid "%a %b %d %Y"
 msgstr "%a %b %d %Y"
 
-#: calendar/gui/getdate.y:391
-msgid "january"
-msgstr "enero"
-
-#: calendar/gui/getdate.y:392
-msgid "february"
-msgstr "febrero"
-
-#: calendar/gui/getdate.y:393
-msgid "march"
-msgstr "marzo"
-
-#: calendar/gui/getdate.y:394
-msgid "april"
-msgstr "abril"
-
-#: calendar/gui/getdate.y:395
-msgid "may"
-msgstr "mayo"
-
-#: calendar/gui/getdate.y:396
-msgid "june"
-msgstr "junio"
-
-#: calendar/gui/getdate.y:397
-msgid "july"
-msgstr "julio"
-
-#: calendar/gui/getdate.y:398
-msgid "august"
-msgstr "agosto"
-
-#: calendar/gui/getdate.y:399
-msgid "september"
-msgstr "septiembre"
-
-#: calendar/gui/getdate.y:400
-msgid "sept"
-msgstr "sept"
-
-#: calendar/gui/getdate.y:401
-msgid "october"
-msgstr "octubre"
-
-#: calendar/gui/getdate.y:402
-msgid "november"
-msgstr "noviembre"
-
-#: calendar/gui/getdate.y:403
-msgid "december"
-msgstr "diciembre"
-
-#: calendar/gui/getdate.y:404
-msgid "sunday"
-msgstr "domingo"
-
-#: calendar/gui/getdate.y:405
-msgid "monday"
-msgstr "lunes"
-
-#: calendar/gui/getdate.y:406
-msgid "tuesday"
-msgstr "martes"
-
-#: calendar/gui/getdate.y:407
-msgid "tues"
-msgstr "mar"
-
-#: calendar/gui/getdate.y:408
-msgid "wednesday"
-msgstr "miércoles"
-
-#: calendar/gui/getdate.y:409
-msgid "wednes"
-msgstr "Mier"
-
-#: calendar/gui/getdate.y:410
-msgid "thursday"
-msgstr "jueves"
-
-#: calendar/gui/getdate.y:411
-msgid "thur"
-msgstr "Jue"
-
-#: calendar/gui/getdate.y:412
-msgid "thurs"
-msgstr "Jue"
-
-#: calendar/gui/getdate.y:413
-msgid "friday"
-msgstr "viernes"
-
-#: calendar/gui/getdate.y:414
-msgid "saturday"
-msgstr "sábado"
-
-#: calendar/gui/getdate.y:420 filter/filter-datespec.c:62
-msgid "year"
-msgstr "año"
-
-#: calendar/gui/getdate.y:421 filter/filter-datespec.c:63
-msgid "month"
-msgstr "mes"
-
-#: calendar/gui/getdate.y:422
-msgid "fortnight"
-msgstr "quincena"
-
-#: calendar/gui/getdate.y:423 filter/filter-datespec.c:64
-msgid "week"
-msgstr "semana"
-
-#: calendar/gui/getdate.y:425 filter/filter-datespec.c:66
-msgid "hour"
-msgstr "hora"
-
-#: calendar/gui/getdate.y:426 filter/filter-datespec.c:67
-msgid "minute"
-msgstr "minuto"
-
-#: calendar/gui/getdate.y:427
-msgid "min"
-msgstr "min"
-
-#: calendar/gui/getdate.y:428 filter/filter-datespec.c:68
-msgid "second"
-msgstr "segundo"
-
-#: calendar/gui/getdate.y:429
-msgid "sec"
-msgstr "seg"
-
-#: calendar/gui/getdate.y:435
-msgid "tomorrow"
-msgstr "mañana"
-
-#: calendar/gui/getdate.y:436
-msgid "yesterday"
-msgstr "ayer"
-
-#: calendar/gui/getdate.y:437
-msgid "today"
-msgstr "hoy"
-
-#: calendar/gui/getdate.y:438 filter/filter-datespec.c:533
-#: filter/filter-datespec.c:693
-msgid "now"
-msgstr "ahora"
-
-#: calendar/gui/getdate.y:439
-msgid "last"
-msgstr "último"
-
-#: calendar/gui/getdate.y:440
-msgid "this"
-msgstr "este"
-
-#: calendar/gui/getdate.y:441
-msgid "next"
-msgstr "siguiente"
-
-#: calendar/gui/getdate.y:442
-msgid "first"
-msgstr "primero"
-
-#. { N_("second"),		tUNUMBER,	2 },
-#: calendar/gui/getdate.y:444
-msgid "third"
-msgstr "tercero"
-
-#: calendar/gui/getdate.y:445
-msgid "fourth"
-msgstr "cuarto"
-
-#: calendar/gui/getdate.y:446
-msgid "fifth"
-msgstr "quinto"
-
-#: calendar/gui/getdate.y:447
-msgid "sixth"
-msgstr "sexto"
-
-#: calendar/gui/getdate.y:448
-msgid "seventh"
-msgstr "séptimo"
-
-#: calendar/gui/getdate.y:449
-msgid "eighth"
-msgstr "octavo"
-
-#: calendar/gui/getdate.y:450
-msgid "ninth"
-msgstr "noveno"
-
-#: calendar/gui/getdate.y:451
-msgid "tenth"
-msgstr "décimo"
-
-#: calendar/gui/getdate.y:452
-msgid "eleventh"
-msgstr "undécimo"
-
-#: calendar/gui/getdate.y:453
-msgid "twelfth"
-msgstr "duodécimo"
-
-#: calendar/gui/getdate.y:454
-msgid "ago"
-msgstr "ago"
-
 #: calendar/gui/gnome-cal.c:718 calendar/gui/gnome-cal.c:1474
 #: calendar/gui/gnome-cal.c:1530
 msgid "Reminder of your appointment at "
@@ -2588,13 +2400,7 @@ msgstr "Imprimir calendario"
 msgid "Print Preview"
 msgstr "Vista previa"
 
-#. Translators: These are the first characters of each day of the
-#. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: calendar/gui/weekday-picker.c:351 widgets/misc/e-calendar-item.c:416
-msgid "MTWTFSS"
-msgstr "LMMJVSD"
-
-#: calendar/gui/weekday-picker.c:353 calendar/gui/weekday-picker.c:443
+#: calendar/gui/weekday-picker.c:311 calendar/gui/weekday-picker.c:406
 msgid "SMTWTFS"
 msgstr "DLMMJVS"
 
@@ -2695,6 +2501,7 @@ msgid "%s service for %s on %s"
 msgstr "%s servico para %s en %s"
 
 #: camel/camel-remote-store.c:227
+#: camel/providers/smtp/camel-smtp-transport.c:162
 #, c-format
 msgid "Could not connect to %s (port %d): %s"
 msgstr "No pude conectar con %s (puerto %d): %s"
@@ -3375,6 +3182,130 @@ msgstr "Envio de correo via el programa sendmail"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "Para enviar correo contectandose a un servidor de correo usando SMTP."
 
+#: camel/providers/smtp/camel-smtp-transport.c:187
+#, c-format
+msgid "Welcome response error: %s: possibly non-fatal"
+msgstr "Mensaje de bienvenida erroneo: %s: posiblemente no es fatal"
+
+#: camel/providers/smtp/camel-smtp-transport.c:281
+msgid "No authentication required"
+msgstr "No se requiere autentificación:"
+
+#: camel/providers/smtp/camel-smtp-transport.c:283
+msgid ""
+"This option will connect to the SMTP server without using any kind of "
+"authentication. This should be fine for connecting to most SMTP servers."
+msgstr ""
+"Esta opción es para conectar con servidores SMTP sin usar autentificación. "
+"Esto debería ser suficiente para la mayoría de los servidores SMTP."
+
+#: camel/providers/smtp/camel-smtp-transport.c:292
+#: camel/providers/smtp/camel-smtp-transport.c:297
+msgid "CRAM-MD5"
+msgstr "CRAM-MD5"
+
+#: camel/providers/smtp/camel-smtp-transport.c:294
+msgid ""
+"This option will connect to the SMTP server using CRAM-MD5 authentication."
+msgstr ""
+"Esta opción conectará con el servidor SMTP usando autentificación CRAM-MD5."
+
+#: camel/providers/smtp/camel-smtp-transport.c:332
+#, c-format
+msgid "SMTP server %s"
+msgstr "Servidor SMTP %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:334
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "Envio de correo SMTP via %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:359
+msgid "Cannot send message: sender address not defined."
+msgstr "No puedo enviar el mensaje: dirección del remitente no definida."
+
+#: camel/providers/smtp/camel-smtp-transport.c:366
+msgid "Cannot send message: sender address not valid."
+msgstr "No puedo enviar el mensaje: dirección del remitente no válida."
+
+#: camel/providers/smtp/camel-smtp-transport.c:380
+msgid "Cannot send message: no recipients defined."
+msgstr "No puedo enviar el mensaje: no hay destinatarios."
+
+#: camel/providers/smtp/camel-smtp-transport.c:474
+#, c-format
+msgid "HELO request timed out: %s: non-fatal"
+msgstr "Expiró el tiempo para HELO: %s: no es fatal"
+
+#: camel/providers/smtp/camel-smtp-transport.c:490
+#, c-format
+msgid "HELO response error: %s: non-fatal"
+msgstr "Respuesta de error al HELO: %s: no es fatal"
+
+#: camel/providers/smtp/camel-smtp-transport.c:529
+#, c-format
+msgid "MAIL FROM request timed out: %s: mail not sent"
+msgstr "Expiró el tiempo para MAIL FROM: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:545
+#, c-format
+msgid "MAIL FROM response error: %s: mail not sent"
+msgstr "Respuesta de error a MAIL FROM: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:570
+#, c-format
+msgid "RCPT TO request timed out: %s: mail not sent"
+msgstr "Expiró el tiempo para RCPT TO: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:586
+#, c-format
+msgid "RCPT TO response error: %s: mail not sent"
+msgstr "Respuesta de error a RCPT TO: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:617
+#, c-format
+msgid "DATA request timed out: %s: mail not sent"
+msgstr "Expiró el tiempo para DATA: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:633
+#, c-format
+msgid "DATA response error: %s: mail not sent"
+msgstr "Respuesta de error a DATA: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:648
+#: camel/providers/smtp/camel-smtp-transport.c:666
+#, c-format
+msgid "DATA send timed out: message termination: %s: mail not sent"
+msgstr ""
+"Expiró el tiempo para el envio de DATA: terminación del mensaje: %s: correo "
+"no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:682
+#, c-format
+msgid "DATA response error: message termination: %s: mail not sent"
+msgstr ""
+"Respuesta de error a DATA: terminación del mensaje: %s: correo no enviado"
+
+#: camel/providers/smtp/camel-smtp-transport.c:706
+#, c-format
+msgid "RSET request timed out: %s"
+msgstr "Expiró el tiempo para RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:722
+#, c-format
+msgid "RSET response error: %s"
+msgstr "Respuesta de error a RSET: %s"
+
+#: camel/providers/smtp/camel-smtp-transport.c:745
+#, c-format
+msgid "QUIT request timed out: %s: non-fatal"
+msgstr "Expiró el tiempo para QUIT: %s: no es fatal"
+
+#: camel/providers/smtp/camel-smtp-transport.c:761
+#, c-format
+msgid "QUIT response error: %s: non-fatal"
+msgstr "Respuesta de error a QUIT: %s: no es fatal"
+
 #: camel/providers/vee/camel-vee-provider.c:30
 msgid "Virtual folder email provider"
 msgstr "Proveedor de correo de la carpeta virtual"
@@ -3408,7 +3339,7 @@ msgid "%.1fG"
 msgstr "%.1fG"
 
 #. This is a filename. Translators take note.
-#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:144
+#: composer/e-msg-composer-attachment-bar.c:331 mail/mail-display.c:149
 msgid "attachment"
 msgstr "adjunto"
 
@@ -3450,8 +3381,8 @@ msgstr "Nombre del fichero:"
 msgid "MIME type:"
 msgstr "Tipo MIME:"
 
-#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:290
-#: mail/mail-format.c:621
+#: composer/e-msg-composer-hdrs.c:137 composer/e-msg-composer-hdrs.c:291
+#: mail/mail-format.c:626
 msgid "From:"
 msgstr "De:"
 
@@ -3459,31 +3390,31 @@ msgstr "De:"
 msgid "Click here for the address book"
 msgstr "Presione aquí para acceder a la agenda"
 
-#: composer/e-msg-composer-hdrs.c:291
+#: composer/e-msg-composer-hdrs.c:292
 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:295 mail/mail-format.c:625
+#: composer/e-msg-composer-hdrs.c:296 mail/mail-format.c:630
 msgid "To:"
 msgstr "A:"
 
-#: composer/e-msg-composer-hdrs.c:296
+#: composer/e-msg-composer-hdrs.c:297
 msgid "Enter the recipients of the message"
 msgstr "Escriba los destinatarios del mensaje"
 
-#: composer/e-msg-composer-hdrs.c:300 mail/mail-format.c:627
+#: composer/e-msg-composer-hdrs.c:301 mail/mail-format.c:632
 msgid "Cc:"
 msgstr "Cc:"
 
-#: composer/e-msg-composer-hdrs.c:301
+#: composer/e-msg-composer-hdrs.c:302
 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:306
+#: composer/e-msg-composer-hdrs.c:307
 msgid "Bcc:"
 msgstr "Bcc:"
 
-#: composer/e-msg-composer-hdrs.c:307
+#: composer/e-msg-composer-hdrs.c:308
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message."
@@ -3491,15 +3422,15 @@ 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:313 mail/mail-format.c:629
+#: composer/e-msg-composer-hdrs.c:314 mail/mail-format.c:634
 msgid "Subject:"
 msgstr "Asunto:"
 
-#: composer/e-msg-composer-hdrs.c:314
+#: composer/e-msg-composer-hdrs.c:315
 msgid "Enter the subject of the mail"
 msgstr "Escriba el asunto del mensaje"
 
-#: composer/e-msg-composer.c:429
+#: composer/e-msg-composer.c:430
 #, c-format
 msgid ""
 "Could not open signature file %s:\n"
@@ -3508,38 +3439,38 @@ msgstr ""
 "No pude abrir el archivo de firma %s:\n"
 "%s"
 
-#: composer/e-msg-composer.c:599
+#: composer/e-msg-composer.c:600
 msgid "Save as..."
 msgstr "Guardar como..."
 
-#: composer/e-msg-composer.c:610
+#: composer/e-msg-composer.c:611
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Error guardando el archivo: %s"
 
-#: composer/e-msg-composer.c:630
+#: composer/e-msg-composer.c:631
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Error cargando el archivo: %s"
 
-#: composer/e-msg-composer.c:652
+#: composer/e-msg-composer.c:653
 msgid "Saving changes to message..."
 msgstr "Guardando cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:654
+#: composer/e-msg-composer.c:655
 msgid "Save changes to message..."
 msgstr "Guardar cambios en el mensaje..."
 
-#: composer/e-msg-composer.c:695
+#: composer/e-msg-composer.c:696
 #, c-format
 msgid "Error saving composition to 'Drafts': %s"
 msgstr "Error guardando el mensaje en 'Drafts': %s"
 
-#: composer/e-msg-composer.c:739 shell/e-shell-view-menu.c:170
+#: composer/e-msg-composer.c:740 shell/e-shell-view-menu.c:170
 msgid "Evolution"
 msgstr "Evolution"
 
-#: composer/e-msg-composer.c:745
+#: composer/e-msg-composer.c:746
 msgid ""
 "This message has not been sent.\n"
 "\n"
@@ -3549,27 +3480,27 @@ msgstr ""
 "\n"
 "¿Quiere guardar los cambios?"
 
-#: composer/e-msg-composer.c:767
+#: composer/e-msg-composer.c:768
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:893
+#: composer/e-msg-composer.c:894
 msgid "That file does not exist."
 msgstr "Ese archivo no existe."
 
-#: composer/e-msg-composer.c:903
+#: composer/e-msg-composer.c:904
 msgid "That is not a regular file."
 msgstr "Ese no es un archivo normal."
 
-#: composer/e-msg-composer.c:913
+#: composer/e-msg-composer.c:914
 msgid "That file exists but is not readable."
 msgstr "Ese archivo no es legible."
 
-#: composer/e-msg-composer.c:923
+#: composer/e-msg-composer.c:924
 msgid "That file appeared accesible but open(2) failed."
 msgstr "Ese archivo parece accesible pero open(2) ha fallado."
 
-#: composer/e-msg-composer.c:945
+#: composer/e-msg-composer.c:946
 msgid ""
 "The file is very large (more than 100K).\n"
 "Are you sure you wish to insert it?"
@@ -3577,15 +3508,15 @@ msgstr ""
 "El archivo es muy largo (más de 100K).\n"
 "¿Esta seguro que quiere añadirlo?"
 
-#: composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:967
 msgid "An error occurred while reading the file."
 msgstr "Ha ocurrido un error mientras se leía el archivo."
 
-#: composer/e-msg-composer.c:1343
+#: composer/e-msg-composer.c:1346
 msgid "Compose a message"
 msgstr "Nuevo mensaje"
 
-#: composer/e-msg-composer.c:1420
+#: composer/e-msg-composer.c:1423
 msgid "Could not create composer window."
 msgstr "No pude crear una ventana para escribir el mensaje"
 
@@ -3598,14 +3529,26 @@ msgid "Sear_ch"
 msgstr "Bus_car"
 
 #: filter/filter-datespec.c:62
+msgid "year"
+msgstr "año"
+
+#: filter/filter-datespec.c:62
 msgid "years"
 msgstr "años"
 
 #: filter/filter-datespec.c:63
+msgid "month"
+msgstr "mes"
+
+#: filter/filter-datespec.c:63
 msgid "months"
 msgstr "meses"
 
 #: filter/filter-datespec.c:64
+msgid "week"
+msgstr "semana"
+
+#: filter/filter-datespec.c:64
 msgid "weeks"
 msgstr "semanas"
 
@@ -3614,14 +3557,26 @@ msgid "days"
 msgstr "días"
 
 #: filter/filter-datespec.c:66
+msgid "hour"
+msgstr "hora"
+
+#: filter/filter-datespec.c:66
 msgid "hours"
 msgstr "horas"
 
 #: filter/filter-datespec.c:67
+msgid "minute"
+msgstr "minuto"
+
+#: filter/filter-datespec.c:67
 msgid "minutes"
 msgstr "minutos"
 
 #: filter/filter-datespec.c:68
+msgid "second"
+msgstr "segundo"
+
+#: filter/filter-datespec.c:68
 msgid "seconds"
 msgstr "segundos"
 
@@ -3679,6 +3634,10 @@ msgstr "una fecha relativa al momento actual"
 msgid "Compare against"
 msgstr "Comparar con"
 
+#: filter/filter-datespec.c:533 filter/filter-datespec.c:693
+msgid "now"
+msgstr "ahora"
+
 #: filter/filter-datespec.c:690
 msgid "<click here to select a date>"
 msgstr "<piche aquí para añadir una fecha>"
@@ -3693,15 +3652,13 @@ msgid "Edit Filter Rule"
 msgstr "Editar regla de filtro"
 
 #: filter/filter-editor.c:433
-#, fuzzy
 msgid "incoming"
-msgstr "Entrando"
+msgstr "entrante"
 
 #. "demand",
 #: filter/filter-editor.c:435
-#, fuzzy
 msgid "outgoing"
-msgstr "Saliente"
+msgstr "saliente"
 
 #: filter/filter-editor.c:456 po/tmp/filter.glade.h:9
 msgid "Edit Filters"
@@ -3792,7 +3749,27 @@ msgstr "Añadir criterio"
 msgid "Remove criterion"
 msgstr "Quitar criterio"
 
-#: mail/folder-browser.c:465 po/tmp/filter.glade.h:8
+#: filter/filter-system-flag.c:63
+msgid "Replied to"
+msgstr "Respondido a"
+
+#: filter/filter-system-flag.c:64
+msgid "Deleted"
+msgstr "Borrado"
+
+#: filter/filter-system-flag.c:65
+msgid "Draft"
+msgstr ""
+
+#: filter/filter-system-flag.c:66
+msgid "Important"
+msgstr "Importante"
+
+#: filter/filter-system-flag.c:67
+msgid "Read"
+msgstr "Leído"
+
+#: mail/folder-browser.c:594 po/tmp/filter.glade.h:8
 #: po/tmp/mail-config.glade.h:9
 msgid "Edit"
 msgstr "Editar"
@@ -4015,7 +3992,7 @@ msgid "Cannot register storage with shell"
 msgstr "No puedo registrar un sistema de guardado con la shell"
 
 #: mail/folder-browser.c:140 po/tmp/evolution-event-editor.xml.h:88
-#: po/tmp/evolution-message-composer.xml.h:16
+#: po/tmp/evolution-message-composer.xml.h:19
 msgid "Save"
 msgstr "Guardar"
 
@@ -4039,101 +4016,140 @@ msgstr "El cuerpo no contiene"
 msgid "Subject does not contain"
 msgstr "El asunto no contiene"
 
-#: mail/folder-browser.c:453
+#: mail/folder-browser.c:566
 msgid "VFolder on Subject"
 msgstr "VFolder según el asunto"
 
-#: mail/folder-browser.c:454
+#: mail/folder-browser.c:567
 msgid "VFolder on Sender"
 msgstr "VFolder según el remitente"
 
-#: mail/folder-browser.c:455
+#: mail/folder-browser.c:568
 msgid "VFolder on Recipients"
 msgstr "VFolder según los destinatarios"
 
-#: mail/folder-browser.c:457
+#: mail/folder-browser.c:570
 msgid "Filter on Subject"
 msgstr "Filtrar según el asunto"
 
-#: mail/folder-browser.c:458
+#: mail/folder-browser.c:571
 msgid "Filter on Sender"
 msgstr "Filtrar según el remitente"
 
-#: mail/folder-browser.c:459
+#: mail/folder-browser.c:572
 msgid "Filter on Recipients"
 msgstr "Filtrar según los destinatarios"
 
-#: mail/folder-browser.c:460 mail/folder-browser.c:544
+#: mail/folder-browser.c:573 mail/folder-browser.c:690
 msgid "Filter on Mailing List"
 msgstr "Filtrar según la lista de correo"
 
-#: mail/folder-browser.c:464 po/tmp/evolution-message-composer.xml.h:14
+#: mail/folder-browser.c:578
+msgid "Show all hidden"
+msgstr "Mostrar todo lo oculto"
+
+#: mail/folder-browser.c:580
+msgid "Hide selected"
+msgstr "Ocultar la selección"
+
+#. could use another mask, but not enough api do to it
+#: mail/folder-browser.c:583
+msgid "Hide read"
+msgstr "Ocultar lo leído"
+
+#: mail/folder-browser.c:584
+msgid "Hide deleted"
+msgstr "Ocultar lo borrado"
+
+#: mail/folder-browser.c:586 mail/folder-browser.c:701
+msgid "Hide Subject"
+msgstr "Ocultar el asunto"
+
+#: mail/folder-browser.c:588 mail/folder-browser.c:707
+msgid "Hide from Sender"
+msgstr "Ocultar el remitente"
+
+#: mail/folder-browser.c:593 po/tmp/evolution-message-composer.xml.h:15
 msgid "Open"
 msgstr "Abrir"
 
-#: mail/folder-browser.c:466
+#: mail/folder-browser.c:595
 msgid "Save As..."
 msgstr "Guardar como..."
 
-#: mail/folder-browser.c:467 mail/mail-view.c:163
+#: mail/folder-browser.c:596 mail/mail-view.c:163
 #: po/tmp/evolution-addressbook.xml.h:13 po/tmp/evolution-calendar.xml.h:23
-#: po/tmp/evolution-mail.xml.h:28
+#: po/tmp/evolution-mail.xml.h:32
 msgid "Print"
 msgstr "Imprimir"
 
-#: mail/folder-browser.c:469
+#: mail/folder-browser.c:598
 msgid "Reply to Sender"
 msgstr "Resp. Remitente"
 
-#: mail/folder-browser.c:470 mail/mail-view.c:156
-#: po/tmp/evolution-mail.xml.h:34
+#: mail/folder-browser.c:599 mail/mail-view.c:156
+#: po/tmp/evolution-mail.xml.h:38
 msgid "Reply to All"
 msgstr "Re: Todos"
 
-#: mail/folder-browser.c:471 mail/mail-view.c:159
+#: mail/folder-browser.c:600 mail/mail-view.c:159
 #: po/tmp/evolution-mail.xml.h:17
 msgid "Forward"
 msgstr "Reenviar"
 
-#: mail/folder-browser.c:472 po/tmp/evolution-mail.xml.h:18
+#: mail/folder-browser.c:601 po/tmp/evolution-mail.xml.h:18
 msgid "Forward inline"
 msgstr "Reenviar dentro del mensaje"
 
-#: mail/folder-browser.c:474
+#: mail/folder-browser.c:603
 msgid "Mark as Read"
 msgstr "Marcar como leído"
 
-#: mail/folder-browser.c:475
+#: mail/folder-browser.c:604
 msgid "Mark as Unread"
 msgstr "Marcar como no leído"
 
-#: mail/folder-browser.c:477
+#: mail/folder-browser.c:606
 msgid "Move to Folder..."
 msgstr "Mover a la carpeta..."
 
-#: mail/folder-browser.c:478
+#: mail/folder-browser.c:607
 msgid "Copy to Folder..."
 msgstr "Copiar a la carpeta..."
 
-#: mail/folder-browser.c:480
+#: mail/folder-browser.c:609
 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:484
+#: mail/folder-browser.c:613
 msgid "Apply Filters"
 msgstr "Aplicar filtro"
 
-#: mail/folder-browser.c:486 po/tmp/evolution-mail.xml.h:10
+#: mail/folder-browser.c:615 po/tmp/evolution-mail.xml.h:10
 msgid "Create Rule From Message"
 msgstr "Crear una regla con el mensaje"
 
-#: mail/folder-browser.c:546
+#: mail/folder-browser.c:616 po/tmp/evolution-mail.xml.h:21
+msgid "Hide Messages"
+msgstr "Ocultar mensajes"
+
+#: mail/folder-browser.c:692
 #, c-format
 msgid "Filter on Mailing List (%s)"
 msgstr "Filtrar según la lista de correo (%s)"
 
+#: mail/folder-browser.c:698
+#, c-format
+msgid "Hide Subject \"%s\""
+msgstr "Ocultar asunto \"%s\""
+
+#: mail/folder-browser.c:704
+#, c-format
+msgid "Hide from Sender <%s>"
+msgstr "Ocultar del remitente <%s>"
+
 #: mail/mail-autofilter.c:71
 #, c-format
 msgid "Mail to %s"
@@ -4222,11 +4238,11 @@ msgstr ""
 "Solo puede editar mensajes guardados\n"
 "en la carpeta Drafts."
 
-#: mail/mail-callbacks.c:699 mail/mail-display.c:72
+#: mail/mail-callbacks.c:699 mail/mail-display.c:73
 msgid "Overwrite file?"
 msgstr "¿Sobreescribir archivo?"
 
-#: mail/mail-callbacks.c:703 mail/mail-display.c:76
+#: mail/mail-callbacks.c:703 mail/mail-display.c:77
 msgid ""
 "A file by that name already exists.\n"
 "Overwrite it?"
@@ -4477,24 +4493,32 @@ msgstr "Enviar el mensaje en formato HTML"
 msgid "Sources"
 msgstr "Fuentes"
 
-#: mail/mail-crypto.c:350 mail/mail-crypto.c:452 mail/mail-crypto.c:629
+#: mail/mail-crypto.c:353 mail/mail-crypto.c:458 mail/mail-crypto.c:635
+#: mail/mail-crypto.c:781
 msgid "Please enter your PGP/GPG passphrase."
 msgstr "Por favor introduzca su frase de paso PGP/GPG."
 
-#: mail/mail-crypto.c:354 mail/mail-crypto.c:456 mail/mail-crypto.c:634
+#: mail/mail-crypto.c:357 mail/mail-crypto.c:462 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:785
 msgid "No password provided."
 msgstr "No se dio contraseña"
 
-#: mail/mail-crypto.c:360 mail/mail-crypto.c:463 mail/mail-crypto.c:640
+#: mail/mail-crypto.c:363 mail/mail-crypto.c:469 mail/mail-crypto.c:646
+#: mail/mail-crypto.c:792 mail/mail-crypto.c:923
 #, c-format
 msgid "Couldn't create pipe to GPG/PGP: %s"
 msgstr "No pude comunicar con GPG/PGP: %s"
 
-#: mail/mail-crypto.c:625
+#: mail/mail-crypto.c:631 mail/mail-crypto.c:777 mail/mail-crypto.c:917
 msgid "No GPG/PGP program available."
 msgstr "No hay programas disponibles de GPG/PGP."
 
-#: mail/mail-display.c:90
+#: mail/mail-crypto.c:945
+#, c-format
+msgid "Couldn't create temp file: %s"
+msgstr "No pude crear archivo temporal: %s"
+
+#: mail/mail-display.c:92
 #, c-format
 msgid ""
 "Could not open file %s:\n"
@@ -4503,127 +4527,127 @@ msgstr ""
 "No pude abrir el archivo %s:\n"
 "%s"
 
-#: mail/mail-display.c:113
+#: mail/mail-display.c:125
 #, c-format
 msgid "Could not write data: %s"
 msgstr "No pude escribir datos: %s"
 
-#: mail/mail-display.c:218
+#: mail/mail-display.c:223
 msgid "Save Attachment"
 msgstr "Guardar adjunto"
 
-#: mail/mail-display.c:258
+#: mail/mail-display.c:263
 #, c-format
 msgid "Could not create temporary directory: %s"
 msgstr "No puedo crear el directorio temporal: %s"
 
-#: mail/mail-display.c:300
+#: mail/mail-display.c:305
 msgid "Save to Disk..."
 msgstr "Guardar en disco..."
 
-#: mail/mail-display.c:302
+#: mail/mail-display.c:307
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/mail-display.c:304
+#: mail/mail-display.c:309
 msgid "View Inline"
 msgstr "Ver incluido"
 
-#: mail/mail-display.c:328
+#: mail/mail-display.c:333
 msgid "External Viewer"
 msgstr "Visores externos"
 
-#: mail/mail-display.c:351
+#: mail/mail-display.c:356
 #, c-format
 msgid "View Inline (via %s)"
 msgstr "Ver incluido (vía %s)"
 
-#: mail/mail-display.c:355
+#: mail/mail-display.c:360
 msgid "Hide"
 msgstr "Ocultar"
 
-#: mail/mail-format.c:500
+#: mail/mail-format.c:505
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/mail-format.c:623
+#: mail/mail-format.c:628
 msgid "Reply-To:"
 msgstr "Responder a:"
 
-#: mail/mail-format.c:845
+#: mail/mail-format.c:851
 msgid "No GPG/PGP support available in this copy of Evolution."
 msgstr "Esta copia de Evolution no tiene soporte GPG/PGP."
 
-#: mail/mail-format.c:857
+#: mail/mail-format.c:863
 msgid "Encrypted message not displayed"
 msgstr "Mensaje encriptado no mostrado"
 
-#: mail/mail-format.c:863
+#: mail/mail-format.c:869
 msgid "Encrypted message"
 msgstr "Mensaje encriptado"
 
-#: mail/mail-format.c:864
+#: mail/mail-format.c:870
 msgid "Click icon to decrypt."
 msgstr "Pulse el icono para desencriptar."
 
-#: mail/mail-format.c:1470
+#: mail/mail-format.c:1442
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/mail-format.c:1482
+#: mail/mail-format.c:1454
 #, 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:1486
+#: mail/mail-format.c:1458
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/mail-format.c:1520
+#: mail/mail-format.c:1492
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo \"%s\")"
 
-#: mail/mail-format.c:1525
+#: mail/mail-format.c:1497
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/mail-format.c:1695
+#: mail/mail-format.c:1667
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "El %s, %s escribió:\n"
 
-#: mail/mail-local.c:202
+#: mail/mail-local.c:203
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "Cambiando la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:206
+#: mail/mail-local.c:207
 #, c-format
 msgid "Change folder \"%s\" to \"%s\" format"
 msgstr "Cambiar la carpeta \"%s\" al formato \"%s\""
 
-#: mail/mail-local.c:261
+#: mail/mail-local.c:262
 msgid "Closing current folder"
 msgstr "Cerrando carpeta actual"
 
-#: mail/mail-local.c:293
+#: mail/mail-local.c:294
 msgid "Renaming old folder and opening"
 msgstr "Renombrando carpeta antigua y abriendola"
 
-#: mail/mail-local.c:314
+#: mail/mail-local.c:315
 msgid "Creating new folder"
 msgstr "Creando una nueva carpeta"
 
-#: mail/mail-local.c:329
+#: mail/mail-local.c:330
 msgid "Copying messages"
 msgstr "Copiando mensajes"
 
-#: mail/mail-local.c:341
+#: mail/mail-local.c:342
 #, c-format
 msgid ""
 "Cannot save folder metainfo; you'll probably find you can't\n"
@@ -4632,7 +4656,7 @@ msgstr ""
 "No puedo guardar la metainformación de la carpeta: probablemente\n"
 "volver a abrir esta carpeta: %s"
 
-#: mail/mail-local.c:372
+#: mail/mail-local.c:373
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -4640,11 +4664,11 @@ msgstr ""
 "Si no puede volver a abrir este buzon, entonces\n"
 "puede que tenga que arreglarlo a mano."
 
-#: mail/mail-local.c:781
+#: mail/mail-local.c:782
 msgid "Registering local folder"
 msgstr "Registrando carpeta local"
 
-#: mail/mail-local.c:783
+#: mail/mail-local.c:784
 msgid "Register local folder"
 msgstr "Registrar carpeta local"
 
@@ -4819,9 +4843,8 @@ msgstr ""
 "No pude generar un mime del mensaje cuando generaba el mensaje a reenviar."
 
 #: mail/mail-ops.c:1665
-#, fuzzy
 msgid "Forwarded messages"
-msgstr "Mensaje reenviado:\n"
+msgstr "Mensaje reenviados"
 
 #: mail/mail-ops.c:1679
 msgid "Forwarded message:\n"
@@ -4909,22 +4932,22 @@ msgstr "Mostrando mensajes desde la carpeta \"%s\""
 msgid "View messages from \"%s\""
 msgstr "Mostrar mensajes desde \"%s\""
 
-#: mail/mail-ops.c:2339
+#: mail/mail-ops.c:2346
 #, c-format
 msgid "Retrieving message %d of %d (uid \"%s\")"
 msgstr "Recogiendo mensaje %d de %d (uid \"%s\") "
 
-#: mail/mail-ops.c:2428
+#: mail/mail-ops.c:2437
 #, c-format
 msgid "Saving messages from folder \"%s\""
 msgstr "Guardando mensajes de la carpeta \"%s\""
 
-#: mail/mail-ops.c:2431
+#: mail/mail-ops.c:2440
 #, c-format
 msgid "Save messages from folder \"%s\""
 msgstr "Guardando mensajes de la carpeta \"%s\""
 
-#: mail/mail-ops.c:2474
+#: mail/mail-ops.c:2483
 #, c-format
 msgid "Saving message %d of %d (uid \"%s\")"
 msgstr "Guardando mensaje %d de %d (uid \"%s\")"
@@ -4933,11 +4956,11 @@ msgstr "Guardando mensaje %d de %d (uid \"%s\")"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: mail/mail-summary.c:105 mail/mail-threads.c:728
+#: mail/mail-summary.c:105 mail/mail-threads.c:729
 msgid "Incomplete message written on pipe!"
 msgstr "¡Mesaje escrito incompleto en la tubería!"
 
-#: mail/mail-threads.c:301
+#: mail/mail-threads.c:302
 #, c-format
 msgid ""
 "Error while preparing to %s:\n"
@@ -4946,7 +4969,7 @@ msgstr ""
 "Error mientras me preparaba para %s:\n"
 "%s"
 
-#: mail/mail-threads.c:675
+#: mail/mail-threads.c:676
 #, c-format
 msgid ""
 "Error while `%s':\n"
@@ -4955,19 +4978,19 @@ msgstr ""
 "Error mientras `%s':\n"
 "%s"
 
-#: mail/mail-threads.c:732
+#: mail/mail-threads.c:733
 msgid "Error reading commands from dispatching thread."
 msgstr "Error leyendo comandos del hilo de reparto"
 
-#: mail/mail-threads.c:797
+#: mail/mail-threads.c:798
 msgid "Corrupted message from dispatching thread?"
 msgstr "¿Mensajes corrompidos en el hilo de reparto?"
 
-#: mail/mail-threads.c:916
+#: mail/mail-threads.c:917
 msgid "Could not create dialog box."
 msgstr "No pude crear la ventana de diálogo"
 
-#: mail/mail-threads.c:927
+#: mail/mail-threads.c:928
 msgid "User cancelled query."
 msgstr "El usuario cancelo la consulta."
 
@@ -4977,54 +5000,53 @@ msgid "Couldn't create temporary mbox `%s': %s"
 msgstr "No puedo crear el mbox temporal `%s': %s"
 
 #. Get all uids of source
-#: mail/mail-tools.c:239
+#: mail/mail-tools.c:240
 #, c-format
 msgid "Examining %s"
 msgstr "Examinado %s"
 
-#: mail/mail-tools.c:269
+#: mail/mail-tools.c:270
 #, c-format
 msgid ""
 "Could not read UID cache file \"%s\". You may receive duplicate messages."
 msgstr ""
 "No pude leer el UID del archivo \"%s\". Puede que reciva mensajes duplicados."
 
-#. Info
-#: mail/mail-tools.c:290
+#: mail/mail-tools.c:299
 #, c-format
 msgid "Retrieving message %d of %d"
 msgstr "Recogiendo mensaje %d de %d"
 
 #. Append it to dest
-#: mail/mail-tools.c:303
+#: mail/mail-tools.c:314
 #, c-format
 msgid "Writing message %d of %d"
 msgstr "Escribiendo mensaje %d de %d"
 
-#: mail/mail-tools.c:332
+#: mail/mail-tools.c:343
 #, c-format
 msgid "Saving changes to %s"
 msgstr "Guardando cambios en %s"
 
-#: mail/mail-tools.c:369
+#: mail/mail-tools.c:380
 #, c-format
 msgid "[%s] (forwarded message)"
 msgstr "[%s] (mensaje reenviado)"
 
-#: mail/mail-tools.c:379
+#: mail/mail-tools.c:390
 msgid "Fwd: (no subject)"
 msgstr "Fwd: (sin asunto)"
 
-#: mail/mail-tools.c:418
+#: mail/mail-tools.c:429
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Reenviado mensaje - %s"
 
-#: mail/mail-tools.c:420
+#: mail/mail-tools.c:431
 msgid "Forwarded message (no subject)"
 msgstr "Mensaje reenviado (sin asunto)"
 
-#: mail/mail-tools.c:523
+#: mail/mail-tools.c:534
 #, c-format
 msgid ""
 "Cannot open location `%s':\n"
@@ -5043,15 +5065,15 @@ msgstr "Nueva carpeta virtual"
 
 #. GNOMEUIINFO_ITEM_STOCK (N_("Save"), N_("Save this message"),
 #. save_msg, GNOME_STOCK_PIXMAP_SAVE),
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:33
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:37
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:38
+#: mail/mail-view.c:153 po/tmp/evolution-mail.xml.h:42
 msgid "Reply to the sender of this message"
 msgstr "Responder al remitente de este mensaje"
 
-#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:37
+#: mail/mail-view.c:156 po/tmp/evolution-mail.xml.h:41
 msgid "Reply to all recipients of this message"
 msgstr "Responder a todos los destinatarios de este mensaje"
 
@@ -5059,7 +5081,7 @@ msgstr "Responder a todos los destinatarios de este mensaje"
 msgid "Forward this message"
 msgstr "Reenviar este mensaje"
 
-#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:32
+#: mail/mail-view.c:163 po/tmp/evolution-mail.xml.h:36
 msgid "Print the selected message"
 msgstr "Imprimir el mensaje seleccionado"
 
@@ -5067,38 +5089,38 @@ msgstr "Imprimir el mensaje seleccionado"
 msgid "Delete this message"
 msgstr "Borrar este mensaje"
 
-#: mail/message-list.c:572
+#: mail/message-list.c:575
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:575
+#: mail/message-list.c:578
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:578
+#: mail/message-list.c:581
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:846
+#: mail/message-list.c:849
 #, 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:858 mail/message-list.c:873
+#: mail/message-list.c:861 mail/message-list.c:876
 #, c-format
 msgid "%s, et al."
 msgstr "%s, et al."
 
-#: mail/message-list.c:860 mail/message-list.c:875
+#: mail/message-list.c:863 mail/message-list.c:878
 msgid "<unknown>"
 msgstr "<desconocido>"
 
-#: mail/message-list.c:2068
+#: mail/message-list.c:2252
 msgid "Rebuilding message view"
 msgstr "Reconstruyendo la vista del mensaje"
 
-#: mail/message-list.c:2070
+#: mail/message-list.c:2254
 msgid "Rebuild message view"
 msgstr "Reconstruir la vista del mensaje"
 
@@ -5239,7 +5261,7 @@ msgstr ""
 "El tipo de carpeta seleccionada no es valido para\n"
 "la operación requerida."
 
-#: shell/e-shell-folder-selection-dialog.c:291
+#: shell/e-shell-folder-selection-dialog.c:297
 msgid "New..."
 msgstr "Nuevo..."
 
@@ -5374,7 +5396,7 @@ msgid "Error saving shortcuts."
 msgstr "Error guardando atajos."
 
 #: po/tmp/evolution-event-editor.xml.h:125
-#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:48 po/tmp/evolution.xml.h:34
 #: shell/e-storage-set-view.c:235
 msgid "_View"
 msgstr "_Ver"
@@ -5436,8 +5458,8 @@ msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
 "\n"
-"Over the last month and a half, our focus has been on making\n"
-"Evolution usable. Many of the Evolution developers are now using\n"
+"Over the time since the past release, our focus has been on making\n"
+"Evolution usable.  Many of the Evolution developers are now using\n"
 "Evolution to read their mail full time. You could too. (Just\n"
 "be sure to keep a backup.)\n"
 "\n"
@@ -5456,7 +5478,7 @@ msgstr ""
 "prueba\n"
 "de la suite de groupware Evolution.\n"
 "\n"
-"El último mes y medio, nuestro objetivo a sido hacer Evolution usable.\n"
+"Desde la última liberación, nuestro objetivo a sido hacer Evolution usable.\n"
 "Muchos de los desarrolladores de Evolution están ya usando Evolution\n"
 "para leer su correo de forma habitual. Usted tambien podria. (Asegurese\n"
 "de tener una copia de seguridad.)\n"
@@ -5651,7 +5673,7 @@ msgstr "Mostrar 1 semana"
 msgid "Show the working week"
 msgstr "Mostrar un semana laboral"
 
-#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:414
+#: po/tmp/evolution-calendar.xml.h:30 widgets/misc/e-dateedit.c:413
 msgid "Today"
 msgstr "Hoy"
 
@@ -5703,7 +5725,7 @@ msgstr "Imprimir..."
 
 #: po/tmp/evolution-contact-editor.xml.h:13
 #: po/tmp/evolution-event-editor.xml.h:89
-#: po/tmp/evolution-message-composer.xml.h:18
+#: po/tmp/evolution-message-composer.xml.h:21
 msgid "Save _As..."
 msgstr "Guardar _como..."
 
@@ -5732,7 +5754,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:38
+#: po/tmp/evolution-message-composer.xml.h:42
 #: po/tmp/evolution-subscribe.xml.h:16 po/tmp/evolution.xml.h:25
 msgid "_File"
 msgstr "_Archivo"
@@ -5743,7 +5765,7 @@ msgstr "Im_primir..."
 
 #: po/tmp/evolution-contact-editor.xml.h:21
 #: po/tmp/evolution-event-editor.xml.h:121
-#: po/tmp/evolution-message-composer.xml.h:42
+#: po/tmp/evolution-message-composer.xml.h:46
 msgid "_Save"
 msgstr "_Guardar"
 
@@ -5980,7 +6002,7 @@ msgid "FIXME: what goes here?"
 msgstr "FIXME: what goes here?"
 
 #: po/tmp/evolution-event-editor.xml.h:66
-#: po/tmp/evolution-message-composer.xml.h:10
+#: po/tmp/evolution-message-composer.xml.h:11
 msgid "F_ormat"
 msgstr "F_ormatear"
 
@@ -6057,7 +6079,7 @@ msgid "Save the appointment and close the dialog box"
 msgstr "Guardar la cita y cerrar la ventana de diálogo"
 
 #: po/tmp/evolution-event-editor.xml.h:92
-#: po/tmp/evolution-message-composer.xml.h:21
+#: po/tmp/evolution-message-composer.xml.h:24
 msgid "Save the current file"
 msgstr "Guardar archivo actual"
 
@@ -6102,12 +6124,12 @@ msgid "Undo the last action"
 msgstr "Deshacer la última acción"
 
 #: po/tmp/evolution-event-editor.xml.h:104
-#: po/tmp/evolution-message-composer.xml.h:34
+#: po/tmp/evolution-message-composer.xml.h:38
 msgid "_About..."
 msgstr "_Acerca de..."
 
 #: po/tmp/evolution-event-editor.xml.h:105
-#: po/tmp/evolution-message-composer.xml.h:35
+#: po/tmp/evolution-message-composer.xml.h:39
 msgid "_Close"
 msgstr "_Cerrar"
 
@@ -6116,12 +6138,12 @@ msgid "_Copy"
 msgstr "_Copiar"
 
 #: po/tmp/evolution-event-editor.xml.h:107
-#: po/tmp/evolution-message-composer.xml.h:36
+#: po/tmp/evolution-message-composer.xml.h:40
 msgid "_Debug"
 msgstr "_Depurar"
 
 #: po/tmp/evolution-event-editor.xml.h:109
-#: po/tmp/evolution-message-composer.xml.h:37
+#: po/tmp/evolution-message-composer.xml.h:41
 #: po/tmp/evolution-subscribe.xml.h:15 po/tmp/evolution.xml.h:24
 msgid "_Edit"
 msgstr "_Editar"
@@ -6135,7 +6157,7 @@ msgid "_Forms"
 msgstr "_Formularios"
 
 #: po/tmp/evolution-event-editor.xml.h:113
-#: po/tmp/evolution-message-composer.xml.h:39 po/tmp/evolution.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:43 po/tmp/evolution.xml.h:28
 msgid "_Help"
 msgstr "_Ayuda"
 
@@ -6211,154 +6233,169 @@ msgstr "Olvidar _contraseña"
 msgid "Get Mail"
 msgstr "Obtener"
 
-#: po/tmp/evolution-mail.xml.h:21
+#: po/tmp/evolution-mail.xml.h:22
+msgid "Hide _Deleted messages"
+msgstr "Ocultar mensajes _borrados"
+
+#: po/tmp/evolution-mail.xml.h:23
+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:22
+#: po/tmp/evolution-mail.xml.h:26
 msgid "Manage Subscriptions"
 msgstr "Administrar suscripciones"
 
-#: po/tmp/evolution-mail.xml.h:23
+#: po/tmp/evolution-mail.xml.h:27
 msgid "Mar_k As Read"
 msgstr "Mar_car como leído"
 
-#: po/tmp/evolution-mail.xml.h:24
+#: po/tmp/evolution-mail.xml.h:28
 msgid "Mark As U_nread"
 msgstr "Marcar como _no leído"
 
-#: po/tmp/evolution-mail.xml.h:25
+#: po/tmp/evolution-mail.xml.h:29
 msgid "Move"
 msgstr "Mover"
 
-#: po/tmp/evolution-mail.xml.h:26
+#: po/tmp/evolution-mail.xml.h:30
 msgid "Move message to a new folder"
 msgstr "Mover mensaje a una nueva carpeta"
 
-#: po/tmp/evolution-mail.xml.h:27
+#: po/tmp/evolution-mail.xml.h:31
 msgid "Previews the message to be printed"
 msgstr "Ver el mensaje que va a ser impreso"
 
-#: po/tmp/evolution-mail.xml.h:29
+#: po/tmp/evolution-mail.xml.h:33
 msgid "Print Preview of message..."
 msgstr "Vista previa del mensaje..."
 
-#: po/tmp/evolution-mail.xml.h:30
+#: po/tmp/evolution-mail.xml.h:34
 msgid "Print message to the printer"
 msgstr "Imprimir el mensaje en la impresora"
 
-#: po/tmp/evolution-mail.xml.h:31
+#: po/tmp/evolution-mail.xml.h:35
 msgid "Print message..."
 msgstr "Imprimir mensaje..."
 
-#: po/tmp/evolution-mail.xml.h:35
+#: po/tmp/evolution-mail.xml.h:39
 msgid "Reply to _All"
 msgstr "Re: _Todos"
 
-#: po/tmp/evolution-mail.xml.h:36
+#: po/tmp/evolution-mail.xml.h:40
 msgid "Reply to _Sender"
 msgstr "Resp. _Remitente"
 
-#: po/tmp/evolution-mail.xml.h:39 po/tmp/evolution-subscribe.xml.h:12
+#: po/tmp/evolution-mail.xml.h:43 po/tmp/evolution-subscribe.xml.h:12
 msgid "Select _All"
 msgstr "Seleccionar _todo"
 
-#: po/tmp/evolution-mail.xml.h:40
+#: po/tmp/evolution-mail.xml.h:44
 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:41
+#: po/tmp/evolution-mail.xml.h:45
+msgid "Show _All messages"
+msgstr "Mostrar _todos los mensajes"
+
+#: po/tmp/evolution-mail.xml.h:46
 msgid "Threaded Message list"
 msgstr "Lista de mensajes encadenados"
 
-#: po/tmp/evolution-mail.xml.h:42
+#: po/tmp/evolution-mail.xml.h:47
 msgid "VFolder on Se_nder"
 msgstr "VFolder según el _remitente"
 
-#: po/tmp/evolution-mail.xml.h:43
+#: po/tmp/evolution-mail.xml.h:48
 msgid "VFolder on _Recipients"
 msgstr "VFolder según los _destinatarios"
 
-#: po/tmp/evolution-mail.xml.h:44
+#: po/tmp/evolution-mail.xml.h:49
 msgid "View Raw Message Source"
 msgstr "Ver las fuentes del mensaje"
 
-#: po/tmp/evolution-mail.xml.h:45
+#: po/tmp/evolution-mail.xml.h:50
 msgid "_Apply Filters"
 msgstr "_Aplicar filtro"
 
-#: po/tmp/evolution-mail.xml.h:46
+#: po/tmp/evolution-mail.xml.h:51
 msgid "_Configure Folder"
 msgstr "_Configurar carpeta"
 
-#: po/tmp/evolution-mail.xml.h:47
+#: po/tmp/evolution-mail.xml.h:52
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: po/tmp/evolution-mail.xml.h:49
+#: po/tmp/evolution-mail.xml.h:54
 msgid "_Edit Message"
 msgstr "_Editar mensaje"
 
-#: po/tmp/evolution-mail.xml.h:50
+#: po/tmp/evolution-mail.xml.h:55
 msgid "_Expunge"
 msgstr "_Comprimir"
 
-#: po/tmp/evolution-mail.xml.h:51
+#: po/tmp/evolution-mail.xml.h:56
 msgid "_Filter on Subject"
 msgstr "_Filtrar según el asunto"
 
-#: po/tmp/evolution-mail.xml.h:52
+#: po/tmp/evolution-mail.xml.h:57
 msgid "_Forward"
 msgstr "_Reenviar"
 
-#: po/tmp/evolution-mail.xml.h:53 po/tmp/evolution-subscribe.xml.h:17
+#: po/tmp/evolution-mail.xml.h:58 po/tmp/evolution-subscribe.xml.h:17
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: po/tmp/evolution-mail.xml.h:54
+#: po/tmp/evolution-mail.xml.h:59
 msgid "_Mail Configuration"
 msgstr "Configuración del _correo"
 
-#: po/tmp/evolution-mail.xml.h:55
+#: po/tmp/evolution-mail.xml.h:60
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: po/tmp/evolution-mail.xml.h:56
+#: po/tmp/evolution-mail.xml.h:61
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta..."
 
-#: po/tmp/evolution-mail.xml.h:57
+#: po/tmp/evolution-mail.xml.h:62
 msgid "_Open in New Window"
 msgstr "_Abrir en una nueva ventana"
 
-#: po/tmp/evolution-mail.xml.h:58
+#: po/tmp/evolution-mail.xml.h:63
 msgid "_Print Message"
 msgstr "Im_primir mensaje"
 
-#: po/tmp/evolution-mail.xml.h:59
+#: po/tmp/evolution-mail.xml.h:64
 msgid "_Save Message As..."
 msgstr "_Guardar mensaje como..."
 
-#: po/tmp/evolution-mail.xml.h:60
+#: po/tmp/evolution-mail.xml.h:65
 msgid "_Source"
 msgstr "_Fuente"
 
-#: po/tmp/evolution-mail.xml.h:61
+#: po/tmp/evolution-mail.xml.h:66
 msgid "_Threaded"
 msgstr "_Encadenados"
 
-#: po/tmp/evolution-mail.xml.h:62
+#: po/tmp/evolution-mail.xml.h:67
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: po/tmp/evolution-mail.xml.h:63
+#: po/tmp/evolution-mail.xml.h:68
 msgid "_VFolder on Subject"
 msgstr "_VFolder según el asunto"
 
-#: po/tmp/evolution-mail.xml.h:64
-#, fuzzy
+#: po/tmp/evolution-mail.xml.h:69
 msgid "_Virtual Folder Editor"
-msgstr "Editor de carpeta _virtuales"
+msgstr "Editor de carpetas _virtuales"
 
 #.
 #. * Translatable strings file generated by extract-ui.
@@ -6372,90 +6409,110 @@ msgstr "Adjuntar"
 msgid "Close the current file"
 msgstr "Cerrar el archivo actual"
 
-#: po/tmp/evolution-message-composer.xml.h:11
+#: po/tmp/evolution-message-composer.xml.h:10
+msgid "Encrypt this message with PGP"
+msgstr "Encriptar este mensaje con PGP"
+
+#: po/tmp/evolution-message-composer.xml.h:12
 msgid "HTML"
 msgstr "HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:12
+#: po/tmp/evolution-message-composer.xml.h:13
 msgid "Insert a file as text into the message"
 msgstr "Insertar un archivo como textp en el mensaje"
 
-#: po/tmp/evolution-message-composer.xml.h:13
+#: po/tmp/evolution-message-composer.xml.h:14
 msgid "Insert text file..."
 msgstr "Insertar un archivo de texto..."
 
-#: po/tmp/evolution-message-composer.xml.h:15
+#: po/tmp/evolution-message-composer.xml.h:16
 msgid "Open a file"
 msgstr "Abrir un archivo"
 
 #: po/tmp/evolution-message-composer.xml.h:17
+msgid "PGP Encrypt"
+msgstr "Encriptar con PGP"
+
+#: po/tmp/evolution-message-composer.xml.h:18
+msgid "PGP Sign"
+msgstr "Firmar con PGP"
+
+#: po/tmp/evolution-message-composer.xml.h:20
 msgid "Save As"
 msgstr "Guardar como"
 
-#: po/tmp/evolution-message-composer.xml.h:19
+#: po/tmp/evolution-message-composer.xml.h:22
 msgid "Save in _folder... (FIXME)"
 msgstr "Save in _folder... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:20
+#: po/tmp/evolution-message-composer.xml.h:23
 msgid "Save in folder..."
 msgstr "Guardar en carpeta..."
 
-#: po/tmp/evolution-message-composer.xml.h:22
+#: po/tmp/evolution-message-composer.xml.h:25
 msgid "Save the current file with a different name"
 msgstr "Guardar el archivo actual con un nombre diferente"
 
-#: po/tmp/evolution-message-composer.xml.h:23
+#: po/tmp/evolution-message-composer.xml.h:26
 msgid "Save the message in a specified folder"
 msgstr "Guardara el mensaje a una carpeta específica"
 
-#: po/tmp/evolution-message-composer.xml.h:24
+#: po/tmp/evolution-message-composer.xml.h:27
 msgid "Send"
 msgstr "Enviar"
 
-#: po/tmp/evolution-message-composer.xml.h:25
+#: po/tmp/evolution-message-composer.xml.h:28
 msgid "Send _Later"
 msgstr "Enviar _mas tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:26
+#: po/tmp/evolution-message-composer.xml.h:29
 msgid "Send _later"
 msgstr "Enviar _mas tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:27
+#: po/tmp/evolution-message-composer.xml.h:30
 msgid "Send the mail in HTML format"
 msgstr "Enviar el mensaje en formato HTML"
 
-#: po/tmp/evolution-message-composer.xml.h:28
+#: po/tmp/evolution-message-composer.xml.h:31
 msgid "Send the message later"
 msgstr "Enviar el mensaje más tarde"
 
-#: po/tmp/evolution-message-composer.xml.h:29
+#: po/tmp/evolution-message-composer.xml.h:32
 msgid "Send the message now"
 msgstr "Enviar el mensaje ahora"
 
-#: po/tmp/evolution-message-composer.xml.h:30
+#: po/tmp/evolution-message-composer.xml.h:33
 msgid "Send this message now"
 msgstr "Enviar este mensaje ahora"
 
-#: po/tmp/evolution-message-composer.xml.h:31
+#: po/tmp/evolution-message-composer.xml.h:34
 msgid "Show / hide attachments"
 msgstr "Mostrar / ocultar adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:32
+#: po/tmp/evolution-message-composer.xml.h:35
 msgid "Show _attachments"
 msgstr "Mostar _adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:33
+#: po/tmp/evolution-message-composer.xml.h:36
 msgid "Show attachments"
 msgstr "Mostar adjuntos"
 
-#: po/tmp/evolution-message-composer.xml.h:40
+#: po/tmp/evolution-message-composer.xml.h:37
+msgid "Sign this message with your PGP key"
+msgstr "Firmar este mensaje con tu clave PGP"
+
+#: po/tmp/evolution-message-composer.xml.h:44
 msgid "_Insert text file... (FIXME)"
 msgstr "_Insert text file... (FIXME)"
 
-#: po/tmp/evolution-message-composer.xml.h:41
+#: po/tmp/evolution-message-composer.xml.h:45
 msgid "_Open..."
 msgstr "_Abrir..."
 
+#: po/tmp/evolution-message-composer.xml.h:47
+msgid "_Security"
+msgstr "_Seguridad"
+
 #.
 #. * Translatable strings file generated by extract-ui.
 #. * DO NOT compile this file as part of your application.
@@ -6667,6 +6724,12 @@ msgstr "Hora de _fin de la reunión:"
 msgid "All Attendees"
 msgstr "Todos los participantes"
 
+#. Translators: These are the first characters of each day of the
+#. week, 'M' for 'Monday', 'T' for Tuesday etc.
+#: widgets/misc/e-calendar-item.c:416
+msgid "MTWTFSS"
+msgstr "LMMJVSD"
+
 #. This is a strftime() format. %B = Month name, %Y = Year.
 #: widgets/misc/e-calendar-item.c:1040 widgets/misc/e-calendar-item.c:2671
 msgid "%B %Y"
@@ -6676,19 +6739,19 @@ msgstr "%B %Y"
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-dateedit.c:408
+#: widgets/misc/e-dateedit.c:407
 msgid "Now"
 msgstr "Ahora"
 
 #. This is a strftime() format. %H = hour (0-23), %M = minute.
-#: widgets/misc/e-dateedit.c:1249 widgets/misc/e-dateedit.c:1308
-#: widgets/misc/e-dateedit.c:1487
+#: widgets/misc/e-dateedit.c:1248 widgets/misc/e-dateedit.c:1307
+#: widgets/misc/e-dateedit.c:1486
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. This is a strftime() format. %I = hour (1-12), %M = minute, %p = am/pm string.
-#: widgets/misc/e-dateedit.c:1252 widgets/misc/e-dateedit.c:1311
-#: widgets/misc/e-dateedit.c:1490
+#: widgets/misc/e-dateedit.c:1251 widgets/misc/e-dateedit.c:1310
+#: widgets/misc/e-dateedit.c:1489
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
@@ -6696,105 +6759,3 @@ msgstr "%I:%M %p"
 #, c-format
 msgid "Group %i"
 msgstr "Grupo %i"
-
-#~ msgid "Could not create summary"
-#~ msgstr "No pude crear un resumen"
-
-#~ msgid "Cannot append message to mbox file: %s"
-#~ msgstr "No puedo añadir el mensaje al archivo mbox: %s"
-
-#~ msgid "Cannot get message: %s"
-#~ msgstr "No obtener el mensaje: %s"
-
-#~ msgid "UNIX mbox-format mail files"
-#~ msgstr "Archivos de correo en el formato mbox de UNIX"
-
-#~ msgid ""
-#~ "For reading mail delivered by the local system, and for storing mail on "
-#~ "local disk."
-#~ msgstr ""
-#~ "Para leer el correo entregado por el sistema local, y para guardar el correo "
-#~ "en el disco local."
-
-#~ msgid "Could not rename folder %s to %s: destination exists"
-#~ msgstr ""
-#~ "No pude cambiar el nombre de la carpeta %s a %s: ya existe el destino"
-
-#~ msgid "Mbox folders may not be nested."
-#~ msgstr "Las carpetas de tipo Mbox no pueden ser anidadas."
-
-#~ msgid "Could not open summary %s"
-#~ msgstr "No puedo abrir el resumen %s"
-
-#~ msgid "Summary mismatch, aborting sync"
-#~ msgstr "El resumen no concuerda, abortando sincronización"
-
-#~ msgid "Summary mismatch, X-Evolution header missing"
-#~ msgstr "El resumen no concuerda, falta la cabecera X-Evolution"
-
-#~ msgid "Cannot copy data to output file: %s"
-#~ msgstr "No puedo copiar datos al archivo de salida: %s"
-
-#~ msgid "Could not load or create summary"
-#~ msgstr "No pude cargar o crear el resumen"
-
-#~ msgid "Cannot append message to mh folder: %s"
-#~ msgstr "No pude añadir el mensaje a la carpeta mh: %s"
-
-#~ msgid "UNIX MH-format mail directories"
-#~ msgstr "Directorios de correo en el formato MH de UNIX"
-
-#~ msgid "Could not rename folder `%s': %s"
-#~ msgstr "No pude cambiarle el nombre a la carpeta `%s': %s"
-
-#~ msgid "Could not rename folder `%s': %s exists"
-#~ msgstr "No pude cambiarle el nombre a la carpeta `%s': %s existe"
-
-#~ msgid "MH folders may not be nested."
-#~ msgstr "Las carpetas tipo MH no pueden ser anidadas."
-
-#~ msgid "Local mail directory %s"
-#~ msgstr "Directorio de correo local %s"
-
-#~ msgid "Flagged"
-#~ msgstr "Marcado"
-
-#~ msgid "Read"
-#~ msgstr "Leer"
-
-#~ msgid "Replied to"
-#~ msgstr "Respondido a"
-
-#~ msgid "Cannot initialize Evolution's mail summary component."
-#~ msgstr "No puedo inicializar el componente de correo de Evolution."
-
-#~ msgid "Cannot initialize Evolution's mail storage hash."
-#~ msgstr ""
-#~ "No puedo inicializar el componente para guardar correo de Evolution."
-
-#~ msgid "Couldn't create pipe to %s: %s"
-#~ msgstr "No pude crear un conducto con %s: %s"
-
-#~ msgid "Could not execute %s: %s\n"
-#~ msgstr "No puedo ejecutar %s: %s\n"
-
-#~ msgid "Cannot fork %s: %s"
-#~ msgstr "No pude hacer un fork de %s: %s"
-
-#~ msgid "Bold"
-#~ msgstr "Negrita"
-
-#~ msgid "Sets something as bold"
-#~ msgstr "Poner algo en negrita"
-
-#~ msgid "Forward as Attachment"
-#~ msgstr "Reenviar como adjunto"
-
-#~ msgid "By filling in some information about your email\n"
-#~ msgstr "Rellenando algunos datos sobre su la configuración\n"
-
-#~ msgid "settings, you can start sending and receiving email\n"
-#~ msgstr "de su correo, podrá comenzar a enviar y recivir mensajes\n"
-
-#~ msgid "right away. Click Next to continue."
-#~ msgstr "inmediatamente. Pulse Siguiente para continuar."