Updated Spanish translation

author: Daniel Mustieles <daniel.mustieles@gmail.com> 2012-04-08 19:24:18 +0800
committer: Daniel Mustieles <daniel.mustieles@gmail.com> 2012-04-08 19:24:18 +0800
commit: badaccb764e06533511395e721d967b6f478e50f (patch)
tree: 5e3ba13e2bc9ed1644585c1df644206f145fb203 /po
parent: 08448ba671520359257818e46a0527f67f72d85e (diff)
download: gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar
gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.gz
gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.bz2
gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.lz
gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.xz
gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.zst
gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.zip
1 files changed, 1233 insertions, 1030 deletions
diff --git a/po/es.po b/po/es.po
index f9571c419e..4626f2f079 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,8 +18,8 @@ msgstr ""
 "Project-Id-Version: evolution.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-03-26 15:37+0000\n"
-"PO-Revision-Date: 2012-03-26 17:51+0200\n"
+"POT-Creation-Date: 2012-04-07 18:42+0000\n"
+"PO-Revision-Date: 2012-04-08 13:16+0200\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -323,9 +323,8 @@ msgstr "_Quiere recibir el correo como HTML"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:392
-#: ../addressbook/gui/widgets/eab-contact-display.c:647
-#: ../addressbook/gui/widgets/eab-contact-display.c:655
-#: ../addressbook/gui/widgets/eab-contact-display.c:1055
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:627
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:979
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 #: ../smime/lib/e-cert.c:811
 msgid "Email"
@@ -351,7 +350,6 @@ msgstr "_Página personal:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:718
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../plugins/itip-formatter/itip-view.c:1980
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -368,6 +366,7 @@ msgid "Home Page:"
 msgstr "Página personal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../plugins/itip-formatter/itip-view.c:1539
 msgid "Calendar:"
 msgstr "Calendario:"
 
@@ -442,7 +441,7 @@ msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:721
 #: ../calendar/gui/e-calendar-view.c:2131
 msgid "Anniversary"
 msgstr "Aniversario"
@@ -453,7 +452,7 @@ msgstr "Aniversario"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-display.c:728
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:720
 #: ../calendar/gui/e-calendar-view.c:2130 ../capplet/anjal-settings-main.c:83
 #: ../shell/main.c:135
 msgid "Birthday"
@@ -494,25 +493,25 @@ msgstr "_Dirección:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:196
-#: ../addressbook/gui/widgets/eab-contact-display.c:82
-#: ../addressbook/gui/widgets/eab-contact-display.c:1360
+#: ../addressbook/gui/widgets/eab-contact-display.c:366
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:72
 #: ../widgets/misc/e-contact-map.c:300
 msgid "Home"
 msgstr "Domicilio"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:195
-#: ../addressbook/gui/widgets/eab-contact-display.c:81
-#: ../addressbook/gui/widgets/eab-contact-display.c:708
-#: ../addressbook/gui/widgets/eab-contact-display.c:1357
+#: ../addressbook/gui/widgets/eab-contact-display.c:363
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:71
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
 #: ../widgets/misc/e-contact-map.c:308
 msgid "Work"
 msgstr "Trabajo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:197
-#: ../addressbook/gui/widgets/eab-contact-display.c:83
-#: ../addressbook/gui/widgets/eab-contact-display.c:421
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:73
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:402
 #: ../calendar/gui/e-cal-model.c:3471
 msgid "Other"
 msgstr "Otro"
@@ -526,42 +525,42 @@ msgid "Notes"
 msgstr "Notas"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-display.c:669
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:630
 msgid "AIM"
 msgstr "AIM"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-display.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:633
 msgid "Jabber"
 msgstr "Jabber"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-display.c:674
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:635
 msgid "Yahoo"
 msgstr "Yahoo"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-display.c:675
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:636
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-display.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:634
 msgid "MSN"
 msgstr "MSN"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:181
-#: ../addressbook/gui/widgets/eab-contact-display.c:671
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:632
 msgid "ICQ"
 msgstr "ICQ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:182
-#: ../addressbook/gui/widgets/eab-contact-display.c:670
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:631
 msgid "GroupWise"
 msgstr "GroupWise"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:183
-#: ../addressbook/gui/widgets/eab-contact-display.c:676
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:637
 msgid "Skype"
 msgstr "Skype"
 
@@ -830,71 +829,76 @@ msgstr "Cualquier campo contiene"
 msgid "evolution address book"
 msgstr "libreta de direcciones de Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:155
 msgid "Copy _Email Address"
 msgstr "Copiar dirección de _correo-e"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:193
-#: ../widgets/misc/e-web-view.c:432
+#: ../addressbook/gui/widgets/eab-contact-display.c:157
+#: ../widgets/misc/e-web-view.c:293 ../widgets/misc/e-web-view-gtkhtml.c:431
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar la dirección de correo-e al portapapeles"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:198
-#: ../widgets/misc/e-web-view.c:437
+#: ../addressbook/gui/widgets/eab-contact-display.c:162
+#: ../widgets/misc/e-web-view.c:298 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "_Send New Message To..."
 msgstr "_Enviar un correo nuevo a…"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:200
-#: ../widgets/misc/e-web-view.c:439
+#: ../addressbook/gui/widgets/eab-contact-display.c:164
+#: ../widgets/misc/e-web-view.c:300 ../widgets/misc/e-web-view-gtkhtml.c:438
 msgid "Send a mail message to this address"
 msgstr "Enviar un correo a esta dirección"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:301
+#: ../widgets/misc/e-web-view.c:1051 ../widgets/misc/e-web-view-gtkhtml.c:955
+#, c-format
+msgid "Click to mail %s"
+msgstr "Pulse para enviar correo a %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:170
 msgid "Open map"
 msgstr "Abrir mapa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:542
-#: ../addressbook/gui/widgets/eab-contact-display.c:570
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:565
 msgid "List Members:"
 msgstr "Listar miembros:"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:662
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:629
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Apodo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:694
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Empresa"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:695
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
 msgid "Department"
 msgstr "Departamento"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
 msgid "Profession"
 msgstr "Profesión"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:697
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
 msgid "Position"
 msgstr "Posición"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:698
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Jefe"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:699
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Secretario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Video Chat"
 msgstr "Charla por vídeo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:701
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 #: ../calendar/gui/dialogs/calendar-setup.c:469
 #: ../modules/calendar/e-cal-shell-view-actions.c:232
 #: ../modules/calendar/e-cal-shell-view-actions.c:261
@@ -905,41 +909,41 @@ msgstr "Charla por vídeo"
 msgid "Calendar"
 msgstr "Calendario"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:702
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 #: ../calendar/gui/dialogs/event-editor.c:127
 #: ../calendar/gui/dialogs/event-editor.c:354
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Disponibilidad"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:703
-#: ../addressbook/gui/widgets/eab-contact-display.c:725
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:704
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
 msgid "Fax"
 msgstr "Fax"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:705
-#: ../addressbook/gui/widgets/eab-contact-display.c:727
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:719
 msgid "Address"
 msgstr "Dirección"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:715
 msgid "Home Page"
 msgstr "Página personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:723
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
 msgid "Web Log"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:726
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:730
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:722
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Cónyuge"
@@ -948,7 +952,7 @@ msgstr "Cónyuge"
 #. Create the default Person calendar
 #. Create the default Person memo list
 #. Create the default Person task list
-#: ../addressbook/gui/widgets/eab-contact-display.c:732
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:732
 #: ../capplet/settings/mail-capplet-shell.c:385
 #: ../modules/addressbook/e-book-shell-backend.c:126
 #: ../modules/addressbook/e-book-shell-migrate.c:144
@@ -961,33 +965,27 @@ msgstr "Cónyuge"
 msgid "Personal"
 msgstr "Privado"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:753
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Nota"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1022
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:943
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:964
 msgid "Job Title"
 msgstr "Puesto"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1005
 msgid "Home page"
 msgstr "Página personal"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1015
 msgid "Blog"
 msgstr "Diario web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Pulse para enviar correo a %s"
-
 #: ../addressbook/gui/widgets/eab-gui-util.c:120
 msgid ""
 "This address book cannot be opened. This either means this book is not "
@@ -1564,12 +1562,12 @@ msgstr "No se pudo obtener la lista de libretas de direcciones: %s"
 
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:79
-#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:2330
-#: ../libemail-engine/mail-ops.c:640 ../mail/em-folder-tree.c:678
+#: ../calendar/gui/dialogs/memo-page.c:951 ../em-format/em-format.c:964
+#: ../libemail-engine/mail-ops.c:685 ../mail/em-folder-tree.c:678
 #: ../plugins/caldav/caldav-browse-server.c:221
 #: ../plugins/caldav/caldav-browse-server.c:1478 ../plugins/face/face.c:174
-#: ../plugins/itip-formatter/itip-formatter.c:1485
-#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../plugins/itip-formatter/itip-formatter.c:1503
+#: ../plugins/itip-formatter/itip-formatter.c:1896
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -1653,11 +1651,11 @@ msgstr "minutos"
 msgid "location of appointment"
 msgstr "lugar de la cita"
 
-#. Location
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/alarm-notify/alarm-queue.c:1758
 #: ../calendar/alarm-notify/alarm-queue.c:1768
-#: ../plugins/itip-formatter/itip-view.c:1051
+#: ../plugins/itip-formatter/itip-view.c:1163
+#: ../plugins/itip-formatter/itip-view.c:1263
 msgid "Location:"
 msgstr "Lugar:"
 
@@ -2184,6 +2182,15 @@ msgstr ""
 "problemas usando Evolution. Para los mejores resultados el servidor debería "
 "actualizarse a una versión soportada."
 
+#: ../calendar/calendar.error.xml.h:91
+#| msgid "Could not open destination"
+msgid "Could not perform this operation."
+msgstr "No se pudo realizar esta operación."
+
+#: ../calendar/calendar.error.xml.h:92 ../mail/mail.error.xml.h:175
+msgid "You must be working online to complete this operation."
+msgstr ""
+
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
 msgstr "Vista diaria"
@@ -2289,6 +2296,7 @@ msgstr "Categoría"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../mail/em-filter-i18n.h:5
+#: ../mail/em-format-html-print.c:83 ../mail/em-format-html-print.c:254
 msgid "Attachments"
 msgstr "Adjuntos"
 
@@ -2507,7 +2515,7 @@ msgstr "Colo_r:"
 #: ../modules/addressbook/addressbook-config.c:1114
 #: ../modules/addressbook/autocompletion-config.c:240
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../plugins/itip-formatter/itip-formatter.c:3240
+#: ../plugins/itip-formatter/itip-formatter.c:3403
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 #: ../smime/gui/smime-ui.ui.h:21
 msgid "General"
@@ -2641,17 +2649,19 @@ msgstr "¿Mantener el elemento original?"
 msgid "Close the current window"
 msgstr "Cerrar la ventana actual"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:137
+#: ../calendar/gui/dialogs/comp-editor.c:1132 ../mail/e-mail-browser.c:139
 #: ../shell/e-shell-window-actions.c:1467
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:459 ../widgets/misc/e-web-view.c:1306
+#: ../widgets/misc/e-web-view.c:320 ../widgets/misc/e-web-view.c:1384
+#: ../widgets/misc/e-web-view-gtkhtml.c:458
+#: ../widgets/misc/e-web-view-gtkhtml.c:1281
 msgid "Copy the selection"
 msgstr "Copiar la selección"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:144
+#: ../calendar/gui/dialogs/comp-editor.c:1139 ../mail/e-mail-browser.c:146
 #: ../shell/e-shell-window-actions.c:1474
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1300
+#: ../widgets/misc/e-web-view.c:1378 ../widgets/misc/e-web-view-gtkhtml.c:1275
 msgid "Cut the selection"
 msgstr "Cortar la selección"
 
@@ -2665,10 +2675,10 @@ msgstr "Eliminar la selección"
 msgid "View help"
 msgstr "Ver la ayuda"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:151
+#: ../calendar/gui/dialogs/comp-editor.c:1160 ../mail/e-mail-browser.c:153
 #: ../shell/e-shell-window-actions.c:1509
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1312
+#: ../widgets/misc/e-web-view.c:1390 ../widgets/misc/e-web-view-gtkhtml.c:1287
 msgid "Paste the clipboard"
 msgstr "Pega el contenido del porta papeles"
 
@@ -2676,7 +2686,7 @@ msgstr "Pega el contenido del porta papeles"
 msgid "Save current changes"
 msgstr "Guardar los cambios actuales"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:158
+#: ../calendar/gui/dialogs/comp-editor.c:1188 ../mail/e-mail-browser.c:160
 #: ../shell/e-shell-window-actions.c:1586
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
@@ -2688,14 +2698,14 @@ msgstr "_Clasificación"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1202
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:172
+#: ../mail/e-mail-browser.c:174
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../shell/e-shell-window-actions.c:1614
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:165
+#: ../calendar/gui/dialogs/comp-editor.c:1209 ../mail/e-mail-browser.c:167
 #: ../shell/e-shell-window-actions.c:1621
 #: ../widgets/misc/e-signature-editor.c:225
 msgid "_File"
@@ -2715,7 +2725,7 @@ msgstr "_Insertar"
 msgid "_Options"
 msgstr "_Opciones"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:179
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../mail/e-mail-browser.c:181
 #: ../shell/e-shell-window-actions.c:1663 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Ver"
@@ -2817,7 +2827,7 @@ msgstr ""
 "actualización por correo"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "adjunto"
 
@@ -3267,10 +3277,10 @@ msgstr "La nota no se puede editar completamente porque no es el organizador"
 msgid "Unable to open memos in '%s': %s"
 msgstr "No es posible abrir las notas en «%s»: %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1065
-#: ../em-format/em-format-quote.c:318 ../mail/em-format-html.c:2666
-#: ../mail/em-format-html.c:2731 ../mail/em-format-html.c:2755
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:72
+#: ../calendar/gui/dialogs/memo-page.c:1156 ../em-format/em-format.c:1227
+#: ../em-format/em-format-quote.c:154 ../mail/em-format-html.c:2304
+#: ../mail/em-format-html.c:2327 ../mail/message-list.etspec.h:9
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Para"
 
@@ -3579,7 +3589,7 @@ msgstr "Página web"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:19
 #: ../mail/message-list.c:1285 ../widgets/misc/e-send-options.ui.h:2
 msgid "High"
@@ -3587,7 +3597,7 @@ msgstr "Alta"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:328
+#: ../calendar/gui/e-cal-component-preview.c:318
 #: ../calendar/gui/e-cal-model.c:1623 ../calendar/gui/e-task-table.c:583
 #: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1284
 #: ../widgets/misc/e-send-options.ui.h:5
@@ -3596,7 +3606,7 @@ msgstr "Normal"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:330
+#: ../calendar/gui/e-cal-component-preview.c:320
 #: ../calendar/gui/e-task-table.c:584 ../calendar/gui/tasktypes.xml.h:21
 #: ../mail/message-list.c:1283 ../widgets/misc/e-send-options.ui.h:4
 msgid "Low"
@@ -3611,7 +3621,7 @@ msgstr "Sin definir"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:302
 #: ../calendar/gui/e-cal-model-tasks.c:490
 #: ../calendar/gui/e-cal-model-tasks.c:775 ../calendar/gui/e-task-table.c:230
 #: ../calendar/gui/e-task-table.c:245 ../calendar/gui/e-task-table.c:659
@@ -3621,7 +3631,7 @@ msgstr "Sin comenzar"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:301
+#: ../calendar/gui/e-cal-component-preview.c:292
 #: ../calendar/gui/e-cal-model-tasks.c:492
 #: ../calendar/gui/e-cal-model-tasks.c:777
 #: ../calendar/gui/e-cal-model-tasks.c:855 ../calendar/gui/e-task-table.c:232
@@ -3632,7 +3642,7 @@ msgstr "En proceso"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:304
+#: ../calendar/gui/e-cal-component-preview.c:295
 #: ../calendar/gui/e-cal-model-tasks.c:494
 #: ../calendar/gui/e-cal-model-tasks.c:779
 #: ../calendar/gui/e-meeting-store.c:214 ../calendar/gui/e-meeting-store.c:237
@@ -3645,13 +3655,11 @@ msgstr "Terminado"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../calendar/gui/e-cal-model-tasks.c:496
 #: ../calendar/gui/e-cal-model-tasks.c:781 ../calendar/gui/e-task-table.c:236
 #: ../calendar/gui/e-task-table.c:251 ../calendar/gui/e-task-table.c:662
-#: ../calendar/gui/print.c:3417 ../mail/em-sync-stream.c:152
-#: ../mail/em-sync-stream.c:180 ../mail/em-sync-stream.c:202
-#, c-format
+#: ../calendar/gui/print.c:3417
 msgid "Canceled"
 msgstr "Cancelado"
 
@@ -3852,7 +3860,7 @@ msgid "Gnome Calendar"
 msgstr "Calendario de GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:201
-#: ../modules/calendar/e-cal-shell-view-private.c:1050
+#: ../modules/calendar/e-cal-shell-view-private.c:1070
 msgid "%A %d %b %Y"
 msgstr "%A, %e de %b de %Y"
 
@@ -3865,16 +3873,16 @@ msgstr "%A, %e de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:204 ../calendar/gui/e-day-view.c:1850
 #: ../calendar/gui/e-day-view-top-item.c:837
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1054
+#: ../modules/calendar/e-cal-shell-view-private.c:1074
 msgid "%a %d %b"
 msgstr "%a, %e de %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:206
 #: ../calendar/gui/ea-gnome-calendar.c:211
 #: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../modules/calendar/e-cal-shell-view-private.c:1057
-#: ../modules/calendar/e-cal-shell-view-private.c:1063
-#: ../modules/calendar/e-cal-shell-view-private.c:1066
+#: ../modules/calendar/e-cal-shell-view-private.c:1077
+#: ../modules/calendar/e-cal-shell-view-private.c:1083
+#: ../modules/calendar/e-cal-shell-view-private.c:1086
 msgid "%a %d %b %Y"
 msgstr "%a, %e de %b de %Y"
 
@@ -3882,10 +3890,10 @@ msgstr "%a, %e de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:236
 #: ../calendar/gui/ea-gnome-calendar.c:242
 #: ../calendar/gui/ea-gnome-calendar.c:244
-#: ../modules/calendar/e-cal-shell-view-private.c:1083
-#: ../modules/calendar/e-cal-shell-view-private.c:1094
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
-#: ../modules/calendar/e-cal-shell-view-private.c:1104
+#: ../modules/calendar/e-cal-shell-view-private.c:1103
+#: ../modules/calendar/e-cal-shell-view-private.c:1114
+#: ../modules/calendar/e-cal-shell-view-private.c:1121
+#: ../modules/calendar/e-cal-shell-view-private.c:1124
 msgid "%d %b %Y"
 msgstr "%e de %B de %Y"
 
@@ -3897,7 +3905,7 @@ msgstr "%e de %B de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:234 ../calendar/gui/e-day-view.c:1866
 #: ../calendar/gui/e-day-view-top-item.c:841
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1090
+#: ../modules/calendar/e-cal-shell-view-private.c:1110
 msgid "%d %b"
 msgstr "%e de %b"
 
@@ -4003,42 +4011,46 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para una o más semanas"
 
-#: ../calendar/gui/e-cal-component-preview.c:201 ../filter/e-filter-rule.c:691
+#: ../calendar/gui/e-cal-component-preview.c:208 ../filter/e-filter-rule.c:691
 msgid "Untitled"
 msgstr "Sin título"
 
-#: ../calendar/gui/e-cal-component-preview.c:207
+#: ../calendar/gui/e-cal-component-preview.c:216
 msgid "Categories:"
 msgstr "Categorías:"
 
-#: ../calendar/gui/e-cal-component-preview.c:246
+#: ../calendar/gui/e-cal-component-preview.c:247
 msgid "Summary:"
 msgstr "Resumen:"
 
-#: ../calendar/gui/e-cal-component-preview.c:256
-#: ../calendar/gui/e-cal-component-preview.c:270
+#: ../calendar/gui/e-cal-component-preview.c:255
 msgid "Start Date:"
 msgstr "Fecha de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:266
+#| msgid "End Date"
+msgid "End Date:"
+msgstr "Fecha de finalización:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Fecha de vencimiento:"
 
-#. Status
-#: ../calendar/gui/e-cal-component-preview.c:297
-#: ../plugins/itip-formatter/itip-view.c:1082
+#: ../calendar/gui/e-cal-component-preview.c:288
+#: ../plugins/itip-formatter/itip-view.c:1166
+#: ../plugins/itip-formatter/itip-view.c:1272
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../calendar/gui/e-cal-component-preview.c:324
+#: ../calendar/gui/e-cal-component-preview.c:314
 msgid "Priority:"
 msgstr "Prioridad:"
 
-#: ../calendar/gui/e-cal-component-preview.c:349 ../mail/mail-config.ui.h:159
+#: ../calendar/gui/e-cal-component-preview.c:338 ../mail/mail-config.ui.h:159
 msgid "Description:"
 msgstr "Descripción:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "Página web:"
 
@@ -4166,8 +4178,8 @@ msgstr "Fecha de terminación"
 #: ../calendar/gui/e-meeting-store.c:242 ../calendar/gui/print.c:1162
 #: ../calendar/gui/print.c:1179 ../e-util/e-charset.c:52
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
-#: ../plugins/itip-formatter/itip-formatter.c:475
-#: ../plugins/itip-formatter/itip-formatter.c:2885
+#: ../plugins/itip-formatter/itip-formatter.c:474
+#: ../plugins/itip-formatter/itip-formatter.c:2949
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -4200,14 +4212,14 @@ msgstr "Abriendo %s"
 #: ../calendar/gui/e-cal-model.c:3466
 #: ../calendar/gui/e-meeting-list-view.c:218
 #: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
-#: ../plugins/itip-formatter/itip-formatter.c:2873
+#: ../plugins/itip-formatter/itip-formatter.c:2937
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-cal-model.c:3467
 #: ../calendar/gui/e-meeting-list-view.c:219
 #: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
-#: ../plugins/itip-formatter/itip-formatter.c:2879
+#: ../plugins/itip-formatter/itip-formatter.c:2943
 msgid "Declined"
 msgstr "Rehusado"
 
@@ -4215,13 +4227,14 @@ msgstr "Rehusado"
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
 #: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../plugins/itip-formatter/itip-view.c:1111
 msgid "Tentative"
 msgstr "Provisional"
 
 #: ../calendar/gui/e-cal-model.c:3469
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:212 ../calendar/gui/e-meeting-store.c:235
-#: ../plugins/itip-formatter/itip-formatter.c:2882
+#: ../plugins/itip-formatter/itip-formatter.c:2946
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -5002,7 +5015,7 @@ msgstr "Reuniones y citas"
 
 #: ../calendar/importers/icalendar-importer.c:437
 #: ../calendar/importers/icalendar-importer.c:870
-#: ../plugins/itip-formatter/itip-formatter.c:2499
+#: ../plugins/itip-formatter/itip-formatter.c:2559
 msgid "Opening calendar"
 msgstr "Apertura del calendario"
 
@@ -7259,7 +7272,7 @@ msgstr "Buscar y reemplazar texto"
 msgid "Save draft"
 msgstr "Guardar borrador"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:817
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7267,7 +7280,7 @@ msgstr ""
 "No es posible firmar el mensaje saliente: No hay establecido un certificado "
 "de firma para esta cuenta"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:826
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7276,17 +7289,17 @@ msgstr ""
 "No es posible cifrar el mensaje saliente: no hay establecido un certificado "
 "de cifrado para esta cuenta"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1613 ../composer/e-msg-composer.c:2000
 msgid "Compose Message"
 msgstr "Redactar un mensaje"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4181
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "El editor contiene un mensaje cuyo cuerpo no tiene texto, el cual no puede "
 "editarse."
 
-#: ../composer/e-msg-composer.c:4867
+#: ../composer/e-msg-composer.c:4885
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
@@ -7416,7 +7429,7 @@ msgstr "El error devuelto fue «{0}». Seguramente no se ha guardado el mensaje.
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Ocurrió un error al enviar. ¿Cómo quiere proceder?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:157
+#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:161
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "El error devuelto fue «{0}»."
 
@@ -9447,11 +9460,61 @@ msgstr ""
 "los elimina de los resultados de la búsqueda."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#, fuzzy
+#| msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"Indica si se deben mostrar las carpetas locales (En este equipo) en un árbol "
+"de carpetas"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#, fuzzy
+#| msgid ""
+#| "Possible values are: 'never' - to never close browser window, 'always' - "
+#| "to always close browser window or 'ask' - (or any other value) will ask "
+#| "user."
+msgid ""
+"Possible values are: 'never' - do not allow copy with drag &amp; drop of "
+"folders in folder tree, 'always' - allow copy with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana "
+"del examinador; «always» (siempre) para cerrar siempre la ventana del "
+"examinador o «ask» (preguntar) o cualquier otro valor, preguntarán al "
+"usuario."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#, fuzzy
+#| msgid "Whether to show local folders (On This Computer) in a folder tree"
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"Indica si se deben mostrar las carpetas locales (En este equipo) en un árbol "
+"de carpetas"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#, fuzzy
+#| msgid ""
+#| "Possible values are: 'never' - to never close browser window, 'always' - "
+#| "to always close browser window or 'ask' - (or any other value) will ask "
+#| "user."
+msgid ""
+"Possible values are: 'never' - do not allow move with drag &amp; drop of "
+"folders in folder tree, 'always' - allow move with drag &amp; drop of "
+"folders in folder tree without asking, or 'ask' - (or any other value) will "
+"ask user."
+msgstr ""
+"Los valores posibles son: «never» (nunca) para no cerrar nunca la ventana "
+"del examinador; «always» (siempre) para cerrar siempre la ventana del "
+"examinador o «ask» (preguntar) o cualquier otro valor, preguntarán al "
+"usuario."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 #: ../mail/evolution-mail.schemas.in.h:165
 msgid "Prompt when replying privately to list messages"
 msgstr "Preguntar al responder de forma privada a correos de una lista"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 #: ../mail/evolution-mail.schemas.in.h:166
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -9461,12 +9524,12 @@ msgstr ""
 "que está enviando una respuesta privada a un correo que llegó a través de "
 "una lista de correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 #: ../mail/evolution-mail.schemas.in.h:167
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Preguntar cuando la lista de correo secuestre las respuestas privadas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 #: ../mail/evolution-mail.schemas.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
@@ -9478,12 +9541,12 @@ msgstr ""
 "una lista de correo, pero la lista establece una cabecera «Responder a:» que "
 "redirecciona su respuesta de nuevo a la lista."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 #: ../mail/evolution-mail.schemas.in.h:169
 msgid "Prompt when replying to many recipients"
 msgstr "Preguntar al responder a muchos desinatarios"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 #: ../mail/evolution-mail.schemas.in.h:170
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
@@ -9492,7 +9555,7 @@ msgstr ""
 "Desactiva o activa los mensajes repetitivos para avisarle de que está "
 "enviando una respuesta a mucha gente."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 #: ../mail/evolution-mail.schemas.in.h:171
 msgid ""
 "Asks whether to close the message window when the user forwards or replies "
@@ -9501,7 +9564,7 @@ msgstr ""
 "Preguntar si cerrar la ventana del mensaje cuando el usuario reenvía o "
 "responde al mensaje mostrado en la ventana"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "Possible values are: 'never' - to never close browser window, 'always' - to "
 "always close browser window or 'ask' - (or any other value) will ask user."
@@ -9511,32 +9574,32 @@ msgstr ""
 "examinador o «ask» (preguntar) o cualquier otro valor, preguntarán al "
 "usuario."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 #: ../mail/evolution-mail.schemas.in.h:175
 msgid "Empty Trash folders on exit"
 msgstr "Vaciar papeleras al salir"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 #: ../mail/evolution-mail.schemas.in.h:176
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Vaciar todas las papeleras al salir de Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 #: ../mail/evolution-mail.schemas.in.h:177
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Días mínimos entre el vaciado de la papelera a la salida"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 #: ../mail/evolution-mail.schemas.in.h:178
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado de la papelera a la salida, en días."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 #: ../mail/evolution-mail.schemas.in.h:179
 msgid "Last time Empty Trash was run"
 msgstr "Última vez que se vació la papelera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 #: ../mail/evolution-mail.schemas.in.h:180
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
@@ -9544,20 +9607,20 @@ msgstr ""
 "La última vez que se vació la papelera, en días desde el 1 de enero de 1970 "
 "(época)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 #: ../mail/evolution-mail.schemas.in.h:181
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:125
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Tiempo en segundos que deberá mostrarse el error en la barra de estado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 #: ../mail/evolution-mail.schemas.in.h:182
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:126
 msgid "Level beyond which the message should be logged."
 msgstr "Nivel más allá del cuál el mensaje se debe registrar."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 #: ../mail/evolution-mail.schemas.in.h:183
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
@@ -9566,12 +9629,12 @@ msgstr ""
 "Esto puede tener tres valores posibles. «0» para errores. «1» para avisos. "
 "«2» para mensajes de depuración."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 #: ../mail/evolution-mail.schemas.in.h:184
 msgid "Show original \"Date\" header value."
 msgstr "Mostrar el valor original de la cabecera «Fecha»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 #: ../mail/evolution-mail.schemas.in.h:185
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
@@ -9583,12 +9646,12 @@ msgstr ""
 "cabecera «Fecha» en el formato preferido por el usuario para la fecha y hora "
 "locales."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 #: ../mail/evolution-mail.schemas.in.h:186
 msgid "List of Labels and their associated colors"
 msgstr "Lista de etiquetas y sus colores asociados"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 #: ../mail/evolution-mail.schemas.in.h:187
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
@@ -9598,42 +9661,42 @@ msgstr ""
 "lista contiene cadenas con el nombre:color donde color usa la codificación "
 "hex HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 #: ../mail/evolution-mail.schemas.in.h:188
 msgid "Check incoming mail being junk"
 msgstr "Comprobar si el correo entrante es SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 #: ../mail/evolution-mail.schemas.in.h:189
 msgid "Run junk test on incoming mail."
 msgstr "Ejecutar la prueba de SPAM en el correo entrante."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 #: ../mail/evolution-mail.schemas.in.h:190
 msgid "Empty Junk folders on exit"
 msgstr "Vaciar las carpetas SPAM al salir"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 #: ../mail/evolution-mail.schemas.in.h:191
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Vaciar todas las carpetas SPAM al salir de Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 #: ../mail/evolution-mail.schemas.in.h:192
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Días mínimos entre el vaciado del SPAM a la salida"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 #: ../mail/evolution-mail.schemas.in.h:193
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Tiempo mínimo entre el vaciado del SPAM a la salida, en días."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 #: ../mail/evolution-mail.schemas.in.h:194
 msgid "Last time Empty Junk was run"
 msgstr "Última vez que se vació el SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 #: ../mail/evolution-mail.schemas.in.h:195
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
@@ -9641,12 +9704,12 @@ msgstr ""
 "La última vez que se vació el SPAM, en días desde el 1 de enero de 1970 "
 "(época)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 #: ../mail/evolution-mail.schemas.in.h:196
 msgid "The default plugin for Junk hook"
 msgstr "El complemento predeterminado para SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 #: ../mail/evolution-mail.schemas.in.h:197
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
@@ -9657,14 +9720,14 @@ msgstr ""
 "varios complementos activados. Si el complemento predeterminado listado está "
 "desactivado, entonces no usará los otros complementos disponibles."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 #: ../mail/evolution-mail.schemas.in.h:198
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Determina si se debe buscar la dirección del remitente en la libreta de "
 "direcciones"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 #: ../mail/evolution-mail.schemas.in.h:199
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
@@ -9677,7 +9740,7 @@ msgstr ""
 "libretas marcadas para autocompletado. Puede ser lento si se han marcado "
 "para autocompletado libretas de direcciones remotas (como LDAP)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 #: ../mail/evolution-mail.schemas.in.h:200
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
@@ -9686,7 +9749,7 @@ msgstr ""
 "Determina si se deben buscar direcciones para filtrar SPAM sólo en la "
 "libreta de direcciones local"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 #: ../mail/evolution-mail.schemas.in.h:201
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
@@ -9698,13 +9761,13 @@ msgstr ""
 "local para excluir de los filtros de correo basura el correo enviado por "
 "contactos conocidos."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 #: ../mail/evolution-mail.schemas.in.h:202
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Determina si se deben usar cabeceras personalizadas para comprobar si es SPAM"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 #: ../mail/evolution-mail.schemas.in.h:203
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
@@ -9715,12 +9778,12 @@ msgstr ""
 "SPAM. Si esta opción está activada y las cabeceras se mencionan, se mejorará "
 "la velocidad de comprobado de correo basura."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 #: ../mail/evolution-mail.schemas.in.h:204
 msgid "Custom headers to use while checking for junk."
 msgstr "Cabeceras personalizadas que usar al comprobar si es SPAM."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 #: ../mail/evolution-mail.schemas.in.h:205
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
@@ -9729,35 +9792,35 @@ msgstr ""
 "Cabeceras personalizadas que usar para comprobar si es SPAM. La lista de "
 "elementos son cadenas con el formato \"headername=valor\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 #: ../mail/evolution-mail.schemas.in.h:206
 msgid "UID string of the default account."
 msgstr "Cadena UID para la cuenta predeterminada."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 #: ../mail/evolution-mail.schemas.in.h:211
 msgid "Save directory"
 msgstr "Carpeta donde guardar"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 #: ../mail/evolution-mail.schemas.in.h:212
 msgid "Directory for saving mail component files."
 msgstr "Carpeta para guardar archivos enviados por correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Composer load/attach directory"
 msgstr "Carpeta de carga/adjuntos del editor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Directory for loading/attaching files to composer."
 msgstr "Carpeta para cargar/adjuntar archivos en el editor."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 #: ../mail/evolution-mail.schemas.in.h:219
 msgid "Check for new messages on start"
 msgstr "Comprobar si hay mensajes nuevos al inicio"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9765,12 +9828,12 @@ msgstr ""
 "Indica si se debe comprobar si hay mensajes nuevos al iniciar Evolution. "
 "Incluye también el envío de mensajes en la bandeja de salida."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 #: ../mail/evolution-mail.schemas.in.h:221
 msgid "Check for new messages in all active accounts"
 msgstr "Comprobar si hay mensajes nuevos en todas las cuentas activas"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9781,12 +9844,12 @@ msgstr ""
 "mensajes nuevos cada X minutos» al iniciar Evolution. Esta opción sólo se "
 "usa junto con la opción «send_recv_on_start»."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 #: ../mail/evolution-mail.schemas.in.h:239
 msgid "Server synchronization interval"
 msgstr "Intervalo de sincronización con el servidor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 #: ../mail/evolution-mail.schemas.in.h:240
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
@@ -9817,17 +9880,22 @@ msgid "Address book source"
 msgstr "Libreta de direcciones fuente"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
+#, fuzzy
+#| msgid "Address book to use for storing automatically synced contacts"
+msgid "Address book to use for storing automatically synced contacts."
 msgstr ""
 "Libreta de direcciones que usar para almacenar los contactos sincronizados "
 "automáticamente"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync GAIM contacts"
-msgstr "Auto sincronizar contactos de GAIM"
+#| msgid "Auto sync GAIM contacts"
+msgid "Auto sync Pidgin contacts"
+msgstr "Auto sincronizar contactos de Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:4
-msgid "Whether GAIM contacts should be automaticall synced"
+#, fuzzy
+#| msgid "Whether GAIM contacts should be automaticall synced"
+msgid "Whether Pidgin contacts should be automatically synced."
 msgstr "Indica si los contactos de GAIM se deben sincronizar automáticamente"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
@@ -9835,37 +9903,61 @@ msgid "Enable autocontacts"
 msgstr "Activar contactos automáticos"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
+#, fuzzy
+#| msgid ""
+#| "Whether contacts should be automatically added to the user's addressbook"
 msgid ""
-"Whether contacts should be automatically added to the user's addressbook"
+"Whether contacts should be automatically added to the user's address book."
 msgstr ""
 "indica si los contactos se deben añadir automáticamente a la libre de "
 "direcciones del usuario"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr "Libreta de direcciones fuente de GAIM"
+#, fuzzy
+#| msgid "Address book source"
+msgid "Pidgin address book source"
+msgstr "Libreta de direcciones fuente"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-msgid "Address book to use for storing automatically synced contacts from GAIM"
+#, fuzzy
+#| msgid ""
+#| "Address book to use for storing automatically synced contacts from GAIM"
+msgid ""
+"Address book to use for storing automatically synced contacts from Pidgin."
 msgstr ""
 "Lista de direcciones que usar para almacenar automáticamente los contactos "
 "sincronicados de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "Intervalo de comprobación para GAIM"
+#| msgid "GAIM check interval"
+msgid "Pidgin check interval"
+msgstr "Intervalo de comprobación para Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
-msgid "Check interval for GAIM syncing of contacts"
+#, fuzzy
+#| msgid "Check interval for GAIM syncing of contacts"
+msgid "Check interval for Pidgin syncing of contacts."
 msgstr "Intervalo de comprobación para sincronizar contactos de GAIM"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "MD5 de la última sincronización de Gaim"
+#| msgid "GAIM last sync MD5"
+msgid "Pidgin last sync MD5"
+msgstr "MD5 de la última sincronización de Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "Hora de la última sincronización de Gaim"
+#| msgid "GAIM last sync MD5"
+msgid "Pidgin last sync MD5."
+msgstr "MD5 de la última sincronización de Pidgin."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+#| msgid "GAIM last sync time"
+msgid "Pidgin last sync time"
+msgstr "Hora de la última sincronización de Pidgin"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+#| msgid "GAIM last sync time"
+msgid "Pidgin last sync time."
+msgstr "Hora de la última sincronización de Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:1
 #: ../plugins/email-custom-header/apps_evolution_email_custom_header.schemas.in.h:1
@@ -9971,7 +10063,6 @@ msgstr ""
 "nuevo."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#| msgid "Show new mail icon in notification area when new messages arrive."
 msgid "Enable audible notifications when new messages arrive."
 msgstr "Activar las notificaciones sonoras cuando llegan mensajes nuevos."
 
@@ -9986,12 +10077,10 @@ msgstr ""
 "file», «notify-sound-play-file» y «notify-sound-use-theme» se ignoran."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#| msgid "Whether to show the preview pane."
 msgid "Whether to emit a beep."
 msgstr "Indica si se debe emitir un pitido."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#| msgid "Whether play sound or beep when new messages arrive."
 msgid "Whether to emit a beep when new messages arrive."
 msgstr ""
 "Indica si se debe reproducir emitir un pitido cuando llega un mensaje nuevo."
@@ -10002,8 +10091,6 @@ msgid "Sound filename to be played."
 msgstr "Nombre del archivo de sonido que reproducir."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if not in beep mode."
 msgid ""
 "Sound file to be played when new messages arrive, if \"notify-sound-play-file"
 "\" is \"true\"."
@@ -10012,7 +10099,6 @@ msgstr ""
 "sound-play-file» es cierto."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-#| msgid "Beep or play sound file."
 msgid "Whether to play a sound file."
 msgstr "Indica si se debe reproducir un archivo de sonido."
 
@@ -10237,103 +10323,103 @@ msgstr "Cliente de SpamAssasin"
 msgid "SpamAssassin daemon binary"
 msgstr "Demonio de SpamAssassin"
 
-#: ../em-format/em-format.c:1063 ../em-format/em-format-quote.c:318
+#: ../em-format/em-format.c:235
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
+
+#: ../em-format/em-format.c:480 ../em-format/em-format.c:599
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
+
+#: ../em-format/em-format.c:490
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado no soportado para multipart/encrypted"
+
+#: ../em-format/em-format.c:503
+msgid "Could not parse PGP/MIME message"
+msgstr "No es posible interpretar el mensaje PGP/MIME"
+
+#: ../em-format/em-format.c:504
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
+
+#: ../em-format/em-format.c:622
+msgid "Unsupported signature format"
+msgstr "Formato de firma no soportado"
+
+#: ../em-format/em-format.c:633 ../em-format/em-format.c:850
+msgid "Error verifying signature"
+msgstr "Error al verificar la firma"
+
+#: ../em-format/em-format.c:634 ../em-format/em-format.c:839
+#: ../em-format/em-format.c:851
+msgid "Unknown error verifying signature"
+msgstr "Error desconocido al verificar la firma"
+
+#: ../em-format/em-format.c:958
+msgid "Could not parse PGP message: "
+msgstr "No se pudo analizar el mensaje PGP: "
+
+#: ../em-format/em-format.c:1131
+msgid "Cannot proccess non-text mime/part"
+msgstr ""
+
+#: ../em-format/em-format.c:1225 ../em-format/em-format-quote.c:154
 #: ../mail/e-mail-tag-editor.c:327 ../mail/message-list.etspec.h:5
 #: ../modules/mail/em-mailer-prefs.c:70
 msgid "From"
 msgstr "De"
 
-#: ../em-format/em-format.c:1064 ../em-format/em-format-quote.c:318
+#: ../em-format/em-format.c:1226 ../em-format/em-format-quote.c:154
 #: ../modules/mail/em-mailer-prefs.c:71
 msgid "Reply-To"
 msgstr "Responder a"
 
-#: ../em-format/em-format.c:1066 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2667 ../mail/em-format-html.c:2735
-#: ../mail/em-format-html.c:2758 ../modules/mail/em-mailer-prefs.c:73
+#: ../em-format/em-format.c:1228 ../em-format/em-format-quote.c:154
+#: ../mail/em-format-html.c:2306 ../mail/em-format-html.c:2329
+#: ../modules/mail/em-mailer-prefs.c:73
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/em-format.c:1067 ../em-format/em-format-quote.c:318
-#: ../mail/em-format-html.c:2668 ../mail/em-format-html.c:2739
-#: ../mail/em-format-html.c:2761 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/em-format.c:1229 ../em-format/em-format-quote.c:154
+#: ../mail/em-format-html.c:2308 ../mail/em-format-html.c:2331
+#: ../modules/mail/em-mailer-prefs.c:74
 msgid "Bcc"
 msgstr "Cco"
 
-#: ../em-format/em-format.c:1068 ../em-format/em-format-quote.c:465
+#: ../em-format/em-format.c:1230 ../em-format/em-format-quote.c:301
 #: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
 #: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:75
 #: ../smime/lib/e-cert.c:1126
 msgid "Subject"
 msgstr "Asunto"
 
-#: ../em-format/em-format.c:1069 ../mail/message-list.etspec.h:7
+#: ../em-format/em-format.c:1231 ../mail/message-list.etspec.h:7
 #: ../modules/mail/em-mailer-prefs.c:76 ../widgets/misc/e-dateedit.c:526
 #: ../widgets/misc/e-dateedit.c:548
 msgid "Date"
 msgstr "Fecha"
 
-#: ../em-format/em-format.c:1070 ../modules/mail/em-mailer-prefs.c:77
+#: ../em-format/em-format.c:1232 ../modules/mail/em-mailer-prefs.c:77
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: ../em-format/em-format.c:1071 ../modules/mail/em-mailer-prefs.c:78
+#: ../em-format/em-format.c:1233 ../modules/mail/em-mailer-prefs.c:78
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Cara"
 
-#: ../em-format/em-format.c:1474
+#: ../em-format/em-format.c:2291
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "No es posible interpretar el mensaje S/MIME: Error desconocido"
-
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "No es posible analizar el mensaje MIME. Mostrando la fuente."
-
-#: ../em-format/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado no soportado para multipart/encrypted"
-
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "No es posible interpretar el mensaje PGP/MIME"
-
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "No se pudo interpretar el mensaje PGP/MIME: Error desconocido"
-
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "Formato de firma no soportado"
-
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "Error al verificar la firma"
-
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "Error desconocido al verificar la firma"
-
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "No se pudo analizar el mensaje PGP: "
-
 #. pseudo-header
-#: ../em-format/em-format-quote.c:476 ../mail/em-format-html.c:2860
+#: ../em-format/em-format-quote.c:312 ../mail/em-format-html.c:2439
 #: ../modules/mail/em-mailer-prefs.c:1046
 msgid "Mailer"
 msgstr "Transporte"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
-msgid "-------- Forwarded Message --------"
-msgstr "--------- Mensaje reenviado --------"
-
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:248
 #, c-format
@@ -10449,13 +10535,13 @@ msgstr "visual"
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
 #: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../plugins/itip-formatter/itip-view.c:211
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Hoy"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:222
+#: ../e-util/e-datetime-format.c:217 ../plugins/itip-formatter/itip-view.c:239
 msgid "Tomorrow"
 msgstr "Mañana"
 
@@ -10777,11 +10863,11 @@ msgid "A_dd Condition"
 msgstr "Añadir a_cción"
 
 #: ../filter/e-filter-rule.c:1162 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:306
+#: ../mail/em-utils.c:308
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:307
+#: ../filter/e-filter-rule.c:1162 ../mail/em-utils.c:309
 msgid "Outgoing"
 msgstr "Saliente"
 
@@ -10959,32 +11045,32 @@ msgstr "URI « %s» de la carpeta no válida"
 
 #: ../libemail-engine/e-mail-session.c:108 ../mail/em-folder-properties.c:333
 #: ../mail/em-folder-tree-model.c:719
-#: ../modules/mail/e-mail-shell-view-private.c:1095
-#: ../modules/mail/e-mail-shell-view-private.c:1106
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Inbox"
 msgstr "Bandeja de entrada"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:712
-#: ../modules/mail/e-mail-shell-view-private.c:1093
+#: ../modules/mail/e-mail-shell-view-private.c:1019
 msgid "Drafts"
 msgstr "Borradores"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:723
-#: ../modules/mail/e-mail-shell-view-private.c:1097
+#: ../modules/mail/e-mail-shell-view-private.c:1023
 msgid "Outbox"
 msgstr "Bandeja de salida"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:727
-#: ../modules/mail/e-mail-shell-view-private.c:1099
+#: ../modules/mail/e-mail-shell-view-private.c:1025
 msgid "Sent"
 msgstr "Correo enviado"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:715
-#: ../modules/mail/e-mail-shell-view-private.c:1101
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
 #: ../plugins/templates/templates.c:1041 ../plugins/templates/templates.c:1341
 #: ../plugins/templates/templates.c:1351
@@ -10995,30 +11081,30 @@ msgstr "Plantillas"
 msgid "Search Folders"
 msgstr "Carpetas de búsqueda"
 
-#: ../libemail-engine/e-mail-session.c:975
+#: ../libemail-engine/e-mail-session.c:987
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introduzca la contraseña para %s"
 
-#: ../libemail-engine/e-mail-session.c:979
+#: ../libemail-engine/e-mail-session.c:991
 msgid "Enter Passphrase"
 msgstr "Introduzca la contraseña"
 
-#: ../libemail-engine/e-mail-session.c:983
+#: ../libemail-engine/e-mail-session.c:995
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introduzca su contraseña para %s"
 
-#: ../libemail-engine/e-mail-session.c:987
+#: ../libemail-engine/e-mail-session.c:999
 msgid "Enter Password"
 msgstr "Introduzca contraseña"
 
-#: ../libemail-engine/e-mail-session.c:1038
+#: ../libemail-engine/e-mail-session.c:1050
 #, c-format
 msgid "User canceled operation."
 msgstr "El usuario canceló la operación."
 
-#: ../libemail-engine/e-mail-session.c:1157
+#: ../libemail-engine/e-mail-session.c:1169
 #, c-format
 msgid ""
 "No destination address provided, forward of the message has been cancelled."
@@ -11026,18 +11112,18 @@ msgstr ""
 "No se proporcionó ninguna dirección de destino, se canceló el reenvío del "
 "mensaje."
 
-#: ../libemail-engine/e-mail-session.c:1166
+#: ../libemail-engine/e-mail-session.c:1178
 #, c-format
 msgid "No account found to use, forward of the message has been cancelled."
 msgstr ""
 "No se encontró ninguna cuenta que usar, se canceló el reenvío del mensaje."
 
-#: ../libemail-engine/e-mail-session.c:1320
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "%s authentication failed"
 msgstr "Falló en la autenticación %s"
 
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session.c:1406
 #, c-format
 msgid "No password was provided"
 msgstr "No se ha proporcionado ninguna contraseña"
@@ -11048,14 +11134,14 @@ msgid "Cannot get transport for account '%s'"
 msgstr "No se puede obtener el servicio de transporte para la cuenta «%s»"
 
 #: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/mail-ops.c:661
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "No se pudieron aplicar los filtros al correo saliente: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:531
 #: ../libemail-engine/e-mail-session-utils.c:565
-#: ../libemail-engine/mail-ops.c:635 ../libemail-engine/mail-ops.c:671
+#: ../libemail-engine/mail-ops.c:680 ../libemail-engine/mail-ops.c:716
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11065,13 +11151,13 @@ msgstr ""
 "En su lugar se anexará a la carpeta local «Correo enviado»."
 
 #: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/mail-ops.c:738
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Falló anexar a la carpeta local «Correo enviado»: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/mail-ops.c:866 ../libemail-engine/mail-ops.c:967
 msgid "Sending message"
 msgstr "Enviando mensaje"
 
@@ -11100,15 +11186,15 @@ msgstr "Preparando la cuenta «%s» para desconexión"
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
 
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "Filtrado de mensajes seleccionados"
 
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "Obteniendo mensajes"
 
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:877
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando mensaje %d de %d"
@@ -11116,62 +11202,62 @@ msgstr "Enviando mensaje %d de %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../libemail-engine/mail-ops.c:883
+#: ../libemail-engine/mail-ops.c:928
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Falló al enviar un mensaje"
 msgstr[1] "Falló al enviar %d de %d mensajes"
 
-#: ../libemail-engine/mail-ops.c:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:934 ../mail/mail-send-recv.c:887
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:891 ../mail/mail-send-recv.c:887
+#: ../libemail-engine/mail-ops.c:936 ../mail/mail-send-recv.c:889
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1048
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Moviendo mensajes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1049
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando mensajes a «%s»"
 
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1166
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Guardando carpeta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1239
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Compactando y almacenando cuenta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1240
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Almacenando cuenta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1257
+#: ../libemail-engine/mail-ops.c:1302
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando carpeta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1475
+#: ../libemail-engine/mail-ops.c:1520
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Compactando carpeta «%s»"
 
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1613
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vaciando papelera en «%s»"
 
-#: ../libemail-engine/mail-ops.c:1664
+#: ../libemail-engine/mail-ops.c:1709
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando de «%s»"
@@ -11335,7 +11421,9 @@ msgstr "Comprobar si hay mensajes _nuevos cada"
 msgid "minu_tes"
 msgstr "minuto_s"
 
-#: ../mail/em-account-editor.c:4276 ../mail/mail-config.ui.h:166
+#. Add encryption/signature header
+#: ../mail/em-account-editor.c:4276 ../mail/em-format-html-print.c:187
+#: ../mail/mail-config.ui.h:166
 msgid "Security"
 msgstr "Seguridad"
 
@@ -11390,7 +11478,7 @@ msgstr "Nombre de la cuenta"
 
 #. we changed user, thus reset the chosen calendar combo too, because
 #. * other user means other calendars subscribed
-#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3439
+#: ../mail/e-mail-account-tree-view.c:116 ../mail/e-mail-reader.c:3646
 #: ../mail/mail-config.ui.h:51
 #: ../plugins/google-account-setup/google-source.c:311
 #: ../plugins/google-account-setup/google-source.c:553
@@ -11398,7 +11486,7 @@ msgstr "Nombre de la cuenta"
 msgid "Default"
 msgstr "Predeterminado"
 
-#: ../mail/e-mail-attachment-bar.c:102 ../mail/e-mail-attachment-bar.c:107
+#: ../mail/e-mail-attachment-bar.c:101 ../mail/e-mail-attachment-bar.c:106
 #: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-paned.c:176
 #: ../widgets/misc/e-attachment-paned.c:181
 msgid "Attachment"
@@ -11406,12 +11494,12 @@ msgid_plural "Attachments"
 msgstr[0] "Adjunto"
 msgstr[1] "Adjuntos"
 
-#: ../mail/e-mail-attachment-bar.c:619
+#: ../mail/e-mail-attachment-bar.c:656
 #: ../widgets/misc/e-attachment-paned.c:703
 msgid "Icon View"
 msgstr "Vista de icono"
 
-#: ../mail/e-mail-attachment-bar.c:621
+#: ../mail/e-mail-attachment-bar.c:658
 #: ../widgets/misc/e-attachment-paned.c:705
 msgid "List View"
 msgstr "Vista de lista"
@@ -11420,7 +11508,7 @@ msgstr "Vista de lista"
 msgid "Unknown background operation"
 msgstr "Operación en segundo plano desconocida"
 
-#: ../mail/e-mail-browser.c:130 ../shell/e-shell-window-actions.c:1439
+#: ../mail/e-mail-browser.c:132 ../shell/e-shell-window-actions.c:1439
 #: ../shell/e-shell-window-actions.c:1446
 #: ../shell/e-shell-window-actions.c:1453
 msgid "Close this window"
@@ -11430,30 +11518,38 @@ msgstr "Cierra esta ventana"
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-display.c:112
 msgid "_Add to Address Book..."
 msgstr "_Añadir a la libreta de direcciones…"
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:119
 msgid "_To This Address"
 msgstr "_A esta dirección"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:126
 msgid "_From This Address"
 msgstr "_Desde esta dirección"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:133
 msgid "Send _Reply To..."
 msgstr "Enviar _respuesta a…"
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:135
 msgid "Send a reply message to this address"
 msgstr "Enviar un mensaje de respuesta a esta dirección"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:142
 msgid "Create Search _Folder"
 msgstr "Crear carpeta de _búsqueda"
 
+#: ../mail/e-mail-display.c:152
+msgid "Save _Image..."
+msgstr "Guardar _imagen…"
+
+#: ../mail/e-mail-display.c:154
+msgid "Save the image to a file"
+msgstr "Guardar la imagen en un archivo"
+
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
 #: ../mail/e-mail-junk-options.c:252
@@ -11509,7 +11605,7 @@ msgstr ""
 msgid "Color"
 msgstr "Color"
 
-#: ../mail/e-mail-label-tree-view.c:99
+#: ../mail/e-mail-label-tree-view.c:99 ../mail/em-format-html-print.c:83
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../plugins/caldav/caldav-browse-server.c:1359
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -11526,625 +11622,671 @@ msgstr "No se pueden crear las carpetas de correo local en: «%s»: %s"
 msgid "Please select a folder"
 msgstr "Seleccionar una carpeta"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-printer.c:122
+#, c-format
+msgid "Page %d of %d"
+msgstr "Página %d de %d"
+
+#: ../mail/e-mail-printer.c:530
+#: ../modules/calendar/e-cal-shell-view-actions.c:232
+#: ../modules/calendar/e-cal-shell-view-actions.c:261
+msgid "Print"
+msgstr "Imprimir"
+
+#: ../mail/e-mail-printer.c:536
+#| msgid "Header name"
+msgid "Header Name"
+msgstr "Nombre de la cabecera"
+
+#: ../mail/e-mail-printer.c:542
+#| msgid "Header name"
+msgid "Header Value"
+msgstr "Valor de la cabecera"
+
+#: ../mail/e-mail-printer.c:590 ../mail/mail-config.ui.h:107
+msgid "Headers"
+msgstr "Cabeceras"
+
+#: ../mail/e-mail-reader.c:353
+msgid "Save Image"
+msgstr "Guardar imagen"
+
+#: ../mail/e-mail-reader.c:438 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:314 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:438 ../mail/em-folder-utils.c:488
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Mover a la carpeta"
 
-#: ../mail/e-mail-reader.c:841 ../mail/em-folder-utils.c:488
+#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:488
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1202 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1326 ../mail/e-mail-reader.c:1508
+#: ../mail/e-mail-reader.c:1548
 msgid "_Do not ask me again."
 msgstr "_No preguntarme de nuevo."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1554
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar siempre «Responder a:» para las listas de correo."
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1902
 msgid "A_dd Sender to Address Book"
 msgstr "_Añadir remitente a la libreta"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1904
 msgid "Add sender to address book"
 msgstr "Añadir el remitente a la libreta de direcciones"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1909
 msgid "Check for _Junk"
 msgstr "Detectar _SPAM"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter the selected messages for junk status"
 msgstr "Filtra los mensajes seleccionados por el estado de SPAM"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1916
 msgid "_Copy to Folder..."
 msgstr "Copiar a la c_arpeta…"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1918
 msgid "Copy selected messages to another folder"
 msgstr "Copia mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1923
 msgid "_Delete Message"
 msgstr "_Eliminar el mensaje"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1925
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar los mensajes seleccionados para eliminar"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1930
 msgid "Filter on Mailing _List..."
 msgstr "Filtro según la _lista de correo…"
 
-#: ../mail/e-mail-reader.c:1825
+#: ../mail/e-mail-reader.c:1932
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Crea una regla para filtrar los mensajes de esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1937
 msgid "Filter on _Recipients..."
 msgstr "Filtro según los _destinatarios…"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1939
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crea una regla para filtrar los mensajes de estos destinatarios"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1944
 msgid "Filter on Se_nder..."
 msgstr "Filtro según el _remitente…"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1946
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crea una regla para filtrar los mensajes de este remitente"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1951
 msgid "Filter on _Subject..."
 msgstr "Filtro según el _asunto…"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1953
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crea una regla para filtrar los mensajes con este asunto"
 
 # Colisión en la A
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1958
 msgid "A_pply Filters"
 msgstr "Aplicar _filtros"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1960
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplica filtros a los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1965
 msgid "_Find in Message..."
 msgstr "B_uscar en el mensaje…"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1967
 msgid "Search for text in the body of the displayed message"
 msgstr "Busca un texto en el cuerpo del mensaje mostrado"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1972
 msgid "_Clear Flag"
 msgstr "_Quitar marca"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1974
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Quitar la marca de seguimiento de los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1979
 msgid "_Flag Completed"
 msgstr "Ma_rcar como terminado"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1981
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Establecer la marca de completado en los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1986
 msgid "Follow _Up..."
 msgstr "Se_guimiento…"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1988
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar los mensajes seleccionados para seguimiento"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1993
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ../mail/e-mail-reader.c:1888 ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1995 ../mail/e-mail-reader.c:2002
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Reenvía a alguien el mensaje seleccionado como un adjunto"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2000
 msgid "Forward As _Attached"
 msgstr "Reenviar como _adjunto"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2007
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ../mail/e-mail-reader.c:1902 ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2009 ../mail/e-mail-reader.c:2016
 msgid "Forward the selected message in the body of a new message"
 msgstr "Reenvía el mensaje seleccionado en el cuerpo de un mensaje nuevo"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2014
 msgid "Forward As _Inline"
 msgstr "Reenviar en _línea"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2021
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ../mail/e-mail-reader.c:1916 ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2023 ../mail/e-mail-reader.c:2030
 msgid "Forward the selected message quoted like a reply"
 msgstr "Reenvía el mensaje seleccionado citado como una respuesta"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2028
 msgid "Forward As _Quoted"
 msgstr "Reenviar como ci_tado"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2035
 msgid "_Load Images"
 msgstr "Cargar _imágenes"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2037
 msgid "Force images in HTML mail to be loaded"
 msgstr "Fuerza la carga de imágenes en el correo HTML"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2042
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2044
 msgid "Mark the selected messages as important"
 msgstr "Marcar los mensajes seleccionados como importantes"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2049
 msgid "_Junk"
 msgstr "_SPAM"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2051
 msgid "Mark the selected messages as junk"
 msgstr "Marcar los mensajes seleccionados como SPAM"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2056
 msgid "_Not Junk"
 msgstr "No es SPA_M"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2058
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar los mensajes seleccionados como no SPAM"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2063
 msgid "_Read"
 msgstr "_Leído"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2065
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar los mensajes seleccionados como leídos"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2070
 msgid "Uni_mportant"
 msgstr "N_o importante"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2072
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar los mensajes seleccionados como no importantes"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2077
 msgid "_Unread"
 msgstr "_No leído"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2079
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar los mensajes seleccionados como no leídos"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2084
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo…"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2086
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abre los mensajes seleccionados en el editor para editarlo"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2091
 msgid "Compose _New Message"
 msgstr "Redactar un mensaje _nuevo"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2093
 msgid "Open a window for composing a mail message"
 msgstr "Abre una ventana para escribir un mensaje de correo"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2098
 msgid "_Open in New Window"
 msgstr "_Abrir en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2100
 msgid "Open the selected messages in a new window"
 msgstr "Abre los mensajes seleccionados en una ventana nueva"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2105
 msgid "_Move to Folder..."
 msgstr "_Mover a la carpeta…"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2107
 msgid "Move selected messages to another folder"
 msgstr "Mueve los mensajes seleccionados a otra carpeta"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2112
 msgid "_Switch to Folder"
 msgstr "_Cambiar a la carpeta"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the parent folder"
 msgstr "Mostrar la carpeta padre"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2119
 msgid "Switch to _next tab"
 msgstr "Cambiar a la _siguiente pestaña"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2121
 msgid "Switch to the next tab"
 msgstr "Cambiar a la siguiente pestaña"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2126
 msgid "Switch to _previous tab"
 msgstr "Cambiar a la pestaña _anterior"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2128
 msgid "Switch to the previous tab"
 msgstr "Cambiar a la pestaña anterior"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2133
 msgid "Cl_ose current tab"
 msgstr "C_errar la pestaña actual"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2135
 msgid "Close current tab"
 msgstr "Cerrar la pestaña actual"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2140
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the next message"
 msgstr "Mostrar el mensaje siguiente"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2147
 msgid "Next _Important Message"
 msgstr "Mensaje siguiente _importante"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2149
 msgid "Display the next important message"
 msgstr "Mostrar el mensaje siguiente importante"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2154
 msgid "Next _Thread"
 msgstr "_Conversación siguiente"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2156
 msgid "Display the next thread"
 msgstr "Mostrar la siguiente conversación"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2161
 msgid "Next _Unread Message"
 msgstr "Mensaje siguiente _no leído"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2163
 msgid "Display the next unread message"
 msgstr "Mostrar el siguiente mensaje no leído"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2168
 msgid "_Previous Message"
 msgstr "Mensaje _anterior"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2170
 msgid "Display the previous message"
 msgstr "Mostrar el mensaje anterior"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2175
 msgid "Pr_evious Important Message"
 msgstr "Mensaje anterior i_mportante"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2177
 msgid "Display the previous important message"
 msgstr "Mostrar el anterior mensaje importante"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2182
 msgid "Previous T_hread"
 msgstr "Con_versación anterior"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2184
 msgid "Display the previous thread"
 msgstr "Mostrar la conversación anterior"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2189
 msgid "P_revious Unread Message"
 msgstr "Mensaje anterior n_o leído"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2191
 msgid "Display the previous unread message"
 msgstr "Mostrar el anterior mensaje no leído"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2198
 msgid "Print this message"
 msgstr "Imprime este mensaje"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2205
 msgid "Preview the message to be printed"
 msgstr "Vista previa del mensaje que va a imprimirse"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2210
 msgid "Re_direct"
 msgstr "Re_dirigir"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2212
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redirige (rebotar) el mensaje seleccionado a alguien"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2217
 msgid "Remo_ve Attachments"
 msgstr "Q_uitar adjuntos"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2219
 msgid "Remove attachments"
 msgstr "Quitar adjuntos"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2224
 msgid "Remove Du_plicate Messages"
 msgstr "Quitar correos _duplicados"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2226
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar los mensajes seleccionados para buscar duplicados"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2231 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2233
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Responder a todos los destinatarios del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2131 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2238 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2240
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Responde a la lista de correo remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2138
-#: ../modules/mail/e-mail-attachment-handler.c:188
+#: ../mail/e-mail-reader.c:2245
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2247
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Responde al remitente del mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2252
 msgid "_Save as mbox..."
 msgstr "_Guardar como mbox…"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2254
 msgid "Save selected messages as an mbox file"
 msgstr "Guarda los mensajes como un archivo mbox"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2259
 msgid "_Message Source"
 msgstr "Me_nsaje en bruto"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2261
 msgid "Show the raw email source of the message"
 msgstr "Mostrar mensaje de correo-e en bruto"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2273
 msgid "_Undelete Message"
 msgstr "_Recuperar mensaje"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2275
 msgid "Undelete the selected messages"
 msgstr "Recupera los mensajes seleccionados"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2280
 msgid "_Normal Size"
 msgstr "Tamaño _normal"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2282
 msgid "Reset the text to its original size"
 msgstr "Restablecer el texto a su tamaño original"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2287
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2289
 msgid "Increase the text size"
 msgstr "Incrementar el tamaño del texto"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2294
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2296
 msgid "Decrease the text size"
 msgstr "Reduce el tamaño del texto"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2303
 msgid "Create R_ule"
 msgstr "Crear _regla"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2310
 msgid "Ch_aracter Encoding"
 msgstr "C_odificación de caracteres"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2317
 msgid "F_orward As"
 msgstr "Reenviar _como"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2324
 msgid "_Group Reply"
 msgstr "_Responder al grupo"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2331
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2338
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2345
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2352
 msgid "_Zoom"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2362
 msgid "Search Folder from Mailing _List..."
 msgstr "Carpeta de búsqueda según la l_ista de correo…"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2364
 msgid "Create a search folder for this mailing list"
 msgstr "Crear una carpeta de búsqueda para esta lista de correo"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2369
 msgid "Search Folder from Recipien_ts..."
 msgstr "Carpeta de búsqueda según los des_tinatarios…"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2371
 msgid "Create a search folder for these recipients"
 msgstr "Crear una carpeta de búsqueda para estos destinatarios"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2376
 msgid "Search Folder from Sen_der..."
 msgstr "Carpeta de búsqueda según el r_emitente…"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2378
 msgid "Create a search folder for this sender"
 msgstr "Crear una carpeta de búsqueda para este remitente"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2383
 msgid "Search Folder from S_ubject..."
 msgstr "Carpeta de búsqueda según el a_sunto…"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2385
 msgid "Create a search folder for this subject"
 msgstr "Crear una carpeta de búsqueda para este asunto"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2408
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para se_guimiento…"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2416
 msgid "Mark as _Important"
 msgstr "Marcar como imp_ortante"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2420
 msgid "Mark as _Junk"
 msgstr "Marcar como _SPAM"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2424
 msgid "Mark as _Not Junk"
 msgstr "Marcar como no _SPAM"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2428
 msgid "Mar_k as Read"
 msgstr "Marcar como _leído"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2432
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como no imp_ortante"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2436
 msgid "Mark as _Unread"
 msgstr "Marcar como no _leído"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2480
 msgid "_Caret Mode"
 msgstr "Activar cu_rsor"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2482
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Mostrar un cursor parpadeante en el cuerpo de los mensajes mostrados"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2488
 msgid "All Message _Headers"
 msgstr "_Todas las cabeceras del mensaje"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2490
 msgid "Show messages with all email headers"
 msgstr "Mostrar los mensajes con todas las cabeceras de correo-e"
 
-#: ../mail/e-mail-reader.c:2712
+#: ../mail/e-mail-reader.c:2815
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Obteniendo mensaje «%s»"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:2820
+#| msgid "Retrieving %d message"
+#| msgid_plural "Retrieving %d messages"
+msgid "Retrieving message"
+msgstr "Descargando mensaje"
+
+#: ../mail/e-mail-reader.c:3131
+#| msgid "Saving %d message"
+#| msgid_plural "Saving %d messages"
+msgid "Parsing message"
+msgstr "Analizando mensaje"
+
+#: ../mail/e-mail-reader.c:3836
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3837
 msgid "Forward the selected message to someone"
 msgstr "Reenvía a alguien el mensaje seleccionado"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3856
 msgid "Group Reply"
 msgstr "Responder al grupo"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3857
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder a la lista de correo o a todos los destinatarios"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3914 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3743
+#: ../mail/e-mail-reader.c:3947
 #: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Siguiente"
 
-#: ../mail/e-mail-reader.c:3747
+#: ../mail/e-mail-reader.c:3951
 #: ../modules/calendar/e-cal-shell-view-actions.c:1349
 #: ../widgets/misc/e-calendar.c:178
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3756 ../mail/mail-dialogs.ui.h:20
+#: ../mail/e-mail-reader.c:3960 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4669
 #, c-format
 msgid "Folder '%s'"
 msgstr "Carpeta «%s»"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "No advertirme de nuevo"
 
+#: ../mail/e-mail-reader-utils.c:506
+#| msgid "Print"
+msgid "Printing"
+msgstr "Imprimiendo"
+
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:641
+#: ../mail/e-mail-reader-utils.c:635
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12159,7 +12301,7 @@ msgstr[1] ""
 "La carpeta «%s» contiene %u correos duplicados. ¿Está seguro de que quiere "
 "eliminarlos?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1018
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Guardar mensaje"
@@ -12170,12 +12312,18 @@ msgstr[1] "Guardar mensajes"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1039
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaje"
 msgstr[1] "Mensajes"
 
+#: ../mail/e-mail-request.c:117
+#, c-format
+#| msgid "Failed to load the calendar '%s' (%s)"
+msgid "Failed to load part '%s'"
+msgstr "Falló al cargar la parte «%s»"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "Marcar para seguimiento"
@@ -12184,7 +12332,7 @@ msgstr "Marcar para seguimiento"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1229
+#: ../mail/em-composer-utils.c:1255
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12192,19 +12340,23 @@ msgstr ""
 "El ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} a las ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribió:"
 
-#: ../mail/em-composer-utils.c:1240
+#: ../mail/em-composer-utils.c:1261
+msgid "-------- Forwarded Message --------"
+msgstr "--------- Mensaje reenviado --------"
+
+#: ../mail/em-composer-utils.c:1266
 msgid "-----Original Message-----"
 msgstr "-----Mensaje original-----"
 
-#: ../mail/em-composer-utils.c:2467
+#: ../mail/em-composer-utils.c:2500
 msgid "an unknown sender"
 msgstr "un remitente desconocido"
 
-#: ../mail/em-composer-utils.c:2862
+#: ../mail/em-composer-utils.c:2901
 msgid "Posting destination"
 msgstr "Destino de publicación"
 
-#: ../mail/em-composer-utils.c:2863
+#: ../mail/em-composer-utils.c:2902
 msgid "Choose folders to post the message to."
 msgstr "Elija las carpetas en las que publicar el mensaje."
 
@@ -12527,27 +12679,27 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "Árbol de carpetas de correo"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2129 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2139 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2143 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando los mensajes a la carpeta %s"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2162
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "No se puede dejar el(los) mensaje(s) en el almacén de nivel superior"
@@ -12577,106 +12729,59 @@ msgstr "Crear carpeta"
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "Formateando el mensaje"
-
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "Formateando el mensaje…"
-
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Obteniendo «%s»"
-
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "No firmado"
-
-#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "Firma válida"
-
-#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "Firma no válida"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "Firma válida, pero no se puede verificar el remitente"
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "La firma existe pero se necesita la clave pública"
-
-#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "Descifrado"
-
-#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "Cifrado, débil"
-
-#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "Cifrado"
-
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "Cifrado, fuerte"
-
-#: ../mail/em-format-html.c:2210
-msgid "Unknown external-body part."
-msgstr "Parte externa al cuerpo del mensaje desconocida."
-
-#: ../mail/em-format-html.c:2220
-msgid "Malformed external-body part."
+#: ../mail/em-format-html.c:385
+#, fuzzy
+#| msgid "Malformed external-body part."
+msgid "Malformed external-body part"
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: ../mail/em-format-html.c:2251
+#: ../mail/em-format-html.c:417
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: ../mail/em-format-html.c:2262
+#: ../mail/em-format-html.c:428
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) válido en el sitio «%s»"
 
-#: ../mail/em-format-html.c:2264
+#: ../mail/em-format-html.c:430
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: ../mail/em-format-html.c:2285
+#: ../mail/em-format-html.c:449
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a datos remotos (%s)"
 
-#: ../mail/em-format-html.c:2300
+#: ../mail/em-format-html.c:462
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../mail/em-format-html.c:3008
+#: ../mail/em-format-html.c:2581
 #: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "De: %s"
 
-#: ../mail/em-format-html.c:3030
+#: ../mail/em-format-html.c:2601 ../mail/em-format-html.c:2606
 msgid "(no subject)"
 msgstr "(sin asunto)"
 
-#: ../mail/em-format-html.c:3106
+#: ../mail/em-format-html.c:2718
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "%s envió este mensaje en nombre de %s"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:91
+msgid "Unsigned"
+msgstr "No firmado"
+
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12684,7 +12789,11 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:92
+msgid "Valid signature"
+msgstr "Firma válida"
+
+#: ../mail/em-format-html-display.c:92
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -12692,7 +12801,11 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:93
+msgid "Invalid signature"
+msgstr "Firma no válida"
+
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12700,7 +12813,11 @@ msgstr ""
 "La firma de este mensaje no se puede verificar, pudo haber sido alterada en "
 "tránsito."
 
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:94
+msgid "Valid signature, but cannot verify sender"
+msgstr "Firma válida, pero no se puede verificar el remitente"
+
+#: ../mail/em-format-html-display.c:94
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -12708,7 +12825,11 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no se pudo verificar."
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:95
+msgid "Signature exists, but need public key"
+msgstr "La firma existe pero se necesita la clave pública"
+
+#: ../mail/em-format-html-display.c:95
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
@@ -12716,7 +12837,11 @@ msgstr ""
 "Este mensaje está firmado con una firma pero no existe una clave pública "
 "correspondiente."
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:102
+msgid "Unencrypted"
+msgstr "Descifrado"
+
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12724,7 +12849,11 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede verse en tránsito a través "
 "de Internet."
 
-#: ../mail/em-format-html-display.c:109
+#: ../mail/em-format-html-display.c:103
+msgid "Encrypted, weak"
+msgstr "Cifrado, débil"
+
+#: ../mail/em-format-html-display.c:103
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -12734,7 +12863,11 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:104
+msgid "Encrypted"
+msgstr "Cifrado"
+
+#: ../mail/em-format-html-display.c:104
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
@@ -12742,7 +12875,11 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:105
+msgid "Encrypted, strong"
+msgstr "Cifrado, fuerte"
+
+#: ../mail/em-format-html-display.c:105
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12752,15 +12889,15 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
+#: ../mail/em-format-html-display.c:275 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: ../mail/em-format-html-display.c:274
+#: ../mail/em-format-html-display.c:290
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: ../mail/em-format-html-display.c:589
+#: ../mail/em-format-html-display.c:633
 msgid ""
 "Evolution cannot render this email as it is too large to process. You can "
 "view it unformatted or with an external text editor."
@@ -12768,58 +12905,60 @@ msgstr ""
 "Evolution no puede mostrar este correo debido a que es demasiado grande para "
 "procesarlo. Puede verlo sin formato o con un editor de texto externo."
 
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "Guardar imagen"
-
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "Guardar _imagen…"
-
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "Guardar la imagen en un archivo"
-
-#: ../mail/em-format-html-display.c:1024
+#: ../mail/em-format-html-display.c:995
 msgid "Completed on"
 msgstr "Completado en"
 
-#: ../mail/em-format-html-display.c:1036
+#: ../mail/em-format-html-display.c:1007
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: ../mail/em-format-html-display.c:1044
+#: ../mail/em-format-html-display.c:1015
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
+#: ../mail/em-format-html-display.c:1110 ../mail/em-format-html-display.c:1148
 msgid "View _Unformatted"
 msgstr "Ver _sin formato"
 
-#: ../mail/em-format-html-display.c:1327
+#: ../mail/em-format-html-display.c:1112
 msgid "Hide _Unformatted"
 msgstr "Ocultar _sin formato"
 
-#: ../mail/em-format-html-display.c:1398
+#: ../mail/em-format-html-display.c:1170
 msgid "O_pen With"
 msgstr "Abrir c_on"
 
 #. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
+#: ../mail/em-format-html-display.c:1179
 msgctxt "Button"
 msgid "Attachment"
 msgstr "Adjunto"
 
-#: ../mail/em-format-html-print.c:157
-#, c-format
-msgid "Page %d of %d"
-msgstr "Página %d de %d"
+#: ../mail/em-format-html-print.c:83 ../mail/message-list.etspec.h:10
+#: ../widgets/misc/e-attachment-tree-view.c:574
+msgid "Size"
+msgstr "Tamaño"
 
-#: ../mail/em-html-stream.c:82 ../mail/em-html-stream.c:104
-#: ../mail/em-html-stream.c:122
-#, c-format
-msgid "No HTML stream available"
-msgstr "No hay un flujo HTML disponible"
+#: ../mail/em-format-html-print.c:202
+#| msgid "Assigned"
+msgid "GPG signed"
+msgstr "Firmado con GPG"
+
+#: ../mail/em-format-html-print.c:207
+#| msgid "Unencrypted"
+msgid "GPG encrpyted"
+msgstr "Cifrado GPG"
+
+#: ../mail/em-format-html-print.c:213
+#| msgid "S/MIME Sig_n"
+msgid "S/MIME signed"
+msgstr "Cifrado S/MIME"
+
+#: ../mail/em-format-html-print.c:219
+#| msgid "S/MIME En_crypt"
+msgid "S/MIME encrpyted"
+msgstr "Cifrado con S/MIME"
 
 #: ../mail/em-subscription-editor.c:870
 msgid "_Subscribe"
@@ -12834,7 +12973,7 @@ msgid "Subscribe To _All"
 msgstr "S_uscribirse a todo"
 
 #: ../mail/em-subscription-editor.c:987 ../mail/em-subscription-editor.c:1840
-#: ../modules/mail/e-mail-shell-view-actions.c:1292
+#: ../modules/mail/e-mail-shell-view-actions.c:1320
 msgid "_Unsubscribe"
 msgstr "Des_uscribir"
 
@@ -12871,7 +13010,7 @@ msgid "Su_bscribe"
 msgstr "_Suscribirse"
 
 #: ../mail/em-subscription-editor.c:1839
-#: ../modules/mail/e-mail-shell-view-actions.c:1294
+#: ../modules/mail/e-mail-shell-view-actions.c:1322
 msgid "Unsubscribe from the selected folder"
 msgstr "Desuscribirse de la carpeta seleccionada"
 
@@ -12903,23 +13042,23 @@ msgstr "Detener la operación de correo"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:110
+#: ../mail/em-utils.c:112
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "¿Está seguro de que quiere abrir %d mensaje a la vez?"
 msgstr[1] "¿Está seguro de que quiere abrir %d mensajes a la vez?"
 
-#: ../mail/em-utils.c:166
+#: ../mail/em-utils.c:168
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_No mostrar otra vez este mensaje."
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:320
 msgid "Message Filters"
 msgstr "Filtros de mensajes"
 
-#: ../mail/em-utils.c:979
+#: ../mail/em-utils.c:1004
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensajes de %s"
@@ -13847,10 +13986,6 @@ msgstr "Tabla de cabeceras de correo"
 msgid "Date/Time Format"
 msgstr "Formato de la fecha y hora"
 
-#: ../mail/mail-config.ui.h:107
-msgid "Headers"
-msgstr "Cabeceras"
-
 #: ../mail/mail-config.ui.h:108
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar si los _mensajes entrantes son basura"
@@ -14444,7 +14579,7 @@ msgstr ""
 "todas las carpetas?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1187
+#: ../modules/mail/e-mail-shell-view-actions.c:1215
 msgid "_Empty Trash"
 msgstr "_Vaciar papelera"
 
@@ -14886,25 +15021,45 @@ msgid "N_ever"
 msgstr "_Nunca"
 
 #: ../mail/mail.error.xml.h:141
+#, fuzzy
+#| msgid "Copying folder %s"
+msgid "Copy folder in folder tree."
+msgstr "Copiando la carpeta %s"
+
+#: ../mail/mail.error.xml.h:142
+msgid "Are you sure to copy folder '{0}' to folder '{1}'?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:143
+#, fuzzy
+#| msgid "Moving folder %s"
+msgid "Move folder in folder tree."
+msgstr "Moviendo la carpeta %s"
+
+#: ../mail/mail.error.xml.h:144
+msgid "Are you sure to move folder '{0}' to folder '{1}'?"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:145
 msgid "Signature Already Exists"
 msgstr "La firma ya existe"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:146
 msgid ""
 "A signature already exists with the name \"{0}\". Please specify a different "
 "name."
 msgstr ""
 "Ya existe una firma con el nombre «{0}». Especifique un nombre diferente."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "Blank Signature"
 msgstr "Firma en blanco"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduzca un nombre único para identificar esta firma."
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:149
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
@@ -14912,84 +15067,84 @@ msgstr ""
 "El mensaje no puede enviarse porque la cuenta con la que eligió enviar no "
 "está activada"
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:150
 msgid "Please enable the account or send using another account."
 msgstr "Active la cuenta o envíe usando otra cuenta."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Mail Deletion Failed"
 msgstr "Ha fallado el borrado del correo"
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:152
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "No tiene suficientes permisos para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:153
 msgid "\"Check Junk\" Failed"
 msgstr "Falló la comprobación de SPAM"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "\"Report Junk\" Failed"
 msgstr "Falló al informar de que es SPAM"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Not Junk\" Failed"
 msgstr "Falló al informar de que no es SPAM"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:156
 msgid "Remove duplicate messages?"
 msgstr "¿Quitar mensajes duplicados?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "No duplicate messages found."
 msgstr "No se encontró ningún correo duplicado."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:159
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "La carpeta «{0}» no contiene ningún correo duplicado."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to unsubscribe from folder."
 msgstr "Falló al desuscribirse de la carpeta."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Unable to retrieve message."
 msgstr "No se pudo obtener el mensaje."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:163
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to open folder."
 msgstr "Falló al abrir la carpeta."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to find duplicate messages."
 msgstr "Falló al buscar mensajes duplicados."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to retrieve messages."
 msgstr "Falló al obtener los mensajes."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Falló al quitar los adjuntos de los mensajes."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "Falló al descargar los mensajes para trabajar sin conexión"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Falló al guardar los mensajes al disco."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Existe un archivo oculto adjunto."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -14997,27 +15152,44 @@ msgstr ""
 "El adjunto de nombre {0} es un archivo oculto y puede contener datos "
 "sensibles. Revíselo antes de enviarlo."
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail.error.xml.h:172
+#| msgid "Print this calendar"
+msgid "Printing failed."
+msgstr "Falló al imprimir."
+
+#: ../mail/mail.error.xml.h:173
+#, fuzzy
+#| msgid "The reported error was &quot;{0}&quot;."
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "El error devuelto fue «{0}»."
+
+#: ../mail/mail.error.xml.h:174
+#, fuzzy
+#| msgid "Could not open destination"
+msgid "Could not perform this operation on {0}."
+msgstr "No se puede abrir el destino"
+
+#: ../mail/mail-send-recv.c:208
 msgid "Canceling..."
 msgstr "Cancelando…"
 
-#: ../mail/mail-send-recv.c:534
+#: ../mail/mail-send-recv.c:535
 msgid "Send & Receive Mail"
 msgstr "Enviar y recibir correo"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:551
 msgid "Cancel _All"
 msgstr "Cancelar _todo"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:1029
+#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:1036
 msgid "Updating..."
 msgstr "Actualizando…"
 
-#: ../mail/mail-send-recv.c:650 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:651 ../mail/mail-send-recv.c:737
 msgid "Waiting..."
 msgstr "Esperando…"
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1016
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando correo nuevo"
@@ -15076,7 +15248,7 @@ msgstr "?"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:208
+#: ../mail/message-list.c:1916 ../plugins/itip-formatter/itip-view.c:225
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
@@ -15134,11 +15306,6 @@ msgstr "Marcado"
 msgid "Received"
 msgstr "Recibido"
 
-#: ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
-msgid "Size"
-msgstr "Tamaño"
-
 #: ../mail/message-list.etspec.h:11
 msgid "Flag Status"
 msgstr "Marca de estado"
@@ -15164,27 +15331,27 @@ msgid "Subject or Addresses contains"
 msgstr "El asunto o las direcciones contienen"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Recipients contain"
 msgstr "El destinatario contiene"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Message contains"
 msgstr "El mensaje contiene"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1666
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
 msgid "Subject contains"
 msgstr "El asunto contiene"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1659
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Sender contains"
 msgstr "El remitente contiene"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Body contains"
 msgstr "El cuerpo contiene"
 
@@ -15455,7 +15622,7 @@ msgstr ""
 #: ../modules/calendar/e-cal-shell-view-actions.c:1405
 #: ../modules/calendar/e-memo-shell-view-actions.c:640
 #: ../modules/calendar/e-task-shell-view-actions.c:764
-#: ../modules/mail/e-mail-shell-view-actions.c:1271
+#: ../modules/mail/e-mail-shell-view-actions.c:1299
 msgid "_Rename..."
 msgstr "_Renombrar…"
 
@@ -15536,7 +15703,7 @@ msgstr "A_cciones"
 #: ../modules/addressbook/e-book-shell-view-actions.c:944
 #: ../modules/calendar/e-memo-shell-view-actions.c:677
 #: ../modules/calendar/e-task-shell-view-actions.c:829
-#: ../modules/mail/e-mail-shell-view-actions.c:1429
+#: ../modules/mail/e-mail-shell-view-actions.c:1457
 msgid "_Preview"
 msgstr "Vista _previa"
 
@@ -15548,7 +15715,7 @@ msgid "_Delete"
 msgstr "_Eliminar"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:957
-#: ../modules/mail/e-mail-shell-view-actions.c:1194
+#: ../modules/mail/e-mail-shell-view-actions.c:1222
 msgid "_Properties"
 msgstr "_Propiedades"
 
@@ -15575,7 +15742,7 @@ msgstr "Mostrar mapas en la ventana de vista previa de contactos"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1022
 #: ../modules/calendar/e-memo-shell-view-actions.c:747
 #: ../modules/calendar/e-task-shell-view-actions.c:911
-#: ../modules/mail/e-mail-shell-view-actions.c:1548
+#: ../modules/mail/e-mail-shell-view-actions.c:1576
 msgid "_Classic View"
 msgstr "Vista _clásica"
 
@@ -15586,7 +15753,7 @@ msgstr "Mostrar la vista previa del contacto bajo la lista de mensajes"
 #: ../modules/addressbook/e-book-shell-view-actions.c:1029
 #: ../modules/calendar/e-memo-shell-view-actions.c:754
 #: ../modules/calendar/e-task-shell-view-actions.c:918
-#: ../modules/mail/e-mail-shell-view-actions.c:1555
+#: ../modules/mail/e-mail-shell-view-actions.c:1583
 msgid "_Vertical View"
 msgstr "Vista _vertical"
 
@@ -15612,7 +15779,7 @@ msgstr "No coincidente"
 #: ../modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../modules/calendar/e-memo-shell-view-actions.c:781
 #: ../modules/calendar/e-task-shell-view-actions.c:980
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 #: ../shell/e-shell-content.c:664
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
@@ -16470,11 +16637,6 @@ msgstr "Selector de calendarios"
 msgid "Opening calendar at %s"
 msgstr "Abriendo el calendario en «%s»"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:232
-#: ../modules/calendar/e-cal-shell-view-actions.c:261
-msgid "Print"
-msgstr "Imprimir"
-
 #: ../modules/calendar/e-cal-shell-view-actions.c:320
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -17150,7 +17312,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: ../modules/mail/e-mail-attachment-handler.c:389
+#: ../modules/mail/e-mail-attachment-handler.c:390
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -17208,304 +17370,304 @@ msgstr "Asistente de cuentas de Evolution"
 msgid "Account Editor"
 msgstr "Editor de cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1180
+#: ../modules/mail/e-mail-shell-view-actions.c:1208
 #: ../modules/mail/e-mail-shell-view.c:947
 msgid "_Disable Account"
 msgstr "_Desactivar cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1182
+#: ../modules/mail/e-mail-shell-view-actions.c:1210
 msgid "Disable this account"
 msgstr "Desactivar esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1189
+#: ../modules/mail/e-mail-shell-view-actions.c:1217
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las carpetas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1196
+#: ../modules/mail/e-mail-shell-view-actions.c:1224
 msgid "Edit properties of this account"
 msgstr "Editar las propiedades de esta cuenta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1201
+#: ../modules/mail/e-mail-shell-view-actions.c:1229
 msgid "_Download Messages for Offline Usage"
 msgstr "_Descargar correos para trabajar sin conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1203
+#: ../modules/mail/e-mail-shell-view-actions.c:1231
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Descargar correos para las cuentas y carpetas marcadas para usar sin conexión"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1208
+#: ../modules/mail/e-mail-shell-view-actions.c:1236
 msgid "Fl_ush Outbox"
 msgstr "Enviar correos pe_ndientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Copy Folder To..."
 msgstr "_Copiar carpeta a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1217
+#: ../modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Copy the selected folder into another folder"
 msgstr "Copia la carpeta seleccionada en otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Permanently remove this folder"
 msgstr "Elimina permanentemente esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "E_xpunge"
 msgstr "_Purgar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1231
+#: ../modules/mail/e-mail-shell-view-actions.c:1259
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Elimina permanentemente todos los mensajes borrados de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1236
+#: ../modules/mail/e-mail-shell-view-actions.c:1264
 msgid "Mar_k All Messages as Read"
 msgstr "Marcar todos los mensajes como _leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1238
+#: ../modules/mail/e-mail-shell-view-actions.c:1266
 msgid "Mark all messages in the folder as read"
 msgstr "Marcar todos los mensajes en la carpeta como leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Move Folder To..."
 msgstr "_Mover carpeta a…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1245
+#: ../modules/mail/e-mail-shell-view-actions.c:1273
 msgid "Move the selected folder into another folder"
 msgstr "Mueve la carpeta seleccionada a otra carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_New..."
 msgstr "_Nueva…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1252
+#: ../modules/mail/e-mail-shell-view-actions.c:1280
 msgid "Create a new folder for storing mail"
 msgstr "Crea una carpeta nueva para almacenar correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1259
+#: ../modules/mail/e-mail-shell-view-actions.c:1287
 msgid "Change the properties of this folder"
 msgstr "Cambia las propiedades de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Refresh the folder"
 msgstr "Actualizar la carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1273
+#: ../modules/mail/e-mail-shell-view-actions.c:1301
 msgid "Change the name of this folder"
 msgstr "Cambia el nombre de esta carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Select Message _Thread"
 msgstr "Seleccionar con_versación del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1280
+#: ../modules/mail/e-mail-shell-view-actions.c:1308
 msgid "Select all messages in the same thread as the selected message"
 msgstr ""
 "Selecciona todos los correos en la misma conversación que el correo "
 "seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1285
+#: ../modules/mail/e-mail-shell-view-actions.c:1313
 msgid "Select Message S_ubthread"
 msgstr "Seleccionar s_ubconversación del mensaje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1287
+#: ../modules/mail/e-mail-shell-view-actions.c:1315
 msgid "Select all replies to the currently selected message"
 msgstr "Seleccionar todas las respuestas al mensaje actualmente seleccionado"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Empty _Trash"
 msgstr "_Vaciar papelera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1301
+#: ../modules/mail/e-mail-shell-view-actions.c:1329
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr ""
 "Eliminar permanentemente todos los correos borrados de todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_New Label"
 msgstr "Etiqueta n_ueva"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "N_one"
 msgstr "Ning_uno"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Manage Subscriptions"
 msgstr "Gestionar _suscripciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
-#: ../modules/mail/e-mail-shell-view-actions.c:1408
+#: ../modules/mail/e-mail-shell-view-actions.c:1359
+#: ../modules/mail/e-mail-shell-view-actions.c:1436
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Suscribirse o desuscribirse de carpetas alojadas en servidores remotos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1336
-#: ../modules/mail/e-mail-shell-view-actions.c:1357
+#: ../modules/mail/e-mail-shell-view-actions.c:1364
+#: ../modules/mail/e-mail-shell-view-actions.c:1385
 msgid "Send / _Receive"
 msgstr "Enviar / Reci_bir"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../modules/mail/e-mail-shell-view-actions.c:1366
 msgid "Send queued items and retrieve new items"
 msgstr "Envía el correo en la cola y obtiene el nuevo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1343
+#: ../modules/mail/e-mail-shell-view-actions.c:1371
 msgid "R_eceive All"
 msgstr "R_ecibir todo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1373
 msgid "Receive new items from all accounts"
 msgstr "Recibir correo nuevo para todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 msgid "_Send All"
 msgstr "_Enviar todo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1380
 msgid "Send queued items in all accounts"
 msgstr "Enviar todos los elementos en la cola de todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1378
+#: ../modules/mail/e-mail-shell-view-actions.c:1406
 #: ../widgets/misc/e-activity-proxy.c:313
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1380
+#: ../modules/mail/e-mail-shell-view-actions.c:1408
 msgid "Cancel the current mail operation"
 msgstr "Cancela la operación de correo actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1385
+#: ../modules/mail/e-mail-shell-view-actions.c:1413
 msgid "Collapse All _Threads"
 msgstr "_Contraer todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "Collapse all message threads"
 msgstr "Contrae todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1420
 msgid "E_xpand All Threads"
 msgstr "E_xpandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "Expand all message threads"
 msgstr "Expandir todas las conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "_Message Filters"
 msgstr "_Filtros de correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1401
+#: ../modules/mail/e-mail-shell-view-actions.c:1429
 msgid "Create or edit rules for filtering new mail"
 msgstr "Crear o editar reglas para el filtrado de correos nuevos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1434
 msgid "_Subscriptions..."
 msgstr "_Suscripciones…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "F_older"
 msgstr "_Carpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "_Label"
 msgstr "Etiq_ueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1439
+#: ../modules/mail/e-mail-shell-view-actions.c:1467
 msgid "C_reate Search Folder From Search..."
 msgstr "_Crear una carpeta de búsqueda desde la búsqueda…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Search F_olders"
 msgstr "Carpetas de búsque_da"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1448
+#: ../modules/mail/e-mail-shell-view-actions.c:1476
 msgid "Create or edit search folder definitions"
 msgstr "Crear o edita definiciones para carpetas de búsqueda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_New Folder..."
 msgstr "Carpeta _nueva…"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "Show Message _Preview"
 msgstr "Mostrar vista _previa del correo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1513
+#: ../modules/mail/e-mail-shell-view-actions.c:1541
 msgid "Show message preview pane"
 msgstr "Mostrar el correo en el panel de vista previa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Show _Deleted Messages"
 msgstr "Mostrar los mensajes _eliminados"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1549
 msgid "Show deleted messages with a line through them"
 msgstr "Mostrar los mensajes eliminados tachándolos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1527
+#: ../modules/mail/e-mail-shell-view-actions.c:1555
 msgid "_Group By Threads"
 msgstr "A_grupar por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1557
 msgid "Threaded message list"
 msgstr "Lista de correos por conversaciones"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1578
 msgid "Show message preview below the message list"
 msgstr "Mostrar la vista previa del correo bajo la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1585
 msgid "Show message preview alongside the message list"
 msgstr "Mostrar la vista previa del correo junto a la lista de mensajes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "All Messages"
 msgstr "Todos los correos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Important Messages"
 msgstr "Mensajes importantes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1579
+#: ../modules/mail/e-mail-shell-view-actions.c:1607
 msgid "Last 5 Days' Messages"
 msgstr "Mensajes de los últimos 5 días"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1586
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Messages Not Junk"
 msgstr "Mensajes que no son SPAM"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Messages with Attachments"
 msgstr "Mensajes con adjuntos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "No Label"
 msgstr "Sin etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Read Messages"
 msgstr "Mensajes leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 msgid "Recent Messages"
 msgstr "Mensajes recientes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "Unread Messages"
 msgstr "Mensajes no leídos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Subject or Addresses contain"
 msgstr "El asunto o las direcciones contienen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "All Accounts"
 msgstr "Todas las cuentas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Current Account"
 msgstr "Cuenta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Current Folder"
 msgstr "Carpeta actual"
 
@@ -17521,68 +17683,68 @@ msgstr "Búsqueda en la cuenta"
 msgid "Proxy _Logout"
 msgstr "_Cerrar sesión proxy"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
+#: ../modules/mail/e-mail-shell-view-private.c:949
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d seleccionado, "
 msgstr[1] "%d seleccionados, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1034
+#: ../modules/mail/e-mail-shell-view-private.c:960
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d borrado"
 msgstr[1] "%d borrados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1040
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:973
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "%d SPAM"
 msgstr[1] "%d SPAM"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:979
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "%d borrador"
 msgstr[1] "%d borradores"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1059
+#: ../modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d sin enviar"
 msgstr[1] "%d sin enviar"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1065
+#: ../modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d enviado"
 msgstr[1] "%d enviados"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1077
+#: ../modules/mail/e-mail-shell-view-private.c:1003
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d no leído, "
 msgstr[1] "%d no leídos, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../modules/mail/e-mail-shell-view-private.c:1006
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d en total"
 msgstr[1] "%d en total"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1103
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 msgid "Trash"
 msgstr "Papelera"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -17828,6 +17990,22 @@ msgstr "Bienvenido"
 msgid "Loading accounts..."
 msgstr "Cargando cuentas…"
 
+#: ../modules/web-inspector/evolution-web-inspector.c:88
+#, fuzzy
+#| msgid "_Select..."
+msgid "_Inspect..."
+msgstr "_Seleccionar…"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr ""
+
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+#, fuzzy
+#| msgid "Evolution Restore"
+msgid "Evolution Web Inspector"
+msgstr "Restaurador de Evolution"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
 msgstr "Libretas locales de direcciones"
@@ -18680,8 +18858,8 @@ msgstr ""
 "%s"
 
 #: ../plugins/google-account-setup/google-source.c:564
-#: ../plugins/mail-to-task/mail-to-task.c:840
-#: ../plugins/mail-to-task/mail-to-task.c:1103
+#: ../plugins/mail-to-task/mail-to-task.c:839
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 msgid "Unknown error."
 msgstr "Error desconocido."
 
@@ -18768,154 +18946,154 @@ msgstr "Configurar sus cuentas IMAP."
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Falló al cargar el calendario «%s» (%s)"
 
-#: ../plugins/itip-formatter/itip-formatter.c:665
+#: ../plugins/itip-formatter/itip-formatter.c:666
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Una cita en el calendario «%s» entra en conflicto con esta reunión"
 
-#: ../plugins/itip-formatter/itip-formatter.c:689
+#: ../plugins/itip-formatter/itip-formatter.c:690
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Se encontró la cita en el calendario «%s»"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find any calendars"
 msgstr "No se puede encontrar ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:809
+#: ../plugins/itip-formatter/itip-formatter.c:812
 msgid "Unable to find this meeting in any calendar"
 msgstr "No se puede encontrar esta reunión en ningún calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:813
+#: ../plugins/itip-formatter/itip-formatter.c:817
 msgid "Unable to find this task in any task list"
 msgstr "No se puede encontrar esta tarea en ninguna lista de tareas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:817
+#: ../plugins/itip-formatter/itip-formatter.c:822
 msgid "Unable to find this memo in any memo list"
 msgstr "No se puede encontrar esta nota en ninguna lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 msgid "Opening the calendar. Please wait..."
 msgstr "Abriendo el calendario. Espere…"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1122
+#: ../plugins/itip-formatter/itip-formatter.c:1132
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando una versión existente de esta cita"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1484
+#: ../plugins/itip-formatter/itip-formatter.c:1502
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "No es posible enviar el elemento al calendario «%s»: %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1498
+#: ../plugins/itip-formatter/itip-formatter.c:1517
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado al calendario «%s» como aceptado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1502
+#: ../plugins/itip-formatter/itip-formatter.c:1522
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado al calendario «%s» como tentativa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1507
+#: ../plugins/itip-formatter/itip-formatter.c:1528
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado al calendario «%s» como rehusado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1512
+#: ../plugins/itip-formatter/itip-formatter.c:1534
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado al calendario «%s» como cancelado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1581
-#: ../plugins/itip-formatter/itip-formatter.c:1974
-#: ../plugins/itip-formatter/itip-formatter.c:2065
+#: ../plugins/itip-formatter/itip-formatter.c:1604
+#: ../plugins/itip-formatter/itip-formatter.c:2021
+#: ../plugins/itip-formatter/itip-formatter.c:2128
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Guardando cambios en el calendario. Espere…"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Unable to parse item"
 msgstr "No es posible interpretar el elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1800
+#: ../plugins/itip-formatter/itip-formatter.c:1829
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "El organizador ha quitado al delegado %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1807
+#: ../plugins/itip-formatter/itip-formatter.c:1842
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1809
+#: ../plugins/itip-formatter/itip-formatter.c:1846
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "No es posible enviar una notificación de cancelación al delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../plugins/itip-formatter/itip-formatter.c:1895
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "No es posible actualizar la asistencia. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1861
+#: ../plugins/itip-formatter/itip-formatter.c:1902
 msgid "Attendee status updated"
 msgstr "Estado de asistencia actualizado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The meeting is invalid and cannot be updated"
 msgstr "La cita no es válida y no se puede actualizar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1947
+#: ../plugins/itip-formatter/itip-formatter.c:1994
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr ""
 "El estado de asistencia no pudo actualizarse debido a que el estado no es "
 "válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2004
-#: ../plugins/itip-formatter/itip-formatter.c:2042
+#: ../plugins/itip-formatter/itip-formatter.c:2058
+#: ../plugins/itip-formatter/itip-formatter.c:2098
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "El estado del participante no pudo actualizarse porque ya no existe el "
 "elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2086
+#: ../plugins/itip-formatter/itip-formatter.c:2157
 msgid "Meeting information sent"
 msgstr "Información de reunión enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2089
+#: ../plugins/itip-formatter/itip-formatter.c:2162
 msgid "Task information sent"
 msgstr "Información de la tarea enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../plugins/itip-formatter/itip-formatter.c:2167
 msgid "Memo information sent"
 msgstr "Información de la nota enviada"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2101
+#: ../plugins/itip-formatter/itip-formatter.c:2178
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "No se puede enviar la información de la reunión, la reunión no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2104
+#: ../plugins/itip-formatter/itip-formatter.c:2183
 msgid "Unable to send task information, the task does not exist"
 msgstr "No se puede enviar la información de la tarea, la tarea no existe"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2107
+#: ../plugins/itip-formatter/itip-formatter.c:2188
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "No se puede enviar la información de la nota, la nota no existe"
 
 #. Translators: This is a default filename for a calendar.
-#: ../plugins/itip-formatter/itip-formatter.c:2173
+#: ../plugins/itip-formatter/itip-formatter.c:2253
 msgid "calendar.ics"
 msgstr "calendario.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2178
+#: ../plugins/itip-formatter/itip-formatter.c:2258
 msgid "Save Calendar"
 msgstr "Guardar calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2241
-#: ../plugins/itip-formatter/itip-formatter.c:2252
+#: ../plugins/itip-formatter/itip-formatter.c:2310
+#: ../plugins/itip-formatter/itip-formatter.c:2322
 msgid "The calendar attached is not valid"
 msgstr "El calendario adjunto no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2242
-#: ../plugins/itip-formatter/itip-formatter.c:2253
+#: ../plugins/itip-formatter/itip-formatter.c:2311
+#: ../plugins/itip-formatter/itip-formatter.c:2323
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18923,15 +19101,15 @@ msgstr ""
 "El mensaje dice contener un calendario, pero el calendario no es un "
 "iCalendar válido."
 
-#: ../plugins/itip-formatter/itip-formatter.c:2293
-#: ../plugins/itip-formatter/itip-formatter.c:2321
-#: ../plugins/itip-formatter/itip-formatter.c:2432
+#: ../plugins/itip-formatter/itip-formatter.c:2364
+#: ../plugins/itip-formatter/itip-formatter.c:2393
+#: ../plugins/itip-formatter/itip-formatter.c:2491
 msgid "The item in the calendar is not valid"
 msgstr "El elemento en el calendario no es válido"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2294
-#: ../plugins/itip-formatter/itip-formatter.c:2322
-#: ../plugins/itip-formatter/itip-formatter.c:2433
+#: ../plugins/itip-formatter/itip-formatter.c:2365
+#: ../plugins/itip-formatter/itip-formatter.c:2394
+#: ../plugins/itip-formatter/itip-formatter.c:2492
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18939,11 +19117,11 @@ msgstr ""
 "El mensaje contiene un calendario, pero el calendario no contiene ningún "
 "acontecimiento, tarea o información de disponibilidad"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "The calendar attached contains multiple items"
 msgstr "El calendario adjunto contiene elementos múltiples"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2336
+#: ../plugins/itip-formatter/itip-formatter.c:2409
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18951,235 +19129,235 @@ msgstr ""
 "Para procesar todos estos elementos, el archivo debería guardarse y el "
 "calendario importarse"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2860
+#: ../plugins/itip-formatter/itip-formatter.c:2924
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ninguno"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2876
+#: ../plugins/itip-formatter/itip-formatter.c:2940
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2994
+#: ../plugins/itip-formatter/itip-formatter.c:3083
 msgid "This meeting recurs"
 msgstr "Esta reunión se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2997
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "This task recurs"
 msgstr "Esta tarea se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3089
 msgid "This memo recurs"
 msgstr "Esta nota se repite"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3231
+#: ../plugins/itip-formatter/itip-formatter.c:3394
 msgid "Meeting Invitations"
 msgstr "Invitaciones a reuniones"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3257
+#: ../plugins/itip-formatter/itip-formatter.c:3420
 msgid "_Delete message after acting"
 msgstr "_Eliminar el mensaje después de actuar"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3271
-#: ../plugins/itip-formatter/itip-formatter.c:3304
+#: ../plugins/itip-formatter/itip-formatter.c:3434
+#: ../plugins/itip-formatter/itip-formatter.c:3467
 msgid "Conflict Search"
 msgstr "Búsqueda de conflictos"
 
 #. Source selector
-#: ../plugins/itip-formatter/itip-formatter.c:3286
+#: ../plugins/itip-formatter/itip-formatter.c:3449
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Seleccione los calendario en los que buscar conflictos entre reuniones"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:199
+#: ../plugins/itip-formatter/itip-view.c:216
 msgid "Today %H:%M"
 msgstr "Hoy a las %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:203
+#: ../plugins/itip-formatter/itip-view.c:220
 msgid "Today %H:%M:%S"
 msgstr "Hoy a las %H:%M %S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:212
+#: ../plugins/itip-formatter/itip-view.c:229
 msgid "Today %l:%M:%S %p"
 msgstr "Hoy a las %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:227
+#: ../plugins/itip-formatter/itip-view.c:244
 msgid "Tomorrow %H:%M"
 msgstr "Mañana a las %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:231
+#: ../plugins/itip-formatter/itip-view.c:248
 msgid "Tomorrow %H:%M:%S"
 msgstr "Mañana a las %H:%M %S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:236
+#: ../plugins/itip-formatter/itip-view.c:253
 msgid "Tomorrow %l:%M %p"
 msgstr "Mañana a las %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:240
+#: ../plugins/itip-formatter/itip-view.c:257
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Mañana a las %l:%M:%S %p"
 
 #. strftime format of a weekday.
-#: ../plugins/itip-formatter/itip-view.c:259
+#: ../plugins/itip-formatter/itip-view.c:276
 #, c-format
 msgid "%A"
 msgstr "%A"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:264
+#: ../plugins/itip-formatter/itip-view.c:281
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:268
+#: ../plugins/itip-formatter/itip-view.c:285
 msgid "%A %H:%M:%S"
 msgstr "%A, %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:273
+#: ../plugins/itip-formatter/itip-view.c:290
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:277
+#: ../plugins/itip-formatter/itip-view.c:294
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../plugins/itip-formatter/itip-view.c:286
+#: ../plugins/itip-formatter/itip-view.c:303
 msgid "%A, %B %e"
 msgstr "%A, %e de %B"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:292
+#: ../plugins/itip-formatter/itip-view.c:309
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %e de %B a las %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:296
+#: ../plugins/itip-formatter/itip-view.c:313
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %e de %B a las %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:301
+#: ../plugins/itip-formatter/itip-view.c:318
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %e de %B a las %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:305
+#: ../plugins/itip-formatter/itip-view.c:322
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %e de %B a las %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../plugins/itip-formatter/itip-view.c:311
+#: ../plugins/itip-formatter/itip-view.c:328
 msgid "%A, %B %e, %Y"
 msgstr "%A, %e de %B de %Y"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:316
+#: ../plugins/itip-formatter/itip-view.c:333
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %e de %B de %Y a las %H:%M"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../plugins/itip-formatter/itip-view.c:320
+#: ../plugins/itip-formatter/itip-view.c:337
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %e de %B de %Y, a las %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../plugins/itip-formatter/itip-view.c:325
+#: ../plugins/itip-formatter/itip-view.c:342
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %e de %B de %Y, a las %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../plugins/itip-formatter/itip-view.c:329
+#: ../plugins/itip-formatter/itip-view.c:346
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y a las %l:%M:%S %p"
 
-#: ../plugins/itip-formatter/itip-view.c:367
-#: ../plugins/itip-formatter/itip-view.c:368
-#: ../plugins/itip-formatter/itip-view.c:455
-#: ../plugins/itip-formatter/itip-view.c:456
-#: ../plugins/itip-formatter/itip-view.c:543
+#: ../plugins/itip-formatter/itip-view.c:384
+#: ../plugins/itip-formatter/itip-view.c:385
+#: ../plugins/itip-formatter/itip-view.c:470
+#: ../plugins/itip-formatter/itip-view.c:471
+#: ../plugins/itip-formatter/itip-view.c:556
 msgid "An unknown person"
 msgstr "Una persona desconocida"
 
-#: ../plugins/itip-formatter/itip-view.c:372
-#: ../plugins/itip-formatter/itip-view.c:460
-#: ../plugins/itip-formatter/itip-view.c:547
+#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:475
+#: ../plugins/itip-formatter/itip-view.c:560
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Responda en nombre de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:374
-#: ../plugins/itip-formatter/itip-view.c:462
-#: ../plugins/itip-formatter/itip-view.c:549
+#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:562
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Recibido en nombre de %s"
 
-#: ../plugins/itip-formatter/itip-view.c:379
+#: ../plugins/itip-formatter/itip-view.c:396
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s ha publicado información de reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:381
+#: ../plugins/itip-formatter/itip-view.c:398
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s ha publicado la siguiente información de reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:386
+#: ../plugins/itip-formatter/itip-view.c:403
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s ha delegado la reunión siguiente en usted:"
 
-#: ../plugins/itip-formatter/itip-view.c:389
+#: ../plugins/itip-formatter/itip-view.c:406
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s solicita su presencia en la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:391
+#: ../plugins/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s solicita su presencia en la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:397
+#: ../plugins/itip-formatter/itip-view.c:414
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s desea apuntarse a una reunión existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:399
+#: ../plugins/itip-formatter/itip-view.c:416
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s desea apuntarse a una reunión existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:403
+#: ../plugins/itip-formatter/itip-view.c:420
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -19188,87 +19366,87 @@ msgstr ""
 "%s desea recibir la última información de la siguiente reunión a través de "
 "%s:"
 
-#: ../plugins/itip-formatter/itip-view.c:405
+#: ../plugins/itip-formatter/itip-view.c:422
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s desea recibir la última información para la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:409
+#: ../plugins/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s ha devuelto la siguiente respuesta a la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:411
+#: ../plugins/itip-formatter/itip-view.c:428
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s ha devuelto la siguiente respuesta a la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:415
+#: ../plugins/itip-formatter/itip-view.c:432
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s ha cancelado la siguiente reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:417
+#: ../plugins/itip-formatter/itip-view.c:434
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s ha cancelado la siguiente reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:421
+#: ../plugins/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s ha propuesto los siguientes cambios para la reunión a través de %s."
 
-#: ../plugins/itip-formatter/itip-view.c:423
+#: ../plugins/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s ha propuesto los siguientes cambios para la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:427
+#: ../plugins/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s ha rehusado los siguientes cambios para la reunión a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:429
+#: ../plugins/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s ha rehusado los siguientes cambios para la reunión:"
 
-#: ../plugins/itip-formatter/itip-view.c:467
+#: ../plugins/itip-formatter/itip-view.c:482
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s ha publicado la siguiente tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:469
+#: ../plugins/itip-formatter/itip-view.c:484
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s ha publicado la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:474
+#: ../plugins/itip-formatter/itip-view.c:489
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s solicita la asignación de %s para la siguiente tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:477
+#: ../plugins/itip-formatter/itip-view.c:492
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s le ha asignado una tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:479
+#: ../plugins/itip-formatter/itip-view.c:494
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s le ha asignado a usted una tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:485
+#: ../plugins/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s desea añadirse a una tarea existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:487
+#: ../plugins/itip-formatter/itip-view.c:502
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s desea añadirse a una tarea existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:491
+#: ../plugins/itip-formatter/itip-view.c:506
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -19277,202 +19455,202 @@ msgstr ""
 "%s desea recibir la última información para la siguiente tarea asignada a "
 "través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:493
+#: ../plugins/itip-formatter/itip-view.c:508
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr ""
 "%s quiere recibir la última información para la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:497
+#: ../plugins/itip-formatter/itip-view.c:512
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr ""
 "%s ha devuelto la siguiente respuesta a la tarea asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:499
+#: ../plugins/itip-formatter/itip-view.c:514
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s ha devuelto la siguiente respuesta a la tarea:"
 
-#: ../plugins/itip-formatter/itip-view.c:503
+#: ../plugins/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s ha cancelado la siguiente asignación de tarea a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:505
+#: ../plugins/itip-formatter/itip-view.c:520
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s ha cancelado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:509
+#: ../plugins/itip-formatter/itip-view.c:524
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr ""
 "%s ha propuesto los siguientes cambios en la asignación de tareas a través "
 "de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:511
+#: ../plugins/itip-formatter/itip-view.c:526
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s ha propuesto los siguientes cambios en la asignación de tareas:"
 
-#: ../plugins/itip-formatter/itip-view.c:515
+#: ../plugins/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s ha rehusado la siguiente tarea asignada a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:517
+#: ../plugins/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s ha rehusado la siguiente tarea asignada:"
 
-#: ../plugins/itip-formatter/itip-view.c:554
+#: ../plugins/itip-formatter/itip-view.c:567
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s ha publicado la siguiente nota a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:556
+#: ../plugins/itip-formatter/itip-view.c:569
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s ha publicado la siguiente nota:"
 
-#: ../plugins/itip-formatter/itip-view.c:561
+#: ../plugins/itip-formatter/itip-view.c:574
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s desea añadir algo a una nota existente a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:563
+#: ../plugins/itip-formatter/itip-view.c:576
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s desea añadir algo a una nota existente:"
 
-#: ../plugins/itip-formatter/itip-view.c:567
+#: ../plugins/itip-formatter/itip-view.c:580
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s ha cancelado la siguiente nota compartida a través de %s:"
 
-#: ../plugins/itip-formatter/itip-view.c:569
+#: ../plugins/itip-formatter/itip-view.c:582
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s ha cancelado la siguiente nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:693
+#: ../plugins/itip-formatter/itip-view.c:652
 msgid "All day:"
 msgstr "Todo el día:"
 
-#: ../plugins/itip-formatter/itip-view.c:703
+#: ../plugins/itip-formatter/itip-view.c:658
 msgid "Start day:"
 msgstr "Día de inicio:"
 
-#. Start time
-#: ../plugins/itip-formatter/itip-view.c:703
-#: ../plugins/itip-formatter/itip-view.c:1061
+#: ../plugins/itip-formatter/itip-view.c:658
+#: ../plugins/itip-formatter/itip-view.c:1164
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
-#: ../plugins/itip-formatter/itip-view.c:715
+#: ../plugins/itip-formatter/itip-view.c:667
 msgid "End day:"
 msgstr "Día de fin:"
 
-#. End time
-#: ../plugins/itip-formatter/itip-view.c:715
-#: ../plugins/itip-formatter/itip-view.c:1072
+#: ../plugins/itip-formatter/itip-view.c:667
+#: ../plugins/itip-formatter/itip-view.c:1165
 msgid "End time:"
 msgstr "Hora de fin:"
 
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "_Abrir calendario"
-
-#: ../plugins/itip-formatter/itip-view.c:857
-#: ../plugins/itip-formatter/itip-view.c:861
-#: ../plugins/itip-formatter/itip-view.c:867
-#: ../plugins/itip-formatter/itip-view.c:884
-#: ../plugins/itip-formatter/itip-view.c:889
-msgid "_Decline"
-msgstr "_Rechazar"
-
-#: ../plugins/itip-formatter/itip-view.c:858
-#: ../plugins/itip-formatter/itip-view.c:863
-#: ../plugins/itip-formatter/itip-view.c:870
-#: ../plugins/itip-formatter/itip-view.c:886
-#: ../plugins/itip-formatter/itip-view.c:891
-msgid "A_ccept"
-msgstr "A_ceptar"
-
-#: ../plugins/itip-formatter/itip-view.c:861
-msgid "_Decline all"
-msgstr "_Rechazar todo"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "_Provisional todo"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-#: ../plugins/itip-formatter/itip-view.c:868
-#: ../plugins/itip-formatter/itip-view.c:885
-#: ../plugins/itip-formatter/itip-view.c:890
-msgid "_Tentative"
-msgstr "_Provisional"
-
-#: ../plugins/itip-formatter/itip-view.c:863
-msgid "A_ccept all"
-msgstr "A_ceptar todo"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:874
-msgid "_Send Information"
-msgstr "_Enviar información"
-
-#. FIXME Is this really the right button?
-#: ../plugins/itip-formatter/itip-view.c:878
-msgid "_Update Attendee Status"
-msgstr "_Actualizar el estado del participante"
-
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "_Actualizar"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
-msgid "Comment:"
-msgstr "Comentario:"
+#: ../plugins/itip-formatter/itip-view.c:1099
+#| msgid "_Open Calendar"
+msgid "Open Calendar"
+msgstr "Abrir calendario"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "_Responder al remitente"
+#: ../plugins/itip-formatter/itip-view.c:1102
+#| msgid "_Decline all"
+msgid "Decline all"
+msgstr "Rechazar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "Mandar _actualizaciones a los participantes"
+#: ../plugins/itip-formatter/itip-view.c:1105
+msgid "Decline"
+msgstr "Rehusar"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "_Aplicar a todas las instancias"
+#: ../plugins/itip-formatter/itip-view.c:1108
+#| msgid "_Tentative all"
+msgid "Tentative all"
+msgstr "Provisional todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "Mostrar hora como _libre"
+#: ../plugins/itip-formatter/itip-view.c:1114
+#| msgid "A_ccept all"
+msgid "Accept all"
+msgstr "Aceptar todo"
 
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "Conser_var mi recordatorio"
+#: ../plugins/itip-formatter/itip-view.c:1117
+msgid "Accept"
+msgstr "Aceptar"
 
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "_Heredar recordatorio"
+#: ../plugins/itip-formatter/itip-view.c:1120
+#| msgid "_Send Information"
+msgid "Send Information"
+msgstr "Enviar información"
 
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "_Tareas:"
+#: ../plugins/itip-formatter/itip-view.c:1123
+#| msgid "_Update Attendee Status"
+msgid "Update Attendee Status"
+msgstr "_Actualizar el estado del participant"
 
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "_Notas:"
+#: ../plugins/itip-formatter/itip-view.c:1126
+msgid "Update"
+msgstr "Actualizar"
+
+#: ../plugins/itip-formatter/itip-view.c:1167
+#: ../plugins/itip-formatter/itip-view.c:1209
+#: ../plugins/itip-formatter/itip-view.c:1275
+msgid "Comment:"
+msgstr "Comentario:"
+
+#. RSVP area
+#: ../plugins/itip-formatter/itip-view.c:1198
+#| msgid "Send _reply to sender"
+msgid "Send reply to sender"
+msgstr "Responder al remitente"
+
+#. Updates
+#: ../plugins/itip-formatter/itip-view.c:1212
+#| msgid "Send _updates to attendees"
+msgid "Send updates to attendees"
+msgstr "Enviar actualizaciones a los participantes"
+
+#. The recurrence check button
+#: ../plugins/itip-formatter/itip-view.c:1215
+#| msgid "_Apply to all instances"
+msgid "Apply to all instances"
+msgstr "Aplicar a todas las instancias"
+
+#: ../plugins/itip-formatter/itip-view.c:1216
+#| msgid "Show time as _free"
+msgid "Show time as free"
+msgstr "Mostrar hora como libre"
+
+#: ../plugins/itip-formatter/itip-view.c:1217
+#| msgid "_Preserve my reminder"
+msgid "Preserve my reminder"
+msgstr "Conservar mi recordatorio"
+
+#: ../plugins/itip-formatter/itip-view.c:1218
+#| msgid "_Inherit reminder"
+msgid "Inherit reminder"
+msgstr "Heredar recordatorio"
+
+#: ../plugins/itip-formatter/itip-view.c:1542
+#| msgid "_Tasks:"
+msgid "Tasks:"
+msgstr "Tareas:"
+
+#: ../plugins/itip-formatter/itip-view.c:1545
+#| msgid "_Memos:"
+msgid "Memos:"
+msgstr "Notas:"
+
+#: ../plugins/itip-formatter/itip-view.c:2862
+msgid "Save"
+msgstr "Guardar"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Itip Formatter"
@@ -19747,12 +19925,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Le notifica cuando llega un mensaje de correo nuevo."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:243
+#: ../plugins/mail-to-task/mail-to-task.c:242
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Creado desde un correo de %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:618
+#: ../plugins/mail-to-task/mail-to-task.c:617
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19761,7 +19939,7 @@ msgstr ""
 "El calendario seleccionado ya contiene el acontecimiento «%s». ¿Quiere "
 "editar el acontecimiento antiguo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:621
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19770,7 +19948,7 @@ msgstr ""
 "La lista de tareas seleccionada ya contiene la tarea «%s». ¿Quiere editar la "
 "tarea antigua?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:624
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19780,7 +19958,7 @@ msgstr ""
 "nota antigua?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:643
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19796,7 +19974,7 @@ msgstr[1] ""
 "añadirlos todos?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19812,7 +19990,7 @@ msgstr[1] ""
 "añadirlos todos?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:655
+#: ../plugins/mail-to-task/mail-to-task.c:654
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19827,29 +20005,29 @@ msgstr[1] ""
 "Ha seleccionado %d correos para convertirlos en notas. ¿Realmente quiere "
 "añadirlos todos?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:676
+#: ../plugins/mail-to-task/mail-to-task.c:675
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "¿Quiere continuar convirtiendo los correos restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Sin resumen]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:762
 msgid "Invalid object returned from a server"
 msgstr "Un servidor devolvió un objeto no válido"
 
-#: ../plugins/mail-to-task/mail-to-task.c:815
+#: ../plugins/mail-to-task/mail-to-task.c:814
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Ocurrió un error al procesar: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:840
+#: ../plugins/mail-to-task/mail-to-task.c:839
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "No se puede abrir el calendario. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:847
+#: ../plugins/mail-to-task/mail-to-task.c:846
 msgid ""
 "Selected source is read only, thus cannot create event there. Select other "
 "source, please."
@@ -19857,7 +20035,7 @@ msgstr ""
 "El origen seleccionado es de sólo lectura, por ello no se puede crear un "
 "acontecimiento en él. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:850
+#: ../plugins/mail-to-task/mail-to-task.c:849
 msgid ""
 "Selected source is read only, thus cannot create task there. Select other "
 "source, please."
@@ -19865,7 +20043,7 @@ msgstr ""
 "El origen seleccionado es de sólo lectura, por ello no se puede crear una "
 "tarea en él. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:853
+#: ../plugins/mail-to-task/mail-to-task.c:852
 msgid ""
 "Selected source is read only, thus cannot create memo there. Select other "
 "source, please."
@@ -19873,44 +20051,44 @@ msgstr ""
 "El origen seleccionado es de sólo lectura, por ello no se puede crear una "
 "nota en él. Seleccione otro origen."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1103
+#: ../plugins/mail-to-task/mail-to-task.c:1100
 #, c-format
 msgid "Cannot get source list. %s"
 msgstr "No se pudo obtener la lista de origen. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1164
+#: ../plugins/mail-to-task/mail-to-task.c:1161
 msgid "No writable calendar is available."
 msgstr "No hay ningún calendario escribible disponible."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create an _Event"
 msgstr "Crear un _acontecimiento"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1260
+#: ../plugins/mail-to-task/mail-to-task.c:1257
 msgid "Create a new event from the selected message"
 msgstr "Crear un acontecimiento nuevo del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1265
+#: ../plugins/mail-to-task/mail-to-task.c:1262
 msgid "Create a Mem_o"
 msgstr "Crear una _nota"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1267
+#: ../plugins/mail-to-task/mail-to-task.c:1264
 msgid "Create a new memo from the selected message"
 msgstr "Crear una nota nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create a _Task"
 msgstr "Crear una _tarea"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1274
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new task from the selected message"
 msgstr "Crear una tarea nueva del mensaje seleccionado"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a _Meeting"
 msgstr "Crear una _reunión"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1281
 msgid "Create a new meeting from the selected message"
 msgstr "Crear una reunión nueva del mensaje seleccionado"
 
@@ -19963,19 +20141,19 @@ msgstr "Modo de texto sin formato"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver los mensajes de correo en texto plano, incluso si contienen HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:246
 msgid "Show HTML if present"
 msgstr "Mostrar HTML si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:251
+#: ../plugins/prefer-plain/prefer-plain.c:247
 msgid "Let Evolution choose the best part to show."
 msgstr "Permitir que Evolution elija la mejor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:254
+#: ../plugins/prefer-plain/prefer-plain.c:250
 msgid "Show plain text if present"
 msgstr "Mostrar texto plano si está presente"
 
-#: ../plugins/prefer-plain/prefer-plain.c:255
+#: ../plugins/prefer-plain/prefer-plain.c:251
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19983,11 +20161,11 @@ msgstr ""
 "Mostrar la parte en texto plano si está presente, de otra forma dejar que "
 "Evolution elija la mejor parte para mostrar."
 
-#: ../plugins/prefer-plain/prefer-plain.c:259
+#: ../plugins/prefer-plain/prefer-plain.c:255
 msgid "Only ever show plain text"
 msgstr "Sólo mostrar texto plano"
 
-#: ../plugins/prefer-plain/prefer-plain.c:260
+#: ../plugins/prefer-plain/prefer-plain.c:256
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19995,11 +20173,11 @@ msgstr ""
 "Mostrar siempre parte en texto plano y, si se solicita, crear adjuntos de "
 "otras partes."
 
-#: ../plugins/prefer-plain/prefer-plain.c:311
+#: ../plugins/prefer-plain/prefer-plain.c:307
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostrar las partes HTML s_uprimidas como adjuntos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:333
+#: ../plugins/prefer-plain/prefer-plain.c:329
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -20370,30 +20548,32 @@ msgstr "vCards en línea"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar vCards directamente en los mensajes de correo."
 
-#: ../plugins/vcard-inline/vcard-inline.c:208
-#: ../plugins/vcard-inline/vcard-inline.c:293
+#: ../plugins/vcard-inline/vcard-inline.c:236
+#: ../plugins/vcard-inline/vcard-inline.c:351
 msgid "Show Full vCard"
 msgstr "Mostrar vCard completa"
 
-#: ../plugins/vcard-inline/vcard-inline.c:211
+#: ../plugins/vcard-inline/vcard-inline.c:243
+#: ../plugins/vcard-inline/vcard-inline.c:354
 msgid "Show Compact vCard"
 msgstr "Mostrar vCard compacta"
 
-#: ../plugins/vcard-inline/vcard-inline.c:272
+#: ../plugins/vcard-inline/vcard-inline.c:372
+#| msgid "Save in Address Book"
+msgid "Save To Addressbook"
+msgstr "Guardar en la libreta de direcciones"
+
+#: ../plugins/vcard-inline/vcard-inline.c:381
 msgid "There is one other contact."
 msgstr "Hay otro contacto más."
 
-#: ../plugins/vcard-inline/vcard-inline.c:281
+#: ../plugins/vcard-inline/vcard-inline.c:387
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
 msgstr[0] "Hay %d contacto más."
 msgstr[1] "Hay otros %d contactos."
 
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "Guardar en la libreta de direcciones"
-
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "WebDAV contacts"
 msgstr "Contactos WebDAV"
@@ -22275,48 +22455,49 @@ msgstr ""
 msgid "Evolution Preferences"
 msgstr "Preferencias de Evolution"
 
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "Coincide con: %d"
+#| msgid "Matches: %d"
+msgid "Matches: %u"
+msgstr "Coincide con: %u"
 
-#: ../widgets/misc/e-search-bar.c:566
+#: ../widgets/misc/e-search-bar.c:527
 msgid "Close the find bar"
 msgstr "Cerrar la barra de búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:574
+#: ../widgets/misc/e-search-bar.c:535
 msgid "Fin_d:"
 msgstr "_Buscar:"
 
-#: ../widgets/misc/e-search-bar.c:586
+#: ../widgets/misc/e-search-bar.c:547
 msgid "Clear the search"
 msgstr "Limpiar la búsqueda"
 
-#: ../widgets/misc/e-search-bar.c:610
+#: ../widgets/misc/e-search-bar.c:571
 msgid "_Previous"
 msgstr "_Anterior"
 
-#: ../widgets/misc/e-search-bar.c:616
+#: ../widgets/misc/e-search-bar.c:577
 msgid "Find the previous occurrence of the phrase"
 msgstr "Buscar la coincidencia anterior de la frase"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar la siguiente coincidencia de la frase"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
 msgstr "_Coincidir con capitalización"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "Se llegó al final de la página, continuando desde el principio"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "Se llegó al principio de la página, continuando desde el final"
 
@@ -22508,49 +22689,53 @@ msgstr "El script debe ser ejecutable."
 msgid "Click here to go to URL"
 msgstr "Pulse aquí para ir a la URL"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:271 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:273 ../widgets/misc/e-web-view-gtkhtml.c:411
 msgid "Copy the link to the clipboard"
 msgstr "Copiar el enlace al portapapeles"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:281 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:283 ../widgets/misc/e-web-view-gtkhtml.c:421
 msgid "Open the link in a web browser"
 msgstr "_Abrir enlace en el navegador"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:291 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "_Copy Email Address"
 msgstr "_Copiar dirección de correo-e"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:308 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "_Copy Image"
 msgstr "_Copiar imagen"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../widgets/misc/e-web-view.c:310 ../widgets/misc/e-web-view-gtkhtml.c:448
 msgid "Copy the image to the clipboard"
 msgstr "Copiar la imagen al portapapeles"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:330 ../widgets/misc/e-web-view.c:1396
+#: ../widgets/misc/e-web-view-gtkhtml.c:468
+#: ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Select all text and images"
 msgstr "Seleccionar todo el texto y las imágenes"
 
-#: ../widgets/misc/e-web-view.c:982 ../widgets/misc/e-web-view.c:984
-#: ../widgets/misc/e-web-view.c:986
+#: ../widgets/misc/e-web-view.c:1053 ../widgets/misc/e-web-view.c:1055
+#: ../widgets/misc/e-web-view.c:1057 ../widgets/misc/e-web-view-gtkhtml.c:957
+#: ../widgets/misc/e-web-view-gtkhtml.c:959
+#: ../widgets/misc/e-web-view-gtkhtml.c:961
 #, c-format
 msgid "Click to call %s"
 msgstr "Pulse para llamar a %s"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1059 ../widgets/misc/e-web-view-gtkhtml.c:963
 msgid "Click to hide/unhide addresses"
 msgstr "Pulse para ocultar/mostrar las direcciones"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1061 ../widgets/misc/e-web-view-gtkhtml.c:965
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
@@ -22832,6 +23017,36 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "Métodos de entrada"
 
+#~ msgid "GAIM address book source"
+#~ msgstr "Libreta de direcciones fuente de GAIM"
+
+#~ msgid "Formatting message"
+#~ msgstr "Formateando el mensaje"
+
+#~ msgid "Formatting Message..."
+#~ msgstr "Formateando el mensaje…"
+
+#~ msgid "Retrieving '%s'"
+#~ msgstr "Obteniendo «%s»"
+
+#~ msgid "Unknown external-body part."
+#~ msgstr "Parte externa al cuerpo del mensaje desconocida."
+
+#~ msgid "No HTML stream available"
+#~ msgstr "No hay un flujo HTML disponible"
+
+#~ msgid "_Decline"
+#~ msgstr "_Rechazar"
+
+#~ msgid "A_ccept"
+#~ msgstr "A_ceptar"
+
+#~ msgid "_Tentative"
+#~ msgstr "_Provisional"
+
+#~ msgid "_Update"
+#~ msgstr "_Actualizar"
+
 #~ msgid "FIXME"
 #~ msgstr "ARREGLAR"
 
@@ -23245,15 +23460,9 @@ msgstr "Métodos de entrada"
 #~ msgid "Retract Mail"
 #~ msgstr "Retractar correo"
 
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
 #~ msgid "Accept Tentatively"
 #~ msgstr "Aceptar provisionalmente"
 
-#~ msgid "Decline"
-#~ msgstr "Rehusar"
-
 #~ msgid "Rese_nd Meeting..."
 #~ msgstr "Reen_viar reunión…"
 
@@ -23865,9 +24074,6 @@ msgstr "Métodos de entrada"
 #~ msgid "Choose an action:"
 #~ msgstr "Elija una acción:"
 
-#~ msgid "Update"
-#~ msgstr "Actualizar"
-
 #~ msgid "Tentatively accept"
 #~ msgstr "Aceptar provisionalmente"
 
@@ -24363,9 +24569,6 @@ msgstr "Métodos de entrada"
 #~ "Mostrar los núme_ros de las semanas en la Vista diaria y en la Vista de "
 #~ "la semana laboral"
 
-#~ msgid "Save"
-#~ msgstr "Guardar"
-
 #~ msgid "_From Field"
 #~ msgstr "Campo «_De»"
author	Daniel Mustieles <daniel.mustieles@gmail.com>	2012-04-08 19:24:18 +0800
committer	Daniel Mustieles <daniel.mustieles@gmail.com>	2012-04-08 19:24:18 +0800
commit	badaccb764e06533511395e721d967b6f478e50f (patch)
tree	5e3ba13e2bc9ed1644585c1df644206f145fb203 /po
parent	08448ba671520359257818e46a0527f67f72d85e (diff)
download	gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.gz gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.bz2 gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.lz gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.xz gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.tar.zst gsoc2013-evolution-badaccb764e06533511395e721d967b6f478e50f.zip