[evolution] Updated Galician translations

From: Francisco DiÃguez Souto <frandieguez src gnome org>
To: commits-list gnome org
Cc:
Subject: [evolution] Updated Galician translations
Date: Thu, 19 Apr 2012 18:08:33 +0000 (UTC)
commit 6e959fcf909171cb0279c2eca9f0345fa11048f6
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Thu Apr 19 20:08:17 2012 +0200

    Updated Galician translations

 po/gl.po | 2890 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 1554 insertions(+), 1336 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 18c52cc..4ea5c4d 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -18,13 +18,13 @@
 # Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011.
 # Fran Dieguez <frandieguez gnome org>, 2010, 2011, 2012.
 #
-#: ../shell/main.c:570
+#: ../shell/main.c:575
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-04 20:08+0100\n"
-"PO-Revision-Date: 2012-03-04 20:08+0100\n"
+"POT-Creation-Date: 2012-04-19 19:53+0200\n"
+"PO-Revision-Date: 2012-04-19 20:08+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
 "Language-Team: Galician <gnome-l10n-gl gnome org>\n"
 "Language: gl\n"
@@ -35,7 +35,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
-msgstr "Non foi posÃbel abrir esta axenda de enderezosen "
+msgstr "Non foi posÃbel abrir esta axenda de enderezos."
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -284,7 +284,7 @@ msgstr ""
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:628
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2911
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2926
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -322,9 +322,8 @@ msgstr "_Desexa recibir o correo en 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"
@@ -350,7 +349,6 @@ msgstr "PÃxi_na web:"
 #: ../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:"
 
@@ -367,6 +365,7 @@ msgid "Home Page:"
 msgstr "PÃxina web:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
+#: ../plugins/itip-formatter/itip-view.c:1539
 msgid "Calendar:"
 msgstr "_Calendario:"
 
@@ -441,8 +440,8 @@ msgid "_Anniversary:"
 msgstr "_Aniversario:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-display.c:729
-#: ../calendar/gui/e-calendar-view.c:2076
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:721
+#: ../calendar/gui/e-calendar-view.c:2131
 msgid "Anniversary"
 msgstr "Aniversario"
 
@@ -452,9 +451,9 @@ 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
-#: ../calendar/gui/e-calendar-view.c:2075 ../capplet/anjal-settings-main.c:83
-#: ../shell/main.c:133
+#: ../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"
 msgstr "Aniversario"
 
@@ -493,25 +492,25 @@ msgstr "_Enderezo:"
 
 #: ../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
-#: ../widgets/misc/e-contact-map.c:296
+#: ../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 "Particular"
 
 #: ../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
-#: ../widgets/misc/e-contact-map.c:304
+#: ../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 "Traballo"
 
 #: ../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 "Outros"
@@ -525,42 +524,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"
 
@@ -578,20 +577,20 @@ msgid "Error removing contact"
 msgstr "Produciuse un erro ao eliminar o contacto"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:644
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2905
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2920
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3386
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3401
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3387
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3402
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3714
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3729
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -599,28 +598,28 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3720
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%sÂ ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3742
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "Â%sÂ non pode ser unha data no futuro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3735
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3750
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%sÂ ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3748
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3762
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3763
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%sÂ estÃ baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3777
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3792
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
@@ -817,7 +816,7 @@ msgstr "O correo comeza por"
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
 #: ../modules/addressbook/e-book-shell-view-actions.c:1063
-#: ../modules/calendar/e-cal-shell-view-actions.c:1734
+#: ../modules/calendar/e-cal-shell-view-actions.c:1776
 #: ../modules/calendar/e-memo-shell-view-actions.c:788
 #: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Any field contains"
@@ -829,116 +828,121 @@ msgstr "Calquera campo contÃn"
 msgid "evolution address book"
 msgstr "axenda de enderezos do Evolution"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:191
+#: ../addressbook/gui/widgets/eab-contact-display.c:155
 msgid "Copy _Email Address"
 msgstr "Copiar o _enderezo de correo"
 
-#: ../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:297 ../widgets/misc/e-web-view-gtkhtml.c:431
 msgid "Copy the email address to the clipboard"
 msgstr "Copiar o enderezo de correo ao portapapeis"
 
-#: ../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:302 ../widgets/misc/e-web-view-gtkhtml.c:436
 msgid "_Send New Message To..."
 msgstr "Enviar unha men_saxe nova 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:304 ../widgets/misc/e-web-view-gtkhtml.c:438
 msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:227
+#: ../addressbook/gui/widgets/eab-contact-display.c:301
+#: ../widgets/misc/e-web-view.c:1065 ../widgets/misc/e-web-view-gtkhtml.c:955
+#, c-format
+msgid "Click to mail %s"
+msgstr "Prema para enviar un 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 "Membros da lista:"
 
-#: ../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 "Alcume"
 
-#: ../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 "Cargo"
 
-#: ../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 "Director"
 
-#: ../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 "Secretaria/o"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:700
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Video Chat"
 msgstr "Videoconferencia"
 
-#: ../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
-#: ../modules/calendar/e-cal-shell-view.c:528
+#: ../modules/calendar/e-cal-shell-view.c:606
 #: ../modules/online-accounts/e-online-accounts-google.c:302
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 #: ../widgets/misc/e-send-options.c:546
 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 "DispoÃibilidade"
 
-#: ../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 "Enderezo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:722
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:715
 msgid "Home Page"
 msgstr "PÃxina persoal"
 
-#: ../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Ãbil"
 
-#: ../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Ãnxuxe"
@@ -947,7 +951,7 @@ msgstr "CÃnxuxe"
 #. 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
@@ -960,33 +964,27 @@ msgstr "CÃnxuxe"
 msgid "Personal"
 msgstr "Persoal"
 
-#: ../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 "Membros da lista"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1040
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:964
 msgid "Job Title"
 msgstr "Posto de traballo"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1077
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1005
 msgid "Home page"
 msgstr "PÃxina web"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1086
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1015
 msgid "Blog"
 msgstr "Blogue"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:1285
-#: ../widgets/misc/e-web-view.c:980
-#, c-format
-msgid "Click to mail %s"
-msgstr "Prema para enviar un 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 "Non foi posÃbel obter unha lista das axendas de enderezos: %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:683 ../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 "Erro descoÃecido"
@@ -1653,11 +1651,11 @@ msgstr "minutos"
 msgid "location of appointment"
 msgstr "localizaciÃn da 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 "LocalizaciÃn:"
 
@@ -2191,6 +2189,14 @@ msgstr ""
 "problemas ao usar o Evolution. Para mellorar os resultados, o servidor "
 "deberÃa anovarse a unha versiÃn compatÃbel."
 
+#: ../calendar/calendar.error.xml.h:91
+msgid "Could not perform this operation."
+msgstr "Non foi posÃbel levar a cabo 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 "Debe estar traballando en liÃa para completar esta operaciÃn."
+
 #: ../calendar/gui/calendar-view-factory.c:88
 msgid "Day View"
 msgstr "Vista diaria"
@@ -2296,6 +2302,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 "Anexos"
 
@@ -2514,7 +2521,7 @@ msgstr "Co_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"
@@ -2650,17 +2657,19 @@ msgstr "Desexa gardar o elemento orixinal?"
 msgid "Close the current window"
 msgstr "Pechar a xanela 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:324 ../widgets/misc/e-web-view.c:1398
+#: ../widgets/misc/e-web-view-gtkhtml.c:458
+#: ../widgets/misc/e-web-view-gtkhtml.c:1281
 msgid "Copy the selection"
 msgstr "Copiar a 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:1392 ../widgets/misc/e-web-view-gtkhtml.c:1275
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
@@ -2674,10 +2683,10 @@ msgstr "Eliminar a selecciÃn"
 msgid "View help"
 msgstr "Ver a axuda"
 
-#: ../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:1404 ../widgets/misc/e-web-view-gtkhtml.c:1287
 msgid "Paste the clipboard"
 msgstr "Pegar o contido do portapapeis"
 
@@ -2685,7 +2694,7 @@ msgstr "Pegar o contido do portapapeis"
 msgid "Save current changes"
 msgstr "Gardar os cambios actuais"
 
-#: ../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"
@@ -2697,14 +2706,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"
@@ -2724,7 +2733,7 @@ msgstr "_Inserir"
 msgid "_Options"
 msgstr "_OpciÃns"
 
-#: ../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 "_Vista"
@@ -2826,7 +2835,7 @@ msgstr ""
 "actualizaciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../plugins/prefer-plain/prefer-plain.c:66
+#: ../plugins/prefer-plain/prefer-plain.c:64
 msgid "attachment"
 msgstr "anexo"
 
@@ -3250,7 +3259,7 @@ msgid "Select Date"
 msgstr "Seleccionar unha data"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1363
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Select _Today"
 msgstr "Seleccionar o dÃa de _hoxe"
 
@@ -3283,10 +3292,10 @@ msgstr ""
 msgid "Unable to open memos in '%s': %s"
 msgstr "Non Ã posÃbel abrir as 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:2286
+#: ../mail/em-format-html.c:2309 ../mail/message-list.etspec.h:9
+#: ../modules/mail/em-mailer-prefs.c:72
 msgid "To"
 msgstr "Para"
 
@@ -3593,7 +3602,7 @@ msgstr "PÃxina 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"
@@ -3601,7 +3610,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
@@ -3610,7 +3619,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"
@@ -3625,7 +3634,7 @@ msgstr "Sen 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
@@ -3635,7 +3644,7 @@ msgstr "Non iniciada"
 
 #. 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
@@ -3646,7 +3655,7 @@ msgstr "En progreso"
 
 #. 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
@@ -3659,13 +3668,11 @@ msgstr "Completada"
 
 #. 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 "Cancelada"
 
@@ -3870,7 +3877,7 @@ msgid "Gnome Calendar"
 msgstr "Calendario do 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:1072
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -3883,16 +3890,16 @@ msgstr "%A, %d 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:1076
 msgid "%a %d %b"
 msgstr "%a, %d 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:1079
+#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../modules/calendar/e-cal-shell-view-private.c:1088
 msgid "%a %d %b %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -3900,10 +3907,10 @@ msgstr "%a, %d 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:1105
+#: ../modules/calendar/e-cal-shell-view-private.c:1116
+#: ../modules/calendar/e-cal-shell-view-private.c:1123
+#: ../modules/calendar/e-cal-shell-view-private.c:1126
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -3915,7 +3922,7 @@ msgstr "%d 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:1112
 msgid "%d %b"
 msgstr "%d de %b"
 
@@ -4021,42 +4028,45 @@ msgstr "vista de calendario para un mes"
 msgid "calendar view for one or more weeks"
 msgstr "vista de calendario para unha ou mÃis 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 "Sen 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 "Resumo:"
 
-#: ../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 "Data de inicio:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:266
+msgid "End Date:"
+msgstr "Data de finalizaciÃn:"
+
+#: ../calendar/gui/e-cal-component-preview.c:277
 msgid "Due Date:"
 msgstr "Data de vencemento:"
 
-#. 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 "Prioridade:"
 
-#: ../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 "DescriciÃn:"
 
-#: ../calendar/gui/e-cal-component-preview.c:380
+#: ../calendar/gui/e-cal-component-preview.c:368
 msgid "Web Page:"
 msgstr "PÃxina Web:"
 
@@ -4113,28 +4123,28 @@ msgstr "Creado"
 msgid "Last modified"
 msgstr "Ãltima modificaciÃn"
 
-#: ../calendar/gui/e-calendar-view.c:427
+#: ../calendar/gui/e-calendar-view.c:434
 msgid "Cut selected events to the clipboard"
 msgstr "Cortar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:433
+#: ../calendar/gui/e-calendar-view.c:440
 msgid "Copy selected events to the clipboard"
 msgstr "Copiar as actividades seleccionadas para o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:439
+#: ../calendar/gui/e-calendar-view.c:446
 msgid "Paste events from the clipboard"
 msgstr "Pegar as actividades desde o portapapeis"
 
-#: ../calendar/gui/e-calendar-view.c:445
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Delete selected events"
 msgstr "Eliminar as actividades seleccionadas"
 
-#: ../calendar/gui/e-calendar-view.c:464 ../calendar/gui/e-memo-table.c:198
+#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:198
 #: ../calendar/gui/e-task-table.c:286
 msgid "Deleting selected objects"
 msgstr "Eliminando os obxectos seleccionados"
 
-#: ../calendar/gui/e-calendar-view.c:660 ../calendar/gui/e-memo-table.c:878
+#: ../calendar/gui/e-calendar-view.c:638 ../calendar/gui/e-memo-table.c:878
 #: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "Actualizando os obxectos"
@@ -4142,7 +4152,7 @@ msgstr "Actualizando os obxectos"
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:1918 ../calendar/gui/e-memo-table.c:555
+#: ../calendar/gui/e-calendar-view.c:1973 ../calendar/gui/e-memo-table.c:555
 #: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4151,20 +4161,20 @@ msgstr "Organizador: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1922 ../calendar/gui/e-memo-table.c:560
+#: ../calendar/gui/e-calendar-view.c:1977 ../calendar/gui/e-memo-table.c:560
 #: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1938 ../calendar/gui/print.c:3363
+#: ../calendar/gui/e-calendar-view.c:1993 ../calendar/gui/print.c:3363
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃn: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1969
+#: ../calendar/gui/e-calendar-view.c:2024
 #, c-format
 msgid "Time: %s %s"
 msgstr "Hora: %s %s"
@@ -4184,8 +4194,8 @@ msgstr "Data de finalizaciÃ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 "DescoÃecido"
 
@@ -4218,14 +4228,14 @@ msgstr "Abrindo %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 "Rexeitado"
 
@@ -4233,13 +4243,14 @@ msgstr "Rexeitado"
 #: ../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"
 
@@ -4318,7 +4329,7 @@ msgid "%A %d %B"
 msgstr "%A %d de %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2650
+#: ../calendar/gui/e-day-view.c:2653
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -5021,7 +5032,7 @@ msgstr "Citas e reuniÃns"
 
 #: ../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 "Abrindo o calendario"
 
@@ -6776,15 +6787,15 @@ msgid "Please enter your password."
 msgstr "Introduza o seu contrasinal."
 
 #: ../capplet/settings/mail-account-view.c:282
-#: ../mail/em-account-editor.c:5436 ../plugins/caldav/caldav-source.c:68
+#: ../mail/em-account-editor.c:5453 ../plugins/caldav/caldav-source.c:68
 msgid "CalDAV"
 msgstr "CalDAV"
 
 #: ../capplet/settings/mail-account-view.c:376
 #: ../capplet/settings/mail-account-view.c:421
-#: ../mail/em-account-editor.c:5307 ../mail/em-account-editor.c:5364
+#: ../mail/em-account-editor.c:5324 ../mail/em-account-editor.c:5381
 #: ../modules/online-accounts/e-online-accounts-google.c:295
-#: ../modules/online-accounts/e-online-accounts-google.c:369
+#: ../modules/online-accounts/e-online-accounts-google.c:371
 #: ../plugins/google-account-setup/google-contacts-source.c:55
 #: ../plugins/google-account-setup/google-source.c:83
 msgid "Google"
@@ -6792,20 +6803,20 @@ msgstr "Google"
 
 #: ../capplet/settings/mail-account-view.c:497
 #: ../capplet/settings/mail-account-view.c:601
-#: ../mail/em-account-editor.c:4840 ../mail/em-account-editor.c:4875
+#: ../mail/em-account-editor.c:4857 ../mail/em-account-editor.c:4892
 msgid "Always (SSL)"
 msgstr "Sempre (SSL)"
 
 #: ../capplet/settings/mail-account-view.c:500
 #: ../capplet/settings/mail-account-view.c:604
-#: ../mail/em-account-editor.c:4843 ../mail/em-account-editor.c:4878
+#: ../mail/em-account-editor.c:4860 ../mail/em-account-editor.c:4895
 msgid "When possible (TLS)"
 msgstr "Cando sexa posÃbel (TLS)"
 
 #: ../capplet/settings/mail-account-view.c:503
 #: ../capplet/settings/mail-account-view.c:607
-#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4846
-#: ../mail/em-account-editor.c:4881
+#: ../mail/em-account-editor.c:1752 ../mail/em-account-editor.c:4863
+#: ../mail/em-account-editor.c:4898
 msgid "Never"
 msgstr "Nunca"
 
@@ -6895,7 +6906,7 @@ msgstr ""
 "o seu correo electrÃnico"
 
 #: ../capplet/settings/mail-account-view.c:678
-#: ../mail/em-account-editor.c:2955 ../mail/em-account-editor.c:3094
+#: ../mail/em-account-editor.c:2972 ../mail/em-account-editor.c:3111
 msgid "Identity"
 msgstr "Identidade"
 
@@ -6947,7 +6958,7 @@ msgid "Back - Receiving options"
 msgstr "Anterior - OpciÃns de recepciÃn"
 
 #: ../capplet/settings/mail-account-view.c:683
-#: ../mail/em-account-editor.c:4107
+#: ../mail/em-account-editor.c:4124
 msgid "Defaults"
 msgstr "PredefiniciÃns"
 
@@ -6976,12 +6987,12 @@ msgid "Setup Google calendar with Evolution"
 msgstr "Configurar o calendario de Google co Evolution."
 
 #: ../capplet/settings/mail-account-view.c:861
-#: ../mail/em-account-editor.c:4935
+#: ../mail/em-account-editor.c:4952
 msgid "You may need to enable IMAP access."
 msgstr "Pode que deba activar o acceso IMAP."
 
 #: ../capplet/settings/mail-account-view.c:869
-#: ../mail/em-account-editor.c:4912
+#: ../mail/em-account-editor.c:4929
 msgid "Google account settings:"
 msgstr "Axustes da conta de Google:"
 
@@ -6990,7 +7001,7 @@ msgid "Setup Yahoo calendar with Evolution"
 msgstr "Configurar o calendario Yahoo co Evolution"
 
 #: ../capplet/settings/mail-account-view.c:899
-#: ../mail/em-account-editor.c:4982
+#: ../mail/em-account-editor.c:4999
 msgid ""
 "Yahoo calendars are named as firstname_lastname. We have tried to form the "
 "calendar name. So please confirm and re-enter the calendar name if it is not "
@@ -7000,7 +7011,7 @@ msgstr ""
 "calendario. Se non Ã vÃlido confirme ou reintroduza o nome do calendario."
 
 #: ../capplet/settings/mail-account-view.c:908
-#: ../mail/em-account-editor.c:4967
+#: ../mail/em-account-editor.c:4984
 msgid "Yahoo account settings:"
 msgstr "Axustes da conta de Yahoo:"
 
@@ -7281,7 +7292,7 @@ msgstr "Buscar e substituÃr un texto"
 msgid "Save draft"
 msgstr "Gardar o borrador"
 
-#: ../composer/e-msg-composer.c:813
+#: ../composer/e-msg-composer.c:823
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7289,7 +7300,7 @@ msgstr ""
 "Non Ã posÃbel asinar a mensaxe saÃnte: non hai un certificado de sinatura "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:822
+#: ../composer/e-msg-composer.c:832
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7298,17 +7309,17 @@ msgstr ""
 "Non Ã posÃbel cifrar a mensaxe saÃnte: non hai un certificado de cifrado "
 "estabelecido para esta conta"
 
-#: ../composer/e-msg-composer.c:1609 ../composer/e-msg-composer.c:1996
+#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2006
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4163
+#: ../composer/e-msg-composer.c:4209
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "O editor contÃn un corpo de mensaxe sen texto, polo que non Ã posÃbel a "
 "ediciÃn."
 
-#: ../composer/e-msg-composer.c:4867
+#: ../composer/e-msg-composer.c:4913
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
@@ -7439,7 +7450,7 @@ msgstr "O erro devolto foi Â{0}Â. Ã moi posÃbel que non se gardase a mensaxe
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Produciuse un erro durante o envÃo. Que desexa facer?"
 
-#: ../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 "O informe de erro foi Â{0}Â."
 
@@ -8123,95 +8134,109 @@ msgstr ""
 "inferior esquerdo"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+msgid "Search range for time-based searching in years"
+msgstr "Rango de busca en anos para buscas baseadas en tempo"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+msgid ""
+"How many years can the time-based search go forward or backward from "
+"currently selected day when searching for another occurrence; default is ten "
+"years"
+msgstr ""
+"Cantos anos pode ir cara atrÃs ou cara adiante a busca baseada en tempo, "
+"desde o dÃa seleccionado actualmente, ao buscar outra ocorrencia; o valor "
+"predeterminado son 10 anos"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "List of selected calendars"
 msgstr "Lista dos calendarios seleccionados"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "List of calendars to load"
 msgstr "Lista de calendarios a cargar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "List of selected memo lists"
 msgstr "Lista dos recordatorios seleccionados"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "List of memo lists to load"
 msgstr "Lista de listados de recordatorios a cargar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "List of selected task lists"
 msgstr "Lista das listas de tarefas seleccionadas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "List of task lists to load"
 msgstr "Lista das listas de tarefas a cargar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:65
 msgid "Show appointment end times in week and month views"
 msgstr "Mostrar as horas finais das citas nas vista semanal e mensual"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 "Indica se se mostra a hora de finalizaciÃn das actividades nas vistas "
 "semanais e mensuais"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:50
 msgid "Show the memo preview pane"
 msgstr "Mostrar o panel de vista previa de notas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr ""
 "Se Ã verdadeiro, mÃstrase o panel de vista previa das notas na xanela "
 "principal"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:58
 msgid "Show the task preview pane"
 msgstr "Mostrar o panel de vista previa de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr ""
 "Se Ã verdadeiro, mÃstrase o panel de vista previa de tarefas na xanela "
 "principal"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:107
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Mostrar os nÃmeros das semanas na vista diaria, de semana laboral e no "
 "navegador de datas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr ""
 "Indica se se mostran os nÃmeros de semana en diferentes lugares do calendario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Vertical position for the tag pane"
 msgstr "PosiciÃn vertical do panel de etiquetas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Highlight tasks due today"
 msgstr "Realce das tarefas que vencen hoxe"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Indica se realzar as tarefas que vencen hoxe con unha cor especial (task-"
 "overdue-color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:87
 msgid "Tasks due today color"
 msgstr "Cor para as tarefas que vencen hoxe"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8219,17 +8244,17 @@ msgstr ""
 "Cor de fondo para as tarefas que vencen hoxe, no formato Â#rrggbbÂ. Usado "
 "xunto ao resaltado de tarefas que vencen hoxe."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:60
 msgid "Task preview pane position (horizontal)"
 msgstr "PosiciÃn do panel de vista previa de tarefas (horizontal)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:56
 msgid "Task layout style"
 msgstr "Estilo da disposiciÃn de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8240,34 +8265,34 @@ msgstr ""
 "previa embaixo da lista de tarefas. Â1Â (vista vertical) mostra o panel de "
 "vista previa ao lado da lista de tarefas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:61
 msgid "Task preview pane position (vertical)"
 msgstr "PosiciÃn do panel de vista previa de tarefas (vertical)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Position of the task preview pane when oriented vertically"
 msgstr ""
 "PosiciÃn do panel de vista previa de tarefas cando estÃ orientado "
 "verticalmente"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "Highlight overdue tasks"
 msgstr "Realce das tarefas vencidas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Indica se realzar as tarefas vencidas con unha cor especial (task-overdue-"
 "color)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:89
 msgid "Overdue tasks color"
 msgstr "Cor para as tarefas atrasadas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8275,23 +8300,23 @@ msgstr ""
 "Cor de fondo para as tarefas fÃra de prazo, no formato Â#rrggbbÂ. Usado "
 "xunto ao realzado de tarefas fÃra de prazo."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:37
 msgid "Time divisions"
 msgstr "DivisiÃns horarias"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr ""
 "Os intervalos de tempo mostrados nas vistas diaria e de semana laboral, en "
 "minutos"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:3
 msgid "Timezone"
 msgstr "Fuso horario"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8300,61 +8325,61 @@ msgstr ""
 "unha localizaciÃn sen traducir da base de datos de fusos horarios Olsen, p."
 "ex:ÂAmerica/New YorkÂ"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:13
 msgid "Twenty four hour time format"
 msgstr "Formato de hora de vinte e catro horas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr ""
 "Indica se se mostran as horas en formato de vinte e catro horas en vez de "
 "usar am/pm"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:101
 msgid "Birthday and anniversary reminder"
 msgstr "Avisos de aniversarios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Indica se se estabelece un aviso para os aniversarios"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:95
 msgid "Default appointment reminder"
 msgstr "Aviso de cita predeterminado"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Whether to set a default reminder for appointments"
 msgstr "Indica se se estabelece un aviso predeterminado para as citas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:5
 msgid "Use system timezone"
 msgstr "Usar o fuso horario do sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr ""
 "Usar o fuso horario do sistema en vez do fuso horario seleccionado no "
 "Evolution"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:27
 msgid "Week start"
 msgstr "inicio da semana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Weekday the week starts on, from Sunday (0) to Saturday (6)"
 msgstr "O dÃa no que comeza a semana, desde o domingo (0) ata o sÃbado (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 #: ../modules/calendar/apps_evolution_calendar.schemas.in.h:67
 msgid "Work days"
 msgstr "DÃas laborÃbeis"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Days on which the start and end of work hours should be indicated"
 msgstr "DÃas nos que debe indicarse o inicio e fin das horas de traballo"
 
@@ -9179,41 +9204,11 @@ msgstr ""
 "Abrevia a vista de enderezos en A/CC/CCO co nÃmero indicado en address_count."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
-#: ../mail/evolution-mail.schemas.in.h:114
-msgid "Display only message texts not exceeding certain size"
-msgstr "Mostrar sÃ as mensaxes de texto que non excedan de certo tamaÃo"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
-#: ../mail/evolution-mail.schemas.in.h:115
-msgid ""
-"Enable to display only message texts not exceeding size defined in "
-"'message_text_part_limit' key."
-msgstr ""
-"Activar a vista dos textos das mensaxes que non excedan o tamaÃo definido "
-"pola chave 'message_text_part_limit'."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#: ../mail/evolution-mail.schemas.in.h:116
-msgid "Message text limit for display"
-msgstr "LÃmite do texto da mensaxe para a vista"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
-#: ../mail/evolution-mail.schemas.in.h:117
-msgid ""
-"This decides the max size of the message text that will be displayed under "
-"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
-"is used only when 'force_message_limit' key is activated."
-msgstr ""
-"Isto decide o tamaÃo mÃximo do texto da mensaxe que se pode mostrar no "
-"Evolution, indicado en KB. O tamaÃo predeterminado Ã 4096 (4MB). Este valor "
-"Ãsase sÃ cando a chave 'force_message_limit' estÃ activada."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 #: ../mail/evolution-mail.schemas.in.h:118
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "NÃmero de enderezos para mostrar en A/CC/CCO"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 #: ../mail/evolution-mail.schemas.in.h:119
 msgid ""
 "This sets the number of addresses to show in default message list view, "
@@ -9222,12 +9217,12 @@ msgstr ""
 "Isto define o nÃmero de enderezos que se mostra na vista da lista de "
 "mensaxes predeterminada, para os restantes mostrarase ÂâÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 #: ../mail/evolution-mail.schemas.in.h:120
 msgid "Thread the message-list based on Subject"
 msgstr "Lista de mensaxes por conversas baseadas no asunto"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 #: ../mail/evolution-mail.schemas.in.h:121
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
@@ -9236,12 +9231,12 @@ msgstr ""
 "Indica se debe retroceder no agrupamento de conversas polo asunto cando as "
 "mensaxes non conteÃen cabeceiras ÂEn resposta aÂ ou ÂReferenciasÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 #: ../mail/evolution-mail.schemas.in.h:122
 msgid "Default value for thread expand state"
 msgstr "Valor predeterminado para o estado despregado da conversa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9249,12 +9244,12 @@ msgstr ""
 "Esta opciÃn indica se os fÃos deben estar despregadas ou pregadas por "
 "omisiÃn. Ã necesario reiniciar o Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 #: ../mail/evolution-mail.schemas.in.h:124
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Indica se ordenar as conversa pola Ãltima mensaxe que aparece"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 #: ../mail/evolution-mail.schemas.in.h:125
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
@@ -9265,12 +9260,12 @@ msgstr ""
 "mensaxe de cada conversa en vez de pola data das mensaxes. Ã necesario "
 "reiniciar o Evolution."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 #: ../mail/evolution-mail.schemas.in.h:128
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenar contas alfabeticamente nun Ãrbore de cartafoles"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9282,32 +9277,32 @@ msgstr ""
 "coa excepciÃn de Neste equipo y Cartafoles de busca, pola contra os "
 "cartafoles ordÃnanse pola orde dada polo usuario"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 #: ../mail/evolution-mail.schemas.in.h:142
 msgid "Log filter actions"
 msgstr "Rexistrar as acciÃns de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 #: ../mail/evolution-mail.schemas.in.h:143
 msgid "Log filter actions to the specified log file."
 msgstr "Rexistrar as acciÃns de filtrado no ficheiro indicado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 #: ../mail/evolution-mail.schemas.in.h:144
 msgid "Logfile to log filter actions"
 msgstr "Ficheiro de rexistro para as acciÃns de filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 #: ../mail/evolution-mail.schemas.in.h:145
 msgid "Logfile to log filter actions."
 msgstr "Ficheiro de rexistro para as acciÃns de filtrado."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 #: ../mail/evolution-mail.schemas.in.h:146
 msgid "Flush Outbox after filtering"
 msgstr "Limpar a caixa de saÃda despois do filtrado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 #: ../mail/evolution-mail.schemas.in.h:147
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
@@ -9319,53 +9314,53 @@ msgstr ""
 "filtrado ÂReencamiÃar aÂ e aproximadamente un minuto despois da invocaciÃn "
 "da Ãltima acciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 #: ../mail/evolution-mail.schemas.in.h:148
 msgid "Default forward style"
 msgstr "Estilo de reencamiÃamento predeterminado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 #: ../mail/evolution-mail.schemas.in.h:150
 msgid "Message-display style (\"normal\", \"full headers\", \"source\")"
 msgstr "Estilo de vista da mensaxe (ÂnormalÂ, Âcabeceiras completasÂ, ÂfonteÂ)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 #: ../mail/evolution-mail.schemas.in.h:151
 msgid "Prompt on empty subject"
 msgstr "Avisar cando o ÂAsuntoÂ estea baleiro"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 #: ../mail/evolution-mail.schemas.in.h:152
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Avisar ao usuario cando tente enviar unha mensaxe sen asunto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when emptying the trash"
 msgstr "Avisar ao baleirar o lixo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Avisar ao usuario cando tente baleirar o lixo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 #: ../mail/evolution-mail.schemas.in.h:153
 msgid "Prompt when user expunges"
 msgstr "Avisar cando o usuario expurgue"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 #: ../mail/evolution-mail.schemas.in.h:154
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Avisar ao usuario cando tente expurgar un cartafol."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 #: ../mail/evolution-mail.schemas.in.h:173
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Preguntar antes de enviar a destinatarios non inseridos como enderezos de "
 "correo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 #: ../mail/evolution-mail.schemas.in.h:174
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
@@ -9374,24 +9369,24 @@ msgstr ""
 "Activa/desactiva as preguntas que avisan de que estÃ tentando enviar unha "
 "mensaxe a destinatarios non insertados como enderezos de correo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 #: ../mail/evolution-mail.schemas.in.h:155
 msgid "Prompt when user only fills Bcc"
 msgstr "Avisar cando o usuario encha sÃ o campo Cco"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 #: ../mail/evolution-mail.schemas.in.h:156
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Avisar cando o usuario tente enviar unha mensaxe sen cubrir os campos ÂParaÂ "
 "ou ÂCCÂ."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 #: ../mail/evolution-mail.schemas.in.h:157
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Avisar cando o usuario tente enviar un HTML non desexado"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 #: ../mail/evolution-mail.schemas.in.h:158
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
@@ -9399,12 +9394,12 @@ msgid ""
 msgstr ""
 "Avisar ao enviar mensaxes en HTML a destinatarios que non desexen recibilas."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 #: ../mail/evolution-mail.schemas.in.h:159
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Avisar cando o usuario tente abrir dez ou mÃis mensaxes ao mesmo tempo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 #: ../mail/evolution-mail.schemas.in.h:160
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
@@ -9413,22 +9408,22 @@ msgstr ""
 "Se un usuario tenta abrir 10 ou mÃis mensaxes ao mesmo tempo, pedir a "
 "confirmaciÃn."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 #: ../mail/evolution-mail.schemas.in.h:161
 msgid "Prompt while marking multiple messages"
 msgstr "Avisar cando se marquen varias mensaxes"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 #: ../mail/evolution-mail.schemas.in.h:162
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Activar ou desactivar a confirmaciÃn cando se marcan varias mensaxes."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 #: ../mail/evolution-mail.schemas.in.h:163
 msgid "Prompt when deleting messages in search folder"
 msgstr "Avisar ao eliminar mensaxes no cartafol de busca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 #: ../mail/evolution-mail.schemas.in.h:164
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
@@ -9439,6 +9434,42 @@ msgstr ""
 "cartafol de busca bÃrranse as mensaxes permanentemente, non sÃ dos "
 "resultados da busca."
 
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"Pregunta se se deben copiar cartafoles arrastrando e soltando no Ãrbore de "
+"cartafoles"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#, fuzzy
+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 ""
+"Os valores posÃbeis son: ÂnuncaÂ - non pechar nunca a xanela do buscador, "
+"ÂsempreÂ - pechar sempre a xanela do buscador ou ÂpreguntarÂ (ou calquera "
+"valor) preguntar ao usuario."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
+msgstr ""
+"Pregunta se se deben mover cartafoles arrastrando e soltando no Ãrbore de "
+"cartafoles"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+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 ""
+"Os valores posÃbeis son: ÂneverÂ (nunca) para non permitir mover cartafoles "
+"arrastrando e soltado no Ãrbore de cartafois, ÂalwaysÂ (sempre), para "
+"permitir mover cartafoles arrastrando e soltando no Ãrbore de cartafoles ou "
+"ÂaskÂ (preguntar) ou calquera outro valor, para preguntar ao usuario."
+
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 #: ../mail/evolution-mail.schemas.in.h:165
 msgid "Prompt when replying privately to list messages"
@@ -9809,18 +9840,18 @@ msgid "Address book source"
 msgstr "Orixe da axenda de enderezos"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:2
-msgid "Address book to use for storing automatically synced contacts"
+msgid "Address book to use for storing automatically synced contacts."
 msgstr ""
-"Axenda de enderezos a usar para almacenar automaticamente os contactos "
-"sincronizados"
+"Axenda de enderezos a usar para almacenar os contactos sincronizados "
+"automaticamente."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:3
-msgid "Auto sync GAIM contacts"
-msgstr "Sincronizar automaticamente os contactos GAIM"
+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"
-msgstr "Indica se se deberÃan sincronizar os contactos de GAIM"
+msgid "Whether Pidgin contacts should be automatically synced."
+msgstr "Indica se os contactos de Pidgin dÃbense sincronizar automaticamente."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:5
 msgid "Enable autocontacts"
@@ -9828,36 +9859,45 @@ msgstr "Activar autocontactos"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
 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 se os contactos deberÃan engadirse automaticamente Ã axenda de "
-"enderezos do usuario"
+"enderezos do usuario."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
-msgid "GAIM address book source"
-msgstr "Orixe da axenda de enderezos de GAIM"
+msgid "Pidgin address book source"
+msgstr "Fonte da axenda de enderezos de Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
-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 ""
 "Axenda de enderezos a usar para almacenar automaticamente os contactos "
-"sincronizados desde GAIM"
+"sincronizados desde Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
-msgid "GAIM check interval"
-msgstr "Intervalo de actualizaciÃn de GAIM"
+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"
-msgstr "Intervalo de actualizaciÃn para a sincronizaciÃn dos contactos de GAIM"
+msgid "Check interval for Pidgin syncing of contacts."
+msgstr "Intervalo de comprobaciÃn para sincronizar contactos de Pidgin."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
-msgid "GAIM last sync MD5"
-msgstr "MD5 da Ãltima actualizaciÃn de GAIM"
+msgid "Pidgin last sync MD5"
+msgstr "MD5 da Ãltima sincronizaciÃn de Pidgin"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
-msgid "GAIM last sync time"
-msgstr "Data da Ãltima sincronizaciÃn de GAIM"
+msgid "Pidgin last sync MD5."
+msgstr "MD5 da Ãltima sincronizaciÃn de Pidgin."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+msgid "Pidgin last sync time"
+msgstr "Hora da Ãltima sincronizaciÃn de Pidgin"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+msgid "Pidgin last sync time."
+msgstr "Hora da Ã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
@@ -9961,29 +10001,27 @@ msgstr ""
 "Indica se  mostrar a mensaxe sobre a icona cando cheguen mensaxes novas."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:9
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
-msgid "Play sound when new messages arrive."
-msgstr "Reproducir un son cando cheguen mensaxes novas."
+msgid "Enable audible notifications when new messages arrive."
+msgstr "Activar as notificaciÃns sonoras cando chegan mensaxes novos."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
-msgid "Whether play sound or beep when new messages arrive."
+msgid ""
+"Whether to make a sound of any kind when new messages arrive. If \"false\", "
+"the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-file\" "
+"and \"notify-sound-use-theme\" keys are disregarded."
 msgstr ""
-"Indica se reproducir un son ou un ton de aviso cando cheguen mensaxes novas."
+"Indica se se debe reproducir un son de calquera tipo cando chegan mensaxes "
+"novos. Se Ã falso, as chaves Ânotify-sound-beepÂ, Ânotify-sound-fileÂ, "
+"Ânotify-sound-playÂ e Ânotify-sound-use-themeÂ ignÃranse."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:11
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
-msgid "Beep or play sound file."
-msgstr "Emitir un ton de aviso ou un ficheiro de son."
+msgid "Whether to emit a beep."
+msgstr "Indica se se debe emitir un pitido."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:12
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
-msgid ""
-"If \"true\", then beep, otherwise will play sound file when new messages "
-"arrive."
+msgid "Whether to emit a beep when new messages arrive."
 msgstr ""
-"Se Ã ÂcertoÂ emitirÃ un ton de aviso, en caso contrario reproducirÃ un "
-"ficheiro de son cando cheguen mensaxes novas."
+"Indica se se debe reproducir emitir un pitido cando chega un mensaxe novo."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:13
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:9
@@ -9991,22 +10029,31 @@ msgid "Sound filename to be played."
 msgstr "Nome do ficheiro de son que reproducir."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
-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\"."
 msgstr ""
-"Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se non "
-"estÃ no modo de ton de aviso."
+"Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se "
+"Ânotify-sound-playÂ Ã certo."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:15
-msgid "FIXME"
-msgstr "ARRANXAR"
+msgid "Whether to play a sound file."
+msgstr "Indica se se debe reproducir un ficheiro de son."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
+msgid ""
+"Whether to play a sound file when new messages arrive. The name of the sound "
+"file is given by the 'notify-sound-file' key."
+msgstr ""
+"Indica se se debe reproducir un ficheiro de son cando chegan mensaxes novos. "
+"O nome do ficheiro de son tÃmase da chave Ânotify-sound-fileÂ."
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:11
 msgid "Use sound theme"
 msgstr "Usar un tema sonoro"
 
-#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:18
 #: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:12
 msgid "Play themed sound when new messages arrive, if not in beep mode."
 msgstr ""
@@ -10077,7 +10124,7 @@ msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Cartafol inicial para os diÃlogos GtkFileChooser."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7
-#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:316
+#: ../shell/apps_evolution_shell.schemas.in.h:9 ../shell/main.c:318
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃn"
 
@@ -10213,103 +10260,103 @@ msgstr "Binario do cliente de SpamAssassin"
 msgid "SpamAssassin daemon binary"
 msgstr "Binario do ÂdaemonÂ 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 "Non foi posÃbel analizar a mensaxe S/MIME: erro descoÃecido"
+
+#: ../em-format/em-format.c:480 ../em-format/em-format.c:599
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Non foi posÃbel analizar a mensaxe MIME. MostrÃndoa como fonte."
+
+#: ../em-format/em-format.c:490
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
+
+#: ../em-format/em-format.c:503
+msgid "Could not parse PGP/MIME message"
+msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME"
+
+#: ../em-format/em-format.c:504
+msgid "Could not parse PGP/MIME message: Unknown error"
+msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME: erro descoÃecido"
+
+#: ../em-format/em-format.c:622
+msgid "Unsupported signature format"
+msgstr "O formato da sinatura non Ã compatÃbel"
+
+#: ../em-format/em-format.c:633 ../em-format/em-format.c:850
+msgid "Error verifying signature"
+msgstr "Produciuse un erro ao comprobar a sinatura"
+
+#: ../em-format/em-format.c:634 ../em-format/em-format.c:839
+#: ../em-format/em-format.c:851
+msgid "Unknown error verifying signature"
+msgstr "Produciuse un erro descoÃecido ao comprobar a sinatura"
+
+#: ../em-format/em-format.c:958
+msgid "Could not parse PGP message: "
+msgstr "Non foi posÃbel analizar a mensaxe PGP: "
+
+#: ../em-format/em-format.c:1131
+msgid "Cannot proccess non-text mime/part"
+msgstr "Non Ã posÃbel procesar a parte MIME que non Ã texto"
+
+#: ../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:2288 ../mail/em-format-html.c:2311
+#: ../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:2290 ../mail/em-format-html.c:2313
+#: ../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 "Titular"
 
-#: ../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 "Data"
 
-#: ../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 discusiÃn"
 
-#: ../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:2263
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
 
-#: ../em-format/em-format.c:1588
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non foi posÃbel analizar a mensaxe S/MIME: erro descoÃecido"
-
-#: ../em-format/em-format.c:1782 ../em-format/em-format.c:2010
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Non foi posÃbel analizar a mensaxe MIME. MostrÃndoa como fonte."
-
-#: ../em-format/em-format.c:1793
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tipo de cifrado non compatÃbel para multipart/encrypted"
-
-#: ../em-format/em-format.c:1813
-msgid "Could not parse PGP/MIME message"
-msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME"
-
-#: ../em-format/em-format.c:1814
-msgid "Could not parse PGP/MIME message: Unknown error"
-msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME: erro descoÃecido"
-
-#: ../em-format/em-format.c:2035
-msgid "Unsupported signature format"
-msgstr "O formato da sinatura non Ã compatÃbel"
-
-#: ../em-format/em-format.c:2048 ../em-format/em-format.c:2230
-msgid "Error verifying signature"
-msgstr "Produciuse un erro ao comprobar a sinatura"
-
-#: ../em-format/em-format.c:2049 ../em-format/em-format.c:2215
-#: ../em-format/em-format.c:2231
-msgid "Unknown error verifying signature"
-msgstr "Produciuse un erro descoÃecido ao comprobar a sinatura"
-
-#: ../em-format/em-format.c:2324
-msgid "Could not parse PGP message: "
-msgstr "Non foi posÃbel analizar a mensaxe 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:2421
 #: ../modules/mail/em-mailer-prefs.c:1046
 msgid "Mailer"
 msgstr "Aplicativo de correo"
 
-#: ../em-format/em-format-quote.c:566 ../mail/em-composer-utils.c:1235
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Mensaxe reencamiÃada --------"
-
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:248
 #, c-format
@@ -10424,14 +10471,14 @@ msgstr "Visual"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1863
-#: ../plugins/itip-formatter/itip-view.c:194
+#: ../modules/calendar/e-cal-shell-view-actions.c:1905
+#: ../plugins/itip-formatter/itip-view.c:211
 #: ../widgets/table/e-cell-date-edit.c:307
 msgid "Today"
 msgstr "Hoxe"
 
 #. 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ÃÃ"
 
@@ -10764,11 +10811,11 @@ msgid "A_dd Condition"
 msgstr "Enga_dir unha condiciÃ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 "SaÃnte"
 
@@ -10945,33 +10992,33 @@ msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol Â%sÂ non Ã vÃlido"
 
 #: ../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
+#: ../mail/em-folder-tree-model.c:703
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 msgid "Inbox"
 msgstr "Caixa 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
+#: ../libemail-engine/e-mail-session.c:109 ../mail/em-folder-tree-model.c:696
+#: ../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
+#: ../libemail-engine/e-mail-session.c:110 ../mail/em-folder-tree-model.c:707
+#: ../modules/mail/e-mail-shell-view-private.c:1023
 msgid "Outbox"
 msgstr "Caixa de saÃda"
 
 #. 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
+#: ../libemail-engine/e-mail-session.c:111 ../mail/em-folder-tree-model.c:711
+#: ../modules/mail/e-mail-shell-view-private.c:1025
 msgid "Sent"
 msgstr "Enviados"
 
 #. 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
+#: ../libemail-engine/e-mail-session.c:112 ../mail/em-folder-tree-model.c:699
+#: ../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
@@ -10982,47 +11029,47 @@ msgstr "Modelos"
 msgid "Search Folders"
 msgstr "Cartafoles de busca"
 
-#: ../libemail-engine/e-mail-session.c:975
+#: ../libemail-engine/e-mail-session.c:987
 #, c-format
 msgid "Enter Passphrase for %s"
 msgstr "Introducir a frase de paso para %s"
 
-#: ../libemail-engine/e-mail-session.c:979
+#: ../libemail-engine/e-mail-session.c:991
 msgid "Enter Passphrase"
 msgstr "Introducir a frase de paso"
 
-#: ../libemail-engine/e-mail-session.c:983
+#: ../libemail-engine/e-mail-session.c:995
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Introducir o contrasinal para %s"
 
-#: ../libemail-engine/e-mail-session.c:987
+#: ../libemail-engine/e-mail-session.c:999
 msgid "Enter Password"
 msgstr "Introducir o contrasinal"
 
-#: ../libemail-engine/e-mail-session.c:1038
+#: ../libemail-engine/e-mail-session.c:1050
 #, c-format
 msgid "User canceled operation."
 msgstr "O usuario cancelou a 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."
 msgstr ""
 "Non se proporcionou ningÃn enderezo de destino, o reencamiÃamento cancelouse."
 
-#: ../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 "Non se atopou ningunha conta que usar, o reencamiÃamento cancelouse."
 
-#: ../libemail-engine/e-mail-session.c:1320
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "%s authentication failed"
 msgstr "A autenticaciÃn %s fallou"
 
-#: ../libemail-engine/e-mail-session.c:1394
+#: ../libemail-engine/e-mail-session.c:1406
 #, c-format
 msgid "No password was provided"
 msgstr "Non se forneceu ningÃn contrasinal"
@@ -11033,14 +11080,14 @@ msgid "Cannot get transport for account '%s'"
 msgstr "Non Ã posÃbel obter o servizo de transporte para a conta Â%sÂ"
 
 #: ../libemail-engine/e-mail-session-utils.c:505
-#: ../libemail-engine/mail-ops.c:616
+#: ../libemail-engine/mail-ops.c:659
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un fallo ao aplicar os filtros ao correo saÃnte: %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/e-mail-session-utils.c:534
+#: ../libemail-engine/e-mail-session-utils.c:568
+#: ../libemail-engine/mail-ops.c:678 ../libemail-engine/mail-ops.c:714
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11049,18 +11096,18 @@ msgstr ""
 "Produciuse un fallo ao anexar a %s: %s\n"
 "No seu lugar anexaranse ao cartafol local ÂEnviadosÂ."
 
-#: ../libemail-engine/e-mail-session-utils.c:585
-#: ../libemail-engine/mail-ops.c:693
+#: ../libemail-engine/e-mail-session-utils.c:588
+#: ../libemail-engine/mail-ops.c:736
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un fallo ao anexar ao cartafol local ÂEnviadosÂ: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:795
-#: ../libemail-engine/mail-ops.c:821 ../libemail-engine/mail-ops.c:922
+#: ../libemail-engine/e-mail-session-utils.c:816
+#: ../libemail-engine/mail-ops.c:864 ../libemail-engine/mail-ops.c:965
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
-#: ../libemail-engine/e-mail-session-utils.c:869
+#: ../libemail-engine/e-mail-session-utils.c:890
 #, c-format
 msgid "Unsubscribing from folder '%s'"
 msgstr "Eliminando a subscriciÃn do cartafol Â%sÂ"
@@ -11085,15 +11132,15 @@ msgstr "Preparando a conta Â%sÂ para o modo sen conexiÃn"
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
 
-#: ../libemail-engine/mail-ops.c:87
+#: ../libemail-engine/mail-ops.c:94
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../libemail-engine/mail-ops.c:209
+#: ../libemail-engine/mail-ops.c:216
 msgid "Fetching Mail"
 msgstr "Recibindo o correo"
 
-#: ../libemail-engine/mail-ops.c:832
+#: ../libemail-engine/mail-ops.c:875
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
@@ -11101,62 +11148,62 @@ msgstr "Enviando a mensaxe %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:926
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Produciuse un fallo ao enviar unha mensaxe"
 msgstr[1] "Produciuse un fallo ao enviar %d de %d mensaxes"
 
-#: ../libemail-engine/mail-ops.c:889 ../mail/mail-send-recv.c:885
+#: ../libemail-engine/mail-ops.c:932 ../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:934 ../mail/mail-send-recv.c:889
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1003
+#: ../libemail-engine/mail-ops.c:1046
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1004
+#: ../libemail-engine/mail-ops.c:1047
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1121
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1194
+#: ../libemail-engine/mail-ops.c:1237
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1195
+#: ../libemail-engine/mail-ops.c:1238
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1257
+#: ../libemail-engine/mail-ops.c:1300
 #, c-format
 msgid "Refreshing folder '%s'"
 msgstr "Actualizando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1475
+#: ../libemail-engine/mail-ops.c:1518
 #, c-format
 msgid "Expunging folder '%s'"
 msgstr "Expurgando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1568
+#: ../libemail-engine/mail-ops.c:1611
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1664
+#: ../libemail-engine/mail-ops.c:1707
 #, c-format
 msgid "Disconnecting %s"
 msgstr "Desconectando %s"
@@ -11231,19 +11278,19 @@ msgstr "Sempre"
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/em-account-editor.c:2912 ../mail/mail-config.ui.h:164
+#: ../mail/em-account-editor.c:2921 ../mail/mail-config.ui.h:164
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: ../mail/em-account-editor.c:2915
+#: ../mail/em-account-editor.c:2924
 msgid "Fil_e:"
 msgstr "Fich_eiro:"
 
-#: ../mail/em-account-editor.c:2952
+#: ../mail/em-account-editor.c:2969
 msgid "Mail Configuration"
 msgstr "ConfiguraciÃn do correo"
 
-#: ../mail/em-account-editor.c:2953
+#: ../mail/em-account-editor.c:2970
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -11253,7 +11300,7 @@ msgstr ""
 "\n"
 "Prema en ÂContinuarÂ para comezar."
 
-#: ../mail/em-account-editor.c:2956
+#: ../mail/em-account-editor.c:2973
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -11263,19 +11310,19 @@ msgstr ""
 "necesitan encherse, a non ser que desexe incluÃr esta informaciÃn no correo "
 "que envÃe."
 
-#: ../mail/em-account-editor.c:2958 ../mail/em-account-editor.c:3167
+#: ../mail/em-account-editor.c:2975 ../mail/em-account-editor.c:3184
 msgid "Receiving Email"
 msgstr "RecepciÃn de correo"
 
-#: ../mail/em-account-editor.c:2959
+#: ../mail/em-account-editor.c:2976
 msgid "Please configure the following account settings."
 msgstr "Configurar os seguintes axustes da conta."
 
-#: ../mail/em-account-editor.c:2961 ../mail/em-account-editor.c:3786
+#: ../mail/em-account-editor.c:2978 ../mail/em-account-editor.c:3803
 msgid "Sending Email"
 msgstr "EnvÃo de correo"
 
-#: ../mail/em-account-editor.c:2962
+#: ../mail/em-account-editor.c:2979
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
@@ -11284,22 +11331,22 @@ msgstr ""
 "seguro, pregunte ao administrador do sistema ou provedor de acceso a "
 "Internet."
 
-#: ../mail/em-account-editor.c:2964
+#: ../mail/em-account-editor.c:2981
 msgid "Account Summary"
 msgstr "Resumo da conta"
 
-#: ../mail/em-account-editor.c:2965
+#: ../mail/em-account-editor.c:2982
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Este Ã un resumo da configuraciÃn que se empregarÃn para acceder ao seu "
 "correo."
 
-#: ../mail/em-account-editor.c:2969
+#: ../mail/em-account-editor.c:2986
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/em-account-editor.c:2970
+#: ../mail/em-account-editor.c:2987
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -11314,41 +11361,43 @@ msgstr ""
 "\n"
 "Prema en ÂAplicarÂ para gardar os axustes."
 
-#: ../mail/em-account-editor.c:3533
+#: ../mail/em-account-editor.c:3550
 msgid "Check for _new messages every"
 msgstr "Comprobar automaticamente se hai mensaxes _novas cada"
 
-#: ../mail/em-account-editor.c:3541
+#: ../mail/em-account-editor.c:3558
 msgid "minu_tes"
 msgstr "minu_tos"
 
-#: ../mail/em-account-editor.c:4259 ../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 "Seguranza"
 
 #. Most sections for this is auto-generated from the camel config
 #. Most sections for this is auto-generated fromt the camel config
-#: ../mail/em-account-editor.c:4314 ../mail/em-account-editor.c:4416
+#: ../mail/em-account-editor.c:4331 ../mail/em-account-editor.c:4433
 msgid "Receiving Options"
 msgstr "OpciÃns de recepciÃn"
 
-#: ../mail/em-account-editor.c:4315 ../mail/em-account-editor.c:4417
+#: ../mail/em-account-editor.c:4332 ../mail/em-account-editor.c:4434
 msgid "Checking for New Messages"
 msgstr "Comprobando se hai mensaxes novas"
 
-#: ../mail/em-account-editor.c:4920
+#: ../mail/em-account-editor.c:4937
 msgid "Setup Google con_tacts with Evolution"
 msgstr "Configurar os con_tactos de Google con Evolution"
 
-#: ../mail/em-account-editor.c:4927
+#: ../mail/em-account-editor.c:4944
 msgid "Setup Google ca_lendar with Evolution"
 msgstr "Configurar o ca_lendario de Google con Evolution"
 
-#: ../mail/em-account-editor.c:4975
+#: ../mail/em-account-editor.c:4992
 msgid "Setup _Yahoo calendar with Evolution"
 msgstr "Configurar o calendario _Yahoo con Evolution"
 
-#: ../mail/em-account-editor.c:5000
+#: ../mail/em-account-editor.c:5017
 msgid "Yahoo Calen_dar name:"
 msgstr "Nome do calen_dario de Yahoo:"
 
@@ -11377,7 +11426,7 @@ msgstr "Nome da conta"
 
 #. 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:3648
 #: ../mail/mail-config.ui.h:51
 #: ../plugins/google-account-setup/google-source.c:311
 #: ../plugins/google-account-setup/google-source.c:553
@@ -11385,7 +11434,7 @@ msgstr "Nome da conta"
 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"
@@ -11393,12 +11442,12 @@ msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../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 iconas"
 
-#: ../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"
@@ -11407,7 +11456,7 @@ msgstr "Vista de lista"
 msgid "Unknown background operation"
 msgstr "OperaciÃn en segundo plano descoÃecida"
 
-#: ../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"
@@ -11417,30 +11466,38 @@ msgstr "Pechar esta xanela"
 msgid "(No Subject)"
 msgstr "(Sen asunto)"
 
-#: ../mail/e-mail-display.c:68
+#: ../mail/e-mail-display.c:114
 msgid "_Add to Address Book..."
 msgstr "Eng_adir Ã axenda de enderezosâ"
 
-#: ../mail/e-mail-display.c:75
+#: ../mail/e-mail-display.c:121
 msgid "_To This Address"
 msgstr "A es_te enderezo"
 
-#: ../mail/e-mail-display.c:82
+#: ../mail/e-mail-display.c:128
 msgid "_From This Address"
 msgstr "_Desde este enderezo"
 
-#: ../mail/e-mail-display.c:89
+#: ../mail/e-mail-display.c:135
 msgid "Send _Reply To..."
 msgstr "Enviar _resposta aâ"
 
-#: ../mail/e-mail-display.c:91
+#: ../mail/e-mail-display.c:137
 msgid "Send a reply message to this address"
 msgstr "Enviar unha mensaxe de resposta a este enderezo"
 
-#: ../mail/e-mail-display.c:98
+#: ../mail/e-mail-display.c:144
 msgid "Create Search _Folder"
 msgstr "Crear un carta_fol de busca"
 
+#: ../mail/e-mail-display.c:154
+msgid "Save _Image..."
+msgstr "Gardar _imaxeâ"
+
+#: ../mail/e-mail-display.c:156
+msgid "Save the image to a file"
+msgstr "Gardar a imaxe a un ficheiro"
+
 #. 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
@@ -11496,7 +11553,7 @@ msgstr ""
 msgid "Color"
 msgstr "Cor"
 
-#: ../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
@@ -11513,626 +11570,665 @@ msgstr "Non Ã posÃbel crear os cartafoles de correo local en Â%sÂ: %s"
 msgid "Please select a folder"
 msgstr "Seleccionar un cartafol"
 
-#: ../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Ãxina %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"
+msgstr "Nome da cabeceira:"
+
+#: ../mail/e-mail-printer.c:542
+msgid "Header Value"
+msgstr "Valor da cabecera"
+
+#: ../mail/e-mail-printer.c:590 ../mail/mail-config.ui.h:107
+msgid "Headers"
+msgstr "Cabeceiras"
+
+#: ../mail/e-mail-reader.c:353
+msgid "Save Image"
+msgstr "Gardar imaxe"
+
+#: ../mail/e-mail-reader.c:438 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../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 ao cartafol"
 
-#: ../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 "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1554
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre ÂResponder a:Â para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1795
+#: ../mail/e-mail-reader.c:1902
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente Ã axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1797
+#: ../mail/e-mail-reader.c:1904
 msgid "Add sender to address book"
 msgstr "Engadir o remitente Ã axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1802
+#: ../mail/e-mail-reader.c:1909
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1804
+#: ../mail/e-mail-reader.c:1911
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1809
+#: ../mail/e-mail-reader.c:1916
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:1811
+#: ../mail/e-mail-reader.c:1918
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1816
+#: ../mail/e-mail-reader.c:1923
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1818
+#: ../mail/e-mail-reader.c:1925
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1823
+#: ../mail/e-mail-reader.c:1930
 msgid "Filter on Mailing _List..."
 msgstr "Filtrar pola _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 "Crear unha regra para filtrar as mensaxes a esta lista de correo"
 
-#: ../mail/e-mail-reader.c:1830
+#: ../mail/e-mail-reader.c:1937
 msgid "Filter on _Recipients..."
 msgstr "Filtrar polos _destinatariosâ"
 
-#: ../mail/e-mail-reader.c:1832
+#: ../mail/e-mail-reader.c:1939
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Crear unha regra para filtrar as mensaxes a estes destinatarios"
 
-#: ../mail/e-mail-reader.c:1837
+#: ../mail/e-mail-reader.c:1944
 msgid "Filter on Se_nder..."
 msgstr "Filtrar polo re_mitenteâ"
 
-#: ../mail/e-mail-reader.c:1839
+#: ../mail/e-mail-reader.c:1946
 msgid "Create a rule to filter messages from this sender"
 msgstr "Crear unha regra para filtrar as mensaxes deste remitente"
 
-#: ../mail/e-mail-reader.c:1844
+#: ../mail/e-mail-reader.c:1951
 msgid "Filter on _Subject..."
 msgstr "Filtrar polo a_suntoâ"
 
-#: ../mail/e-mail-reader.c:1846
+#: ../mail/e-mail-reader.c:1953
 msgid "Create a rule to filter messages with this subject"
 msgstr "Crear unha regra para filtrar as mensaxes con este asunto"
 
-#: ../mail/e-mail-reader.c:1851
+#: ../mail/e-mail-reader.c:1958
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:1853
+#: ../mail/e-mail-reader.c:1960
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado Ãs mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1965
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxeâ"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1967
 msgid "Search for text in the body of the displayed message"
 msgstr "Buscar un texto no corpo da mensaxe mostrada"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1972
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1974
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Eliminar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1979
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../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 ""
 "Estabelecer a marca de seguimento como completada nas mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1986
 msgid "Follow _Up..."
 msgstr "Seguimentoâ"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1988
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1993
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../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 "ReencamiÃar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2000
 msgid "Forward As _Attached"
 msgstr "ReencamiÃar como un _anexo"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2007
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../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 "ReencamiÃar a mensaxe seleccionada no corpo dunha mensaxe nova"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2014
 msgid "Forward As _Inline"
 msgstr "ReencamiÃar _inserida"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2021
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../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 "ReencamiÃar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2028
 msgid "Forward As _Quoted"
 msgstr "ReencamiÃar _citada"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2035
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2037
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no 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 as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2049
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2051
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2056
 msgid "_Not Junk"
 msgstr "_Non Ã correo lixo"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:2058
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2063
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2065
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2070
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:2072
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2077
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2079
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2084
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe novaâ"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2086
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2091
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2093
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2098
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2100
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2105
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2107
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2112
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2114
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol pai"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2119
 msgid "Switch to _next tab"
 msgstr "Cambiar Ã lapela segui_nte"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2121
 msgid "Switch to the next tab"
 msgstr "Cambiar Ã lapela seguinte"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2126
 msgid "Switch to _previous tab"
 msgstr "Cambiar Ã lapela a_nterior"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2128
 msgid "Switch to the previous tab"
 msgstr "Cambiar Ã lapela anterior"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2133
 msgid "Cl_ose current tab"
 msgstr "Pe_char a lapela actual"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2135
 msgid "Close current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2140
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2142
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2147
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2149
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2154
 msgid "Next _Thread"
 msgstr "Seguin_te conversa"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2156
 msgid "Display the next thread"
 msgstr "Mostrar a seguinte conversa"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2161
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2163
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2168
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2170
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2175
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2177
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2182
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2184
 msgid "Display the previous thread"
 msgstr "Mostrar a conversa anterior"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2189
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2191
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2198
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2205
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2210
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2212
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃn a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2217
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2219
 msgid "Remove attachments"
 msgstr "Eliminar os anexos"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2224
 msgid "Remove Du_plicate Messages"
 msgstr "Eliminar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2226
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2124 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1510
-#: ../modules/mail/e-mail-attachment-handler.c:181
+#: ../mail/e-mail-reader.c:2231 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-attachment-handler.c:182
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../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 ""
 "Redactar unha resposta para todos os destinatarios da mensaxe seleccionada"
 
-#: ../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 Ã _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 "Responder Ã rolda de correo remitente da mensaxe seleccionada"
 
-#: ../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 ao 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 "Redactar unha resposta para o remitente da mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2252
 msgid "_Save as mbox..."
 msgstr "Gardar como mboxâ"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2254
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2259
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2261
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2273
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2275
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../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 "Restabelecer o texto ao seu tamaÃo orixinal"
 
-#: ../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 "Aumentar o tamaÃo do 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 "DiminuÃr o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2303
 msgid "Create R_ule"
 msgstr "Crear unha r_egra"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2310
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃn de car_acteres"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2317
 msgid "F_orward As"
 msgstr "ReencamiÃar c_omoâ"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2324
 msgid "_Group Reply"
 msgstr "_Responder ao 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 "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2352
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2362
 msgid "Search Folder from Mailing _List..."
 msgstr "Cartafol de busca por _lista 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 un cartafol de busca para esta rolda de correo"
 
-#: ../mail/e-mail-reader.c:2262
+#: ../mail/e-mail-reader.c:2369
 msgid "Search Folder from Recipien_ts..."
 msgstr "Cartafol de busca por des_tinatariosâ"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2371
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2269
+#: ../mail/e-mail-reader.c:2376
 msgid "Search Folder from Sen_der..."
 msgstr "Cartafol de busca por _remitenteâ"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2378
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2383
 msgid "Search Folder from S_ubject..."
 msgstr "Cartafol de busca por as_untoâ"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2385
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2408
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimentoâ"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2416
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2420
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2424
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2321
+#: ../mail/e-mail-reader.c:2428
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2432
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2436
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2373
+#: ../mail/e-mail-reader.c:2480
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../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 intermitente no corpo das mensaxes mostradas"
 
-#: ../mail/e-mail-reader.c:2381
+#: ../mail/e-mail-reader.c:2488
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2490
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃnico"
 
-#: ../mail/e-mail-reader.c:2712
+#: ../mail/e-mail-reader.c:2815
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe Â%sÂ"
 
-#: ../mail/e-mail-reader.c:3632
-#: ../modules/mail/e-mail-attachment-handler.c:174
+#: ../mail/e-mail-reader.c:2820
+msgid "Retrieving message"
+msgstr "Descargando mensaxe"
+
+#: ../mail/e-mail-reader.c:3133
+msgid "Parsing message"
+msgstr "Analizando mensaxe"
+
+#: ../mail/e-mail-reader.c:3838
+#: ../modules/mail/e-mail-attachment-handler.c:175
 msgid "_Forward"
 msgstr "_ReencamiÃar"
 
-#: ../mail/e-mail-reader.c:3633
+#: ../mail/e-mail-reader.c:3839
 msgid "Forward the selected message to someone"
 msgstr "ReencamiÃar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3652
+#: ../mail/e-mail-reader.c:3858
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3653
+#: ../mail/e-mail-reader.c:3859
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Responder Ã lista de correo ou a todos os destinatarios"
 
-#: ../mail/e-mail-reader.c:3710 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3916 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3743
-#: ../modules/calendar/e-cal-shell-view-actions.c:1356
+#: ../mail/e-mail-reader.c:3949
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
 #: ../widgets/misc/e-calendar.c:202
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3747
-#: ../modules/calendar/e-cal-shell-view-actions.c:1349
+#: ../mail/e-mail-reader.c:3953
+#: ../modules/calendar/e-cal-shell-view-actions.c:1370
 #: ../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:3962 ../mail/mail-dialogs.ui.h:20
 msgid "Reply"
 msgstr "Responder"
 
-#: ../mail/e-mail-reader.c:4457
+#: ../mail/e-mail-reader.c:4671
 #, c-format
 msgid "Folder '%s'"
 msgstr "Cartafol Â%sÂ"
 
-#: ../mail/e-mail-reader-utils.c:146
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "Non avisarme de novo."
 
+#: ../mail/e-mail-reader-utils.c:506
+msgid "Printing"
+msgstr "Imprimindo"
+
 #. 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 "
@@ -12147,7 +12243,7 @@ msgstr[1] ""
 "O cartafol Â%sÂ contÃn %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:1020
+#: ../mail/e-mail-reader-utils.c:1018
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -12158,12 +12254,17 @@ msgstr[1] "Gardar mensaxes"
 #. * 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] "Mensaxe"
 msgstr[1] "Mensaxes"
 
+#: ../mail/e-mail-request.c:117
+#, c-format
+msgid "Failed to load part '%s'"
+msgstr "Produciuse un fallo ao cargar a parte Â%sÂ"
+
 #: ../mail/e-mail-tag-editor.c:293
 msgid "Flag to Follow Up"
 msgstr "Marcar para facer seguimento"
@@ -12172,7 +12273,7 @@ msgstr "Marcar para facer seguimento"
 #. * 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:"
@@ -12180,19 +12281,23 @@ msgstr ""
 "O ${AbbrevWeekdayName}, ${Day}-${Month}-${Year} Ãs ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} escribiu:"
 
-#: ../mail/em-composer-utils.c:1240
+#: ../mail/em-composer-utils.c:1261
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Mensaxe reencamiÃada --------"
+
+#: ../mail/em-composer-utils.c:1266
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2467
+#: ../mail/em-composer-utils.c:2500
 msgid "an unknown sender"
 msgstr "un remitente descoÃecido"
 
-#: ../mail/em-composer-utils.c:2862
+#: ../mail/em-composer-utils.c:2901
 msgid "Posting destination"
 msgstr "Destino da publicaciÃn"
 
-#: ../mail/em-composer-utils.c:2863
+#: ../mail/em-composer-utils.c:2902
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -12493,11 +12598,11 @@ msgstr "Propiedades do cartafol"
 msgid "<click here to select a folder>"
 msgstr "<prema aquÃ para seleccionar un cartafol>"
 
-#: ../mail/em-folder-selector.c:389
+#: ../mail/em-folder-selector.c:390
 msgid "C_reate"
 msgstr "C_rear"
 
-#: ../mail/em-folder-selector.c:395
+#: ../mail/em-folder-selector.c:396
 msgid "Folder _name:"
 msgstr "_Nome do cartafol:"
 
@@ -12515,37 +12620,37 @@ msgstr "%s (%u%s)"
 msgid "Mail Folder Tree"
 msgstr "Ãrbore de cartafoles de correo"
 
-#: ../mail/em-folder-tree.c:2097 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
 #, c-format
 msgid "Moving folder %s"
 msgstr "Movendo o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2100 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando o cartafol %s"
 
-#: ../mail/em-folder-tree.c:2107 ../mail/message-list.c:2304
+#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2304
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2111 ../mail/message-list.c:2306
+#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2306
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes ao cartafol %s"
 
-#: ../mail/em-folder-tree.c:2130
+#: ../mail/em-folder-tree.c:2165
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Non Ã posÃbel soltar as mensaxe(s) no almacenamento do nivel superior"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:161 ../mail/em-folder-tree-model.c:163
+#: ../mail/em-folder-tree-model.c:158 ../mail/em-folder-tree-model.c:160
 msgid "UNMATCHED"
 msgstr "SEN COINCIDENCIAS"
 
-#: ../mail/em-folder-tree-model.c:789 ../mail/em-folder-tree-model.c:1077
+#: ../mail/em-folder-tree-model.c:775 ../mail/em-folder-tree-model.c:1060
 msgid "Loading..."
 msgstr "Cargandoâ"
 
@@ -12565,106 +12670,57 @@ msgstr "Crear un cartafol"
 msgid "Specify where to create the folder:"
 msgstr "Indicar onde crear o cartafol:"
 
-#: ../mail/em-format-html.c:178
-msgid "Formatting message"
-msgstr "Formatando a mensaxe"
+#: ../mail/em-format-html.c:385
+msgid "Malformed external-body part"
+msgstr "Parte externa ao corpo do mensaxe mal formado"
 
-#: ../mail/em-format-html.c:393
-msgid "Formatting Message..."
-msgstr "Formatando a mensaxeâ"
-
-#: ../mail/em-format-html.c:1637 ../mail/em-format-html.c:1651
-#, c-format
-msgid "Retrieving '%s'"
-msgstr "Obtendo Â%sÂ"
-
-#: ../mail/em-format-html.c:1802 ../mail/em-format-html-display.c:97
-msgid "Unsigned"
-msgstr "Sen asinar"
-
-#: ../mail/em-format-html.c:1803 ../mail/em-format-html-display.c:98
-msgid "Valid signature"
-msgstr "A sinatura Ã correcta"
-
-#: ../mail/em-format-html.c:1804 ../mail/em-format-html-display.c:99
-msgid "Invalid signature"
-msgstr "A sinatura Ã incorrecta"
-
-#: ../mail/em-format-html.c:1805 ../mail/em-format-html-display.c:100
-msgid "Valid signature, but cannot verify sender"
-msgstr "A sinatura Ã correcta, pero non Ã posÃbel comprobar o remitente"
-
-#: ../mail/em-format-html.c:1806 ../mail/em-format-html-display.c:101
-msgid "Signature exists, but need public key"
-msgstr "A sinatura existe, pero precisa unha chave pÃblica"
-
-#: ../mail/em-format-html.c:1812 ../mail/em-format-html-display.c:108
-msgid "Unencrypted"
-msgstr "Sen cifrar"
-
-#: ../mail/em-format-html.c:1813 ../mail/em-format-html-display.c:109
-msgid "Encrypted, weak"
-msgstr "Cifrada, dÃbil"
-
-#: ../mail/em-format-html.c:1814 ../mail/em-format-html-display.c:110
-msgid "Encrypted"
-msgstr "Cifrada"
-
-#: ../mail/em-format-html.c:1815 ../mail/em-format-html-display.c:111
-msgid "Encrypted, strong"
-msgstr "Cifrada, forte"
-
-#: ../mail/em-format-html.c:2210
-msgid "Unknown external-body part."
-msgstr "Parte do corpo externo descoÃecida."
-
-#: ../mail/em-format-html.c:2220
-msgid "Malformed external-body part."
-msgstr "Parte do corpo externo formada incorrectamente."
-
-#: ../mail/em-format-html.c:2251
+#: ../mail/em-format-html.c:417
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro ao 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 "Punteiro ao ficheiro local (%s) correcto no sitio Â%sÂ"
 
-#: ../mail/em-format-html.c:2264
+#: ../mail/em-format-html.c:430
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro ao ficheiro local (%s)"
 
-#: ../mail/em-format-html.c:2285
+#: ../mail/em-format-html.c:449
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro aos 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 "Punteiro aos datos externos descoÃecidos (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:2563
 #: ../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:2583 ../mail/em-format-html.c:2588
 msgid "(no subject)"
 msgstr "(Sen asunto)"
 
-#: ../mail/em-format-html.c:3106
+#: ../mail/em-format-html.c:2731
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Esta mensaxe enviouse por %s no nome de %s"
 
-#: ../mail/em-format-html-display.c:97
+#: ../mail/em-format-html-display.c:91
+msgid "Unsigned"
+msgstr "Sen asinar"
+
+#: ../mail/em-format-html-display.c:91
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12672,7 +12728,11 @@ msgstr ""
 "Esta mensaxe non estÃ asinada. Non hai garantÃa de que a mensaxe sexa "
 "autÃntica."
 
-#: ../mail/em-format-html-display.c:98
+#: ../mail/em-format-html-display.c:92
+msgid "Valid signature"
+msgstr "A sinatura Ã correcta"
+
+#: ../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."
@@ -12680,7 +12740,11 @@ msgstr ""
 "Esta mensaxe estÃ asinada e Ã correcta, o que significa que Ã moi probÃbel "
 "que a mensaxe sexa autÃntica."
 
-#: ../mail/em-format-html-display.c:99
+#: ../mail/em-format-html-display.c:93
+msgid "Invalid signature"
+msgstr "A sinatura Ã incorrecta"
+
+#: ../mail/em-format-html-display.c:93
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12688,7 +12752,11 @@ msgstr ""
 "Non Ã posÃbel comprobar a sinatura desta mensaxe, puido alterarse no "
 "trÃnsito."
 
-#: ../mail/em-format-html-display.c:100
+#: ../mail/em-format-html-display.c:94
+msgid "Valid signature, but cannot verify sender"
+msgstr "A sinatura Ã correcta, pero non Ã posÃbel comprobar o 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."
@@ -12696,14 +12764,22 @@ msgstr ""
 "Esta mensaxe estÃ asinada cunha sinatura correcta, pero non foi posÃbel "
 "comprobar o remitente da mensaxe."
 
-#: ../mail/em-format-html-display.c:101
+#: ../mail/em-format-html-display.c:95
+msgid "Signature exists, but need public key"
+msgstr "A sinatura existe, pero precisa unha chave pÃblica"
+
+#: ../mail/em-format-html-display.c:95
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr ""
 "Esta mensaxe estÃ asinada pero non existe a correspondete chave pÃblica."
 
-#: ../mail/em-format-html-display.c:108
+#: ../mail/em-format-html-display.c:102
+msgid "Unencrypted"
+msgstr "Sen cifrar"
+
+#: ../mail/em-format-html-display.c:102
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -12711,7 +12787,11 @@ msgstr ""
 "Esta mensaxe non estÃ cifrada. O seu contido pode verse no seu 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 "Cifrada, 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 "
@@ -12721,7 +12801,11 @@ msgstr ""
 "ser difÃcil, pero non imposÃbel para un intruso ver o contido desta mensaxe "
 "nun tempo razoÃbel."
 
-#: ../mail/em-format-html-display.c:110
+#: ../mail/em-format-html-display.c:104
+msgid "Encrypted"
+msgstr "Cifrada"
+
+#: ../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."
@@ -12729,7 +12813,11 @@ msgstr ""
 "Esta mensaxe estÃ cifrada. SerÃa difÃcil para un intruso ver o contido desta "
 "mensaxe."
 
-#: ../mail/em-format-html-display.c:111
+#: ../mail/em-format-html-display.c:105
+msgid "Encrypted, strong"
+msgstr "Cifrada, forte"
+
+#: ../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 "
@@ -12739,75 +12827,46 @@ msgstr ""
 "difÃcil para un intruso ver o contido desta mensaxe dentro dun perÃodo de "
 "tempo razoÃbel."
 
-#: ../mail/em-format-html-display.c:259 ../smime/gui/smime-ui.ui.h:43
+#: ../mail/em-format-html-display.c:273 ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Visualizar o certificado"
 
-#: ../mail/em-format-html-display.c:274
+#: ../mail/em-format-html-display.c:288
 msgid "This certificate is not viewable"
 msgstr "Este certificado non Ã visÃbel"
 
-#: ../mail/em-format-html-display.c:589
-msgid ""
-"Evolution cannot render this email as it is too large to process. You can "
-"view it unformatted or with an external text editor."
-msgstr ""
-"O Evolution non pode renderizar este correo electrÃnico porque o seu "
-"procesamento demora demasiado. Pode visualizalo sen formato ou ben con un "
-"editor de texto externo."
-
-#: ../mail/em-format-html-display.c:773
-msgid "Save Image"
-msgstr "Gardar imaxe"
-
-#: ../mail/em-format-html-display.c:821
-msgid "Save _Image..."
-msgstr "Gardar _imaxeâ"
-
-#: ../mail/em-format-html-display.c:823
-msgid "Save the image to a file"
-msgstr "Gardar a imaxe a un ficheiro"
-
-#: ../mail/em-format-html-display.c:1024
+#: ../mail/em-format-html-display.c:951
 msgid "Completed on"
 msgstr "Completado o"
 
-#: ../mail/em-format-html-display.c:1036
+#: ../mail/em-format-html-display.c:963
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: ../mail/em-format-html-display.c:1044
+#: ../mail/em-format-html-display.c:971
 msgid "by"
 msgstr "por"
 
-#: ../mail/em-format-html-display.c:1325 ../mail/em-format-html-display.c:1376
-msgid "View _Unformatted"
-msgstr "Visualizar sen _formato"
-
-#: ../mail/em-format-html-display.c:1327
-msgid "Hide _Unformatted"
-msgstr "Oc_ultar sen formato"
+#: ../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-format-html-display.c:1398
-msgid "O_pen With"
-msgstr "A_brir con"
+#: ../mail/em-format-html-print.c:202
+msgid "GPG signed"
+msgstr "Asinado con GPG"
 
-#. Translators: Name of an Attachment button for a11y object
-#: ../mail/em-format-html-display.c:1407
-msgctxt "Button"
-msgid "Attachment"
-msgstr "Anexo"
+#: ../mail/em-format-html-print.c:207
+msgid "GPG encrpyted"
+msgstr "Cifrado GPG"
 
-#: ../mail/em-format-html-print.c:157
-#, c-format
-msgid "Page %d of %d"
-msgstr "PÃxina %d de %d"
+#: ../mail/em-format-html-print.c:213
+msgid "S/MIME signed"
+msgstr "Cifrado S/MIME"
 
-#: ../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 "Non hai un fluxo HTML dispoÃÃbel"
+#: ../mail/em-format-html-print.c:219
+msgid "S/MIME encrpyted"
+msgstr "Cifrado con S/MIME"
 
 #: ../mail/em-subscription-editor.c:870
 msgid "_Subscribe"
@@ -12822,7 +12881,7 @@ msgid "Subscribe To _All"
 msgstr "Subscribirse a _todos"
 
 #: ../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 "Cancelar a s_ubscriciÃn"
 
@@ -12859,7 +12918,7 @@ msgid "Su_bscribe"
 msgstr "Su_bscribir"
 
 #: ../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 "Cancelar a subscriciÃn ao cartafol seleccionado"
 
@@ -12891,23 +12950,23 @@ msgstr "Deter a operaciÃn actual"
 #. * 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 desexa abrir %d mensaxe Ã vez?"
 msgstr[1] "EstÃ seguro de que desexa abrir %d mensaxes Ã 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 "_Non mostrar esta mensaxe outra vez"
 
-#: ../mail/em-utils.c:318
+#: ../mail/em-utils.c:320
 msgid "Message Filters"
 msgstr "Filtros de mensaxe"
 
-#: ../mail/em-utils.c:979
+#: ../mail/em-utils.c:1004
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensaxes de %s"
@@ -12994,6 +13053,32 @@ msgstr ""
 "Indica se se deben mostrar os cartafoles locais (Neste equipo) nun Ãrbore de "
 "cartafoles."
 
+#: ../mail/evolution-mail.schemas.in.h:114
+msgid "Display only message texts not exceeding certain size"
+msgstr "Mostrar sÃ as mensaxes de texto que non excedan de certo tamaÃo"
+
+#: ../mail/evolution-mail.schemas.in.h:115
+msgid ""
+"Enable to display only message texts not exceeding size defined in "
+"'message_text_part_limit' key."
+msgstr ""
+"Activar a vista dos textos das mensaxes que non excedan o tamaÃo definido "
+"pola chave 'message_text_part_limit'."
+
+#: ../mail/evolution-mail.schemas.in.h:116
+msgid "Message text limit for display"
+msgstr "LÃmite do texto da mensaxe para a vista"
+
+#: ../mail/evolution-mail.schemas.in.h:117
+msgid ""
+"This decides the max size of the message text that will be displayed under "
+"Evolution, specified in terms of KB. The default is 4096 (4MB). This value "
+"is used only when 'force_message_limit' key is activated."
+msgstr ""
+"Isto decide o tamaÃo mÃximo do texto da mensaxe que se pode mostrar no "
+"Evolution, indicado en KB. O tamaÃo predeterminado Ã 4096 (4MB). Este valor "
+"Ãsase sÃ cando a chave 'force_message_limit' estÃ activada."
+
 #: ../mail/evolution-mail.schemas.in.h:123
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
@@ -13828,10 +13913,6 @@ msgstr "TÃboa de cabeceiras de correo"
 msgid "Date/Time Format"
 msgstr "Formato da data e da hora"
 
-#: ../mail/mail-config.ui.h:107
-msgid "Headers"
-msgstr "Cabeceiras"
-
 #: ../mail/mail-config.ui.h:108
 msgid "Check incoming _messages for junk"
 msgstr "Comprobar as _mensaxes entrantes para detectar correo lixo"
@@ -14429,7 +14510,7 @@ msgstr ""
 "eliminadas de todos os cartafoles?"
 
 #: ../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 "_Baleirar o lixo"
 
@@ -14874,24 +14955,40 @@ msgid "N_ever"
 msgstr "N_unca"
 
 #: ../mail/mail.error.xml.h:141
+msgid "Copy folder in folder tree."
+msgstr "Copiar cartafol no Ãrbore de cartafois."
+
+#: ../mail/mail.error.xml.h:142
+msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
+msgstr "Ten certeza que quere copiar o cartafol Â{0}Â a Â{1}Â?"
+
+#: ../mail/mail.error.xml.h:143
+msgid "Move folder in folder tree."
+msgstr "Mover cartafol no Ãrbore de cartafois."
+
+#: ../mail/mail.error.xml.h:144
+msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
+msgstr "EstÃ seguro de que desexa mover o cartafol Â{0}Â a Â{1}Â?"
+
+#: ../mail/mail.error.xml.h:145
 msgid "Signature Already Exists"
 msgstr "A sinatura xa 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 "Xa existe unha sinatura co nome Â{0}Â. Use un nome diferente."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:147
 msgid "Blank Signature"
 msgstr "Sinatura en branco"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
 msgid "Please provide an unique name to identify this signature."
 msgstr "Introduza un nome Ãnico para identificar esta sinatura."
 
-#: ../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"
@@ -14899,85 +14996,85 @@ msgstr ""
 "Non Ã posÃbel enviar esta mensaxe porque a conta que escolleu para enviala "
 "non 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 a conta ou faga o envÃo usando outra conta."
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:151
 msgid "Mail Deletion Failed"
 msgstr "Produciuse un fallo na eliminaciÃn do 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 "Non ten os permisos suficientes para eliminar este correo."
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:153
 msgid "\"Check Junk\" Failed"
 msgstr "Produciuse un fallo na comprobaciÃn do correo lixo"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:154
 msgid "\"Report Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do correo lixo"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Not Junk\" Failed"
 msgstr "Produciuse un fallo ao informar do que non Ã correo lixo"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:156
 msgid "Remove duplicate messages?"
 msgstr "Desexa eliminar as mensaxes duplicadas?"
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:157
 msgid "No duplicate messages found."
 msgstr "Non se atoparon mensaxes duplicadas."
 
 #. 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 "O cartafol Â{0}Â non contÃn ningunha mensaxe duplicada."
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:160
 msgid "Failed to unsubscribe from folder."
 msgstr "Produciuse un fallo ao eliminar a subscriciÃn do cartafol."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:162
 msgid "Unable to retrieve message."
 msgstr "Non foi posÃbel obter a mensaxe."
 
-#: ../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 "Produciuse un erro ao abrir o cartafol."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to find duplicate messages."
 msgstr "Produciuse un fallo ao buscar as mensaxes duplicadas."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to retrieve messages."
 msgstr "Produciuse un fallo ao obter as mensaxes."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Produciuse un fallo ao quitar os anexos das mensaxes."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr ""
 "Produciuse un fallo ao descargar as mensaxes para traballar sen conexiÃn"
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Produciuse un fallo ao gardar as mensaxes ao disco."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Existe un ficheiro oculto adxunto."
 
-#: ../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."
@@ -14985,27 +15082,39 @@ msgstr ""
 "O anexo co nome {0} Ã un ficheiro oculto e pode conter datos sensÃbeis. "
 "RevÃseo antes de envialo."
 
-#: ../mail/mail-send-recv.c:207
+#: ../mail/mail.error.xml.h:172
+msgid "Printing failed."
+msgstr "Produciuse un fallo ao imprimir."
+
+#: ../mail/mail.error.xml.h:173
+msgid "The printer replied &quot;{0}&quot;."
+msgstr "A impresora respondeu &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:174
+msgid "Could not perform this operation on {0}."
+msgstr "Non Ã posÃbel realizar esta operaciÃn en {0}."
+
+#: ../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 e recibir o correo"
 
-#: ../mail/mail-send-recv.c:550
+#: ../mail/mail-send-recv.c:551
 msgid "Cancel _All"
 msgstr "Cancel_ar 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 "Agardandoâ"
 
-#: ../mail/mail-send-recv.c:1009
+#: ../mail/mail-send-recv.c:1016
 #, c-format
 msgid "Checking for new mail"
 msgstr "Comprobando se hai correo novo"
@@ -15064,7 +15173,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 "Hoxe Ãs %l:%M %p"
 
@@ -15125,11 +15234,6 @@ msgstr "Marcada"
 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 "Estado das marcas"
@@ -15155,27 +15259,27 @@ msgid "Subject or Addresses contains"
 msgstr "O asunto ou os enderezos conteÃen"
 
 #: ../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 "Os destinatarios conteÃen"
 
 #: ../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 "A mensaxe contÃn"
 
 #: ../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 "O asunto contÃn"
 
 #: ../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 "O remitente contÃn"
 
 #: ../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 "O corpo contÃn"
 
@@ -15382,7 +15486,7 @@ msgstr "Crear unha axenda de enderezos nova"
 #: ../modules/addressbook/e-book-shell-view.c:402
 #: ../modules/calendar/e-cal-shell-backend.c:121
 #: ../modules/calendar/e-cal-shell-migrate.c:63
-#: ../modules/online-accounts/e-online-accounts-google.c:376
+#: ../modules/online-accounts/e-online-accounts-google.c:378
 msgid "Contacts"
 msgstr "Contactos"
 
@@ -15442,10 +15546,10 @@ msgstr ""
 "Mostrar o mapa con tÃdolos contactos do caderno de enderezos seleccionado"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:858
-#: ../modules/calendar/e-cal-shell-view-actions.c:1405
+#: ../modules/calendar/e-cal-shell-view-actions.c:1426
 #: ../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 "_Renomearâ"
 
@@ -15518,7 +15622,7 @@ msgid "Send a message to the selected contacts"
 msgstr "Enviar unha mensaxe aos contactos seleccionados"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:937
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 #: ../modules/calendar/e-task-shell-view-actions.c:822
 msgid "_Actions"
 msgstr "_AcciÃns"
@@ -15526,19 +15630,19 @@ msgstr "_AcciÃns"
 #: ../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"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:953
-#: ../modules/calendar/e-cal-shell-view-actions.c:1557
+#: ../modules/calendar/e-cal-shell-view-actions.c:1599
 #: ../modules/calendar/e-memo-shell-view-actions.c:690
 #: ../modules/calendar/e-task-shell-view-actions.c:842
 msgid "_Delete"
 msgstr "E_liminar"
 
 #: ../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"
 
@@ -15565,7 +15669,7 @@ msgstr "Mostrar mapas na xanela 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"
 
@@ -15576,7 +15680,7 @@ msgstr "Mostrar a vista previa do contacto embaixo da lista de contactos"
 #: ../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"
 
@@ -15585,24 +15689,24 @@ msgid "Show contact preview alongside the contact list"
 msgstr "Mostrar a vista previa do contacto ao carÃn da lista de contactos"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1039
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1738
 #: ../modules/calendar/e-memo-shell-view-actions.c:764
 #: ../modules/calendar/e-task-shell-view-actions.c:935
 msgid "Any Category"
 msgstr "Calquera categorÃa"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1046
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
 #: ../modules/calendar/e-memo-shell-view-actions.c:771
 #: ../modules/calendar/e-task-shell-view-actions.c:970
 msgid "Unmatched"
 msgstr "Sen coincidencias"
 
 #: ../modules/addressbook/e-book-shell-view-actions.c:1056
-#: ../modules/calendar/e-cal-shell-view-actions.c:1727
+#: ../modules/calendar/e-cal-shell-view-actions.c:1769
 #: ../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 "Busca avanzada"
@@ -16124,24 +16228,24 @@ msgstr ""
 "Isto pode ter tres valores diferentes: 0 para erros, 1 para avisos e 2 para "
 "as mensaxes de depuraciÃn."
 
-#: ../modules/calendar/e-cal-attachment-handler.c:316
+#: ../modules/calendar/e-cal-attachment-handler.c:320
 #: ../smime/gui/smime-ui.ui.h:32
 msgid "I_mport"
 msgstr "I_mportar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:397
+#: ../modules/calendar/e-cal-attachment-handler.c:401
 msgid "Select a Calendar"
 msgstr "Seleccionar un calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:424
+#: ../modules/calendar/e-cal-attachment-handler.c:428
 msgid "Select a Task List"
 msgstr "Seleccionar unha lista de tarefas"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:434
+#: ../modules/calendar/e-cal-attachment-handler.c:438
 msgid "I_mport to Calendar"
 msgstr "I_mportar ao calendario"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:441
+#: ../modules/calendar/e-cal-attachment-handler.c:445
 msgid "I_mport to Tasks"
 msgstr "_Importar Ãs tarefas"
 
@@ -16219,7 +16323,7 @@ msgid "_24 hour"
 msgstr "_24 horas"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1679
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "Work Week"
 msgstr "Semana laboral"
 
@@ -16398,7 +16502,7 @@ msgid "_Appointment"
 msgstr "Cit_a"
 
 #: ../modules/calendar/e-cal-shell-backend.c:453
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1526
 msgid "Create a new appointment"
 msgstr "Crear unha cita nova"
 
@@ -16426,7 +16530,7 @@ msgid "Cale_ndar"
 msgstr "Cale_ndario"
 
 #: ../modules/calendar/e-cal-shell-backend.c:477
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
@@ -16452,11 +16556,6 @@ msgstr "Selector de calendario"
 msgid "Opening calendar at %s"
 msgstr "Abrindo o 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 "
@@ -16473,21 +16572,21 @@ msgstr ""
 msgid "Purge events older than"
 msgstr "Purgar as actividades anteriores a"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:564
+#: ../modules/calendar/e-cal-shell-view-actions.c:585
 msgid "Copying Items"
 msgstr "Copiando os elementos"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:848
+#: ../modules/calendar/e-cal-shell-view-actions.c:869
 msgid "Moving Items"
 msgstr "Movendo os elementos"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1175
+#: ../modules/calendar/e-cal-shell-view-actions.c:1196
 msgid "event"
 msgstr "actividade"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1177
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 #: ../modules/calendar/e-cal-shell-view-memopad.c:219
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:286
 #: ../modules/calendar/e-memo-shell-view-actions.c:524
@@ -16495,111 +16594,135 @@ msgstr "actividade"
 msgid "Save as iCalendar"
 msgstr "Gardar como iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1335
+#: ../modules/calendar/e-cal-shell-view-actions.c:1356
 #: ../modules/calendar/e-memo-shell-view-actions.c:605
 msgid "_Copy..."
 msgstr "_Copiarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1342
+#: ../modules/calendar/e-cal-shell-view-actions.c:1363
 msgid "D_elete Calendar"
 msgstr "_Eliminar o calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Delete the selected calendar"
 msgstr "Eliminar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
+#: ../modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Go Back"
 msgstr "AtrÃs"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Go Forward"
 msgstr "Adiante"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Select today"
 msgstr "Seleccionar o dÃa de hoxe"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1370
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Select _Date"
 msgstr "Seleccionar unha _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Select a specific date"
 msgstr "Seleccionar unha data determinada"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "_New Calendar"
 msgstr "Calendario _novo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1391
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 #: ../modules/calendar/e-task-shell-view-actions.c:813
 msgid "Purg_e"
 msgstr "P_urgar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Purge old appointments and meetings"
 msgstr "Purgar as citas e reuniÃns antigas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1398
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 #: ../modules/calendar/e-memo-shell-view-actions.c:633
 #: ../modules/calendar/e-task-shell-view-actions.c:757
 msgid "Re_fresh"
 msgstr "Ac_tualizar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Refresh the selected calendar"
 msgstr "Actualizar o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../modules/calendar/e-cal-shell-view-actions.c:1428
 msgid "Rename the selected calendar"
 msgstr "Renomear o calendario seleccionado"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1412
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+msgid "Find _next"
+msgstr "Buscar segui_nte"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "Find next occurrence of the current search string"
+msgstr "Buscar a seguinte coincidencia da frase de busca actual"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+msgid "Find _previous"
+msgstr "_Buscar _anterior"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+msgid "Find previous occurrence of the current search string"
+msgstr "Buscar a coincidencia anterior da frase de busca actual"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+msgid "Stop _running search"
+msgstr "Dete_r a busca en execuciÃn"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "Stop currently running search"
+msgstr "Deter a busca actual en execuciÃn"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "Show _Only This Calendar"
 msgstr "M_ostrar sÃ este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1419
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar ao calendarioâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1426
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "_Delegate Meeting..."
 msgstr "_Delegar a reuniÃnâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "_Delete Appointment"
 msgstr "_Eliminar esta cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
+#: ../modules/calendar/e-cal-shell-view-actions.c:1477
 msgid "Delete selected appointments"
 msgstr "Eliminar as citas seleccionadas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Delete This _Occurrence"
 msgstr "Eliminar esta _apariciÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
+#: ../modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "Delete this occurrence"
 msgstr "Eliminar esta apariciÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "Delete All Occ_urrences"
 msgstr "Eliminar _todas as apariciÃns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Delete all occurrences"
 msgstr "Eliminar todas as apariciÃns"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1454
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "New All Day _Event..."
 msgstr "Nova _actividade de dÃa completoâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Create a new all day event"
 msgstr "Crear unha actividade nova de dÃa completo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1461
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 #: ../modules/calendar/e-cal-shell-view-memopad.c:253
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:326
 #: ../modules/calendar/e-memo-shell-view-actions.c:598
@@ -16607,127 +16730,127 @@ msgstr "Crear unha actividade nova de dÃa completo"
 msgid "_Forward as iCalendar..."
 msgstr "ReemcamiÃa_r como iCalendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1468
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "New _Meeting..."
 msgstr "_ReuniÃn novaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Create a new meeting"
 msgstr "Crear unha reuniÃn nova"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1475
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver ao calendarioâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 msgid "New _Appointment..."
 msgstr "Cit_a novaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "Make this Occurrence _Movable"
 msgstr "Facer esta apariciÃn _desprazÃbel"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1496
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "_Open Appointment"
 msgstr "_Abrir unha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../modules/calendar/e-cal-shell-view-actions.c:1540
 msgid "View the current appointment"
 msgstr "Ver a cita actual"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1503
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1517
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Schedule Meeting..."
 msgstr "_Programar unha reuniÃnâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "Converts an appointment to a meeting"
 msgstr "Converte una cita nunha reuniÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1524
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Conv_ert to Appointment..."
 msgstr "Conv_erter en citaâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1568
 msgid "Converts a meeting to an appointment"
 msgstr "Converte unha reuniÃn nunha cita"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1531
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
 msgid "Quit"
 msgstr "SaÃr"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../modules/calendar/e-cal-shell-view-actions.c:1693
 msgid "Day"
 msgstr "DÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../modules/calendar/e-cal-shell-view-actions.c:1695
 msgid "Show one day"
 msgstr "Mostrar un dÃa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1658
+#: ../modules/calendar/e-cal-shell-view-actions.c:1700
 msgid "List"
 msgstr "Lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
 msgid "Show as list"
 msgstr "Mostrar como unha lista"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1665
+#: ../modules/calendar/e-cal-shell-view-actions.c:1707
 msgid "Month"
 msgstr "Mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1667
+#: ../modules/calendar/e-cal-shell-view-actions.c:1709
 msgid "Show one month"
 msgstr "Mostrar un mes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1672
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "Week"
 msgstr "Semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1674
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show one week"
 msgstr "Mostrar unha semana"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1681
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show one work week"
 msgstr "Mostrar unha semana laboral"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1731
 msgid "Active Appointments"
 msgstr "Citas activas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1745
 msgid "Next 7 Days' Appointments"
 msgstr "Citas dos prÃximos sete dÃas"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Occurs Less Than 5 Times"
 msgstr "Acontece menos de 5 veces"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1741
+#: ../modules/calendar/e-cal-shell-view-actions.c:1783
 #: ../modules/calendar/e-memo-shell-view-actions.c:795
 #: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Description contains"
 msgstr "A descriciÃn contÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1748
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
 #: ../modules/calendar/e-memo-shell-view-actions.c:802
 #: ../modules/calendar/e-task-shell-view-actions.c:1001
 msgid "Summary contains"
 msgstr "O resumo contÃn"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
+#: ../modules/calendar/e-cal-shell-view-actions.c:1802
 msgid "Print this calendar"
 msgstr "Imprimir este calendario"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1809
 msgid "Preview the calendar to be printed"
 msgstr "Previsualizar o calendario que se vai imprimir"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1789
+#: ../modules/calendar/e-cal-shell-view-actions.c:1831
 #: ../modules/calendar/e-cal-shell-view-memopad.c:294
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:381
 #: ../modules/calendar/e-memo-shell-view-actions.c:843
@@ -16735,7 +16858,7 @@ msgstr "Previsualizar o calendario que se vai imprimir"
 msgid "_Save as iCalendar..."
 msgstr "Gardar como iCalendarâ"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1866
+#: ../modules/calendar/e-cal-shell-view-actions.c:1908
 msgid "Go To"
 msgstr "Ir a"
 
@@ -16779,6 +16902,32 @@ msgstr "Abrir a pÃxina _web"
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
 
+#: ../modules/calendar/e-cal-shell-view-private.c:1443
+msgid "Searching next matching event"
+msgstr "Buscando o seguinte evento coincidente"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1444
+msgid "Searching previous matching event"
+msgstr "Buscando o anterior evento coincidente"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1462
+#, c-format
+msgid "Cannot find matching event in the next %d year"
+msgid_plural "Cannot find matching event in the next %d years"
+msgstr[0] "Non Ã posÃbel atopar un evento coincidente dentro de %d ano"
+msgstr[1] "Non Ã posÃbel atopar un evento coincidente dentro de %d anos"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1465
+#, c-format
+msgid "Cannot find matching event in the previous %d year"
+msgid_plural "Cannot find matching event in the previous %d years"
+msgstr[0] "Non Ã posÃbel atopar un evento coincidente fai %d ano"
+msgstr[1] "Non Ã posÃbel atopar un evento coincidente fai %d anos"
+
+#: ../modules/calendar/e-cal-shell-view-private.c:1486
+msgid "Cannot search with no active calendar"
+msgstr "Non Ã posÃbel buscar sen un calendario activo"
+
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
@@ -17133,7 +17282,7 @@ msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../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"
@@ -17191,304 +17340,304 @@ msgstr "Asistente de contas do Evolution"
 msgid "Account Editor"
 msgstr "Editor de contas"
 
-#: ../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 a conta"
 
-#: ../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 conta"
 
-#: ../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 todas as mensaxes eliminadas de todos os cartafoles"
 
-#: ../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 "Modificar as propiedades desta conta"
 
-#: ../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 as mensaxes para o uso sen 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 as mensaxes das contas e cartafoles marcados para uso sen 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 "Lim_par a caixa de saÃda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1215
+#: ../modules/mail/e-mail-shell-view-actions.c:1243
 msgid "_Copy Folder To..."
 msgstr "_Copiar o cartafol 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 "Copiar o cartafol seleccionado noutro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1224
+#: ../modules/mail/e-mail-shell-view-actions.c:1252
 msgid "Permanently remove this folder"
 msgstr "Eliminar permanentemente este cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1229
+#: ../modules/mail/e-mail-shell-view-actions.c:1257
 msgid "E_xpunge"
 msgstr "Com_pactar"
 
-#: ../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 "Eliminar permanentemente as mensaxes eliminadas deste cartafol"
 
-#: ../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 "Ma_rcar todas as mensaxes como lidas"
 
-#: ../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 todas as mensaxes do cartafol como lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1243
+#: ../modules/mail/e-mail-shell-view-actions.c:1271
 msgid "_Move Folder To..."
 msgstr "_Mover o cartafol 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 "Mover o cartafol seleccionado a outro cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1250
+#: ../modules/mail/e-mail-shell-view-actions.c:1278
 msgid "_New..."
 msgstr "_Novoâ"
 
-#: ../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 "Crear un cartafol novo para gardar o 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 "Modificar as propiedades deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1266
+#: ../modules/mail/e-mail-shell-view-actions.c:1294
 msgid "Refresh the folder"
 msgstr "Actualizar o cartafol"
 
-#: ../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 "Modificar o nome deste cartafol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1278
+#: ../modules/mail/e-mail-shell-view-actions.c:1306
 msgid "Select Message _Thread"
 msgstr "Seleccionar a _conversa desta mensaxe"
 
-#: ../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 ""
 "Seleccionar todas as mensaxes da mesma conversa que a mensaxe seleccionada"
 
-#: ../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 a conversa sec_undaria desta mensaxe"
 
-#: ../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 as respostas Ã mensaxe seleccionada"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1299
+#: ../modules/mail/e-mail-shell-view-actions.c:1327
 msgid "Empty _Trash"
 msgstr "Baleirar o _lixo"
 
-#: ../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 todas as mensaxes eliminadas de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1306
+#: ../modules/mail/e-mail-shell-view-actions.c:1334
 msgid "_New Label"
 msgstr "Etiqueta _nova"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1315
+#: ../modules/mail/e-mail-shell-view-actions.c:1343
 msgid "N_one"
 msgstr "Nin_gÃn"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1329
+#: ../modules/mail/e-mail-shell-view-actions.c:1357
 msgid "_Manage Subscriptions"
 msgstr "Xestionar as _subscriciÃns"
 
-#: ../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 ""
 "Subscribir ou eliminar as subscriciÃns a cartafoles 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 / _Recibir"
 
-#: ../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 "Enviar os elementos da cola e obter os elementos novos"
 
-#: ../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 todos"
 
-#: ../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 os elementos novos de todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1350
+#: ../modules/mail/e-mail-shell-view-actions.c:1378
 msgid "_Send All"
 msgstr "_Enviar todos"
 
-#: ../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 os elementos da cola de todas as contas"
 
-#: ../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 "Cancelar a 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 "Pregar todos as _conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1387
+#: ../modules/mail/e-mail-shell-view-actions.c:1415
 msgid "Collapse all message threads"
 msgstr "Pregar todos as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1392
+#: ../modules/mail/e-mail-shell-view-actions.c:1420
 msgid "E_xpand All Threads"
 msgstr "D_espregar todas as conversas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1394
+#: ../modules/mail/e-mail-shell-view-actions.c:1422
 msgid "Expand all message threads"
 msgstr "Despregar todas as conversas da mensaxe"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1399
+#: ../modules/mail/e-mail-shell-view-actions.c:1427
 msgid "_Message Filters"
 msgstr "Filtros de _mensaxe"
 
-#: ../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 ou editar regras para o filtrado do correo novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1406
+#: ../modules/mail/e-mail-shell-view-actions.c:1434
 msgid "_Subscriptions..."
 msgstr "_SubscriciÃnsâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1415
+#: ../modules/mail/e-mail-shell-view-actions.c:1443
 msgid "F_older"
 msgstr "Cartaf_ol"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1422
+#: ../modules/mail/e-mail-shell-view-actions.c:1450
 msgid "_Label"
 msgstr "_Etiqueta"
 
-#: ../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 "C_rear un cartafol de busca a partir da buscaâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1446
+#: ../modules/mail/e-mail-shell-view-actions.c:1474
 msgid "Search F_olders"
 msgstr "Cartaf_oles de busca"
 
-#: ../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 ou editar as definiciÃns dos cartafoles de busca"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1483
+#: ../modules/mail/e-mail-shell-view-actions.c:1511
 msgid "_New Folder..."
 msgstr "Cartafol _novoâ"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1511
+#: ../modules/mail/e-mail-shell-view-actions.c:1539
 msgid "Show Message _Preview"
 msgstr "Mostrar a vista _previa da mensaxe"
 
-#: ../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 o panel de vista previa das mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Show _Deleted Messages"
 msgstr "Mostrar as mensaxes _eliminadas"
 
-#: ../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 as mensaxes eliminadas riscÃndoas."
 
-#: ../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 conversas"
 
-#: ../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 mensaxes por conversas"
 
-#: ../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 a vista previa da mensaxe embaixo da lista de mensaxes"
 
-#: ../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 a vista previa da mensaxe a carÃn da lista de mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "All Messages"
 msgstr "Todas as mensaxes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1572
+#: ../modules/mail/e-mail-shell-view-actions.c:1600
 msgid "Important Messages"
 msgstr "Mensaxes 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 "Mensaxes dos Ã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 "Mensaxes que non son lixo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1593
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Messages with Attachments"
 msgstr "Mensaxes con anexos"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1600
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "No Label"
 msgstr "Sen etiqueta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1607
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Read Messages"
 msgstr "Mensaxes lidas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 msgid "Recent Messages"
 msgstr "Mensaxes recentes"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1649
 msgid "Unread Messages"
 msgstr "Mensaxes sen ler"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1673
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "Subject or Addresses contain"
 msgstr "O asunto ou os enderezos conteÃen"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1683
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "All Accounts"
 msgstr "Todas as contas"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1690
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Current Account"
 msgstr "Conta actual"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1697
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Current Folder"
 msgstr "Cartafol actual"
 
@@ -17504,68 +17653,68 @@ msgstr "Buscar na conta"
 msgid "Proxy _Logout"
 msgstr "_Terminar a 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 seleccionada, "
 msgstr[1] "%d seleccionadas, "
 
-#: ../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 eliminada"
 msgstr[1] "%d eliminadas"
 
-#: ../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 correo lixo"
 msgstr[1] "%d correos lixo"
 
-#: ../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 sen enviar"
 msgstr[1] "%d sen 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 sen ler, "
 msgstr[1] "%d sen ler, "
 
-#: ../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 "Lixo"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1579
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
@@ -17767,51 +17916,63 @@ msgstr "Isto farÃ que SpamAssassin sexa mÃis fiÃbel, pero tamÃn mÃis lento"
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:283
+#: ../modules/startup-wizard/evolution-startup-wizard.c:136
+msgid ""
+"Welcome to Evolution. The next few screens will allow Evolution to connect "
+"to your email accounts, and to import files from other applications."
+msgstr ""
+"Benvido/a ao Evolution. As seguintes pantallas permitiranlle conectar "
+"Evolution coas sÃas contas de correo e importar ficheiros desde outros "
+"aplicativos."
+
+#: ../modules/startup-wizard/evolution-startup-wizard.c:297
 #: ../widgets/misc/e-import-assistant.c:403
 msgid "Please select the information that you would like to import:"
 msgstr "Seleccione a informaciÃn que desexa importar:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:315
+#: ../modules/startup-wizard/evolution-startup-wizard.c:329
 #: ../widgets/misc/e-import-assistant.c:559
 #, c-format
 msgid "From %s:"
 msgstr "De: %s:"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:326
-#: ../modules/startup-wizard/evolution-startup-wizard.c:424
+#: ../modules/startup-wizard/evolution-startup-wizard.c:340
+#: ../modules/startup-wizard/evolution-startup-wizard.c:438
 msgid "Importing Files"
 msgstr "Importando os ficheiros"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:402
+#: ../modules/startup-wizard/evolution-startup-wizard.c:416
 msgid "Import cancelled."
 msgstr "ImportaciÃn cancelada."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:420
+#: ../modules/startup-wizard/evolution-startup-wizard.c:434
 msgid "Import complete."
 msgstr "ImportaciÃn rematada."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:494
+#: ../modules/startup-wizard/evolution-startup-wizard.c:508
 msgid "Evolution Setup Assistant"
 msgstr "Asistente de configuraciÃn do Evolution"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:500
+#: ../modules/startup-wizard/evolution-startup-wizard.c:514
 msgid "Welcome"
 msgstr "Benvido/a"
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:505
-msgid ""
-"Welcome to Evolution. The next few screens will allow Evolution to connect "
-"to your email accounts, and to import files from other applications."
-msgstr ""
-"Benvido/a ao Evolution. As seguintes pantallas permitiranlle conectar "
-"Evolution coas sÃas contas de correo e importar ficheiros desde outros "
-"aplicativos."
-
-#: ../modules/startup-wizard/evolution-startup-wizard.c:613
+#: ../modules/startup-wizard/evolution-startup-wizard.c:626
 msgid "Loading accounts..."
 msgstr "Cargando contasâ"
 
+#: ../modules/web-inspector/evolution-web-inspector.c:88
+msgid "_Inspect..."
+msgstr "_Inspeccionarâ"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:90
+msgid "Inspect the HTML content (debugging feature)"
+msgstr "Inspeccionar o contido HTML (caracterÃstica de depurado)"
+
+#: ../modules/web-inspector/evolution-web-inspector.c:102
+msgid "Evolution Web Inspector"
+msgstr "Inspector web de Evolution"
+
 #: ../plugins/addressbook-file/org-gnome-addressbook-file.eplug.xml.h:1
 msgid "Local Address Books"
 msgstr "Axendas de enderezos locais"
@@ -17820,11 +17981,11 @@ msgstr "Axendas de enderezos locais"
 msgid "Add local address books to Evolution."
 msgstr "Engadir axendas de enderezos locais ao Evolution."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:136
+#: ../plugins/attachment-reminder/attachment-reminder.c:128
 msgid "_Do not show this message again."
 msgstr "_Non mostrar esta mensaxe outra vez."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:484
+#: ../plugins/attachment-reminder/attachment-reminder.c:588
 #: ../plugins/templates/templates.c:462
 msgid "Keywords"
 msgstr "Palabras chave"
@@ -18663,8 +18824,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 "Erro descoÃecido."
 
@@ -18751,154 +18912,154 @@ msgstr "Axuste fino das sÃas contas IMAP."
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Produciuse un fallo ao cargar o 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 "Unha cita no calendario Â%sÂ entra en conflito 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 "Localizouse a cita no calendario Â%sÂ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:802
+#: ../plugins/itip-formatter/itip-formatter.c:804
 msgid "Unable to find any calendars"
 msgstr "Non Ã posÃbel atopar 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 "Non Ã posÃbel atopar 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 "Non Ã posÃbel atopar esta tarefa en ningunha lista de tarefas"
 
-#: ../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 "Non Ã posÃbel atopar esta nota en ningunha lista de notas"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1119
+#: ../plugins/itip-formatter/itip-formatter.c:1128
 msgid "Opening the calendar. Please wait..."
 msgstr "Abrindo o calendario. Agardeâ"
 
-#: ../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 unha versiÃn existente desta 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 "Non Ã posÃbel enviar o elemento ao 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 ao 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 ao calendario Â%sÂ como provisional"
 
-#: ../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 ao calendario Â%sÂ como rexeitado"
 
-#: ../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 ao 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 "Gardando os cambios no calendario. Agardeâ"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1620
+#: ../plugins/itip-formatter/itip-formatter.c:1643
 msgid "Unable to parse item"
 msgstr "Non Ã posÃbel analizar o 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 "O organizador eliminou o 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 "Enviouse unha notificaciÃn de cancelaciÃn ao 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 "Non foi posÃbel enviar unha notificaciÃn de cancelaciÃn ao delegado"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1855
+#: ../plugins/itip-formatter/itip-formatter.c:1895
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non Ã posÃbel actualizar o participante. %s"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1861
+#: ../plugins/itip-formatter/itip-formatter.c:1902
 msgid "Attendee status updated"
 msgstr "Actualizouse o estado de participante"
 
-#: ../plugins/itip-formatter/itip-formatter.c:1881
+#: ../plugins/itip-formatter/itip-formatter.c:1925
 msgid "The meeting is invalid and cannot be updated"
 msgstr "A reuniÃn no Ã vÃlida e non pode actualizarse"
 
-#: ../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 ""
 "Non foi posÃbel actualizar o estado de participante debido a que o estado "
 "non Ã 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 ""
 "Non foi posÃbel actualizar o estado de participante porque xa non existe o "
 "elemento"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2086
+#: ../plugins/itip-formatter/itip-formatter.c:2157
 msgid "Meeting information sent"
 msgstr "Enviouse a informaciÃn da reuniÃn"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2089
+#: ../plugins/itip-formatter/itip-formatter.c:2162
 msgid "Task information sent"
 msgstr "Enviouse a informaciÃn da tarefa"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2092
+#: ../plugins/itip-formatter/itip-formatter.c:2167
 msgid "Memo information sent"
 msgstr "Enviouse a informaciÃn da nota"
 
-#: ../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 "Non Ã posÃbel enviar a informaciÃn da reuniÃn, a reuniÃn non 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 "Non Ã posÃbel enviar a informaciÃn da tarefa, a tarefa non 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 "Non Ã posÃbel enviar a informaciÃn da nota, a nota non 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 "calendar.ics"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2178
+#: ../plugins/itip-formatter/itip-formatter.c:2258
 msgid "Save Calendar"
 msgstr "Gardar o 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 "O calendario anexado non Ã 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."
@@ -18906,15 +19067,15 @@ msgstr ""
 "A mensaxe di que contÃn un calendario pero o calendario non Ã un iCalendar "
 "correcto."
 
-#: ../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 "O elemento do calendario non Ã 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"
@@ -18922,11 +19083,11 @@ msgstr ""
 "A mensaxe contÃn un calendario pero o calendario non contÃn actividades, "
 "tarefas nin informaciÃn de dispoÃibilidade"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2335
+#: ../plugins/itip-formatter/itip-formatter.c:2408
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contÃn mÃltiples elementos"
 
-#: ../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"
@@ -18934,235 +19095,235 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2860
+#: ../plugins/itip-formatter/itip-formatter.c:2924
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../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 cita repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:2997
+#: ../plugins/itip-formatter/itip-formatter.c:3086
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3000
+#: ../plugins/itip-formatter/itip-formatter.c:3089
 msgid "This memo recurs"
 msgstr "Esta nota repÃtese"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3231
+#: ../plugins/itip-formatter/itip-formatter.c:3394
 msgid "Meeting Invitations"
 msgstr "Convites a reuniÃns"
 
-#: ../plugins/itip-formatter/itip-formatter.c:3257
+#: ../plugins/itip-formatter/itip-formatter.c:3420
 msgid "_Delete message after acting"
 msgstr "E_liminar a mensaxe despois da acciÃn"
 
-#: ../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 "Busca de conflitos"
 
 #. 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 "Seleccionar os calendarios nos que buscar conflitos entre reuniÃns"
 
 #. 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 "Hoxe Ãs %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 "Hoxe Ãs %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 "Hoxe Ãs %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ÃÃ Ãs %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ÃÃ Ãs %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ÃÃ Ãs %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ÃÃ Ãs %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 %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 %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 %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 %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, %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, %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, %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, %e de %B de %Y, %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 "Unha persoa descoÃecida"
 
-#: ../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 de parte 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 de parte 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 publicou a seguinte informaciÃn da 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 publicou a seguinte informaciÃn da 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 delegoulle a reuniÃn seguinte:"
 
-#: ../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 a sÃa presenza na seguinte 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 a sÃa presenza na seguinte 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 desexa apuntarse a unha 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 desexa apuntarse a unha 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 "
@@ -19171,87 +19332,87 @@ msgstr ""
 "%s desexa recibir a Ãltima informaciÃn sobre a prÃxima 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 desexa recibir a Ãltima informaciÃn da seguinte 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 enviou a seguinte resposta Ã 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 enviou a seguinte resposta Ã 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 cancelou a seguinte 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 cancelou a seguinte 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 propuxo as seguintes modificaciÃns para a 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 propuxo os seguintes cambios para a 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 rexeitou as seguintes modificaciÃns para a 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 rexeitou os seguintes cambios para a 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 publicou a seguinte tarefa 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 publicou a seguinte tarefa:"
 
-#: ../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 a asignaciÃn de %s para a seguinte tarefa:"
 
-#: ../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 asignoulle unha tarefa 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 asignoulle unha tarefa:"
 
-#: ../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 desexa apuntarse a unha tarefa 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 desexa apuntarse a unha tarefa 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 "
@@ -19260,201 +19421,187 @@ msgstr ""
 "%s desexa recibir a Ãltima informaciÃn para a seguinte tarefa 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 desexa recibir a Ãltima informaciÃn para a seguinte tarefa 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 enviou a seguinte resposta para a tarefa 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 enviou a seguinte resposta Ã tarefa asignada:"
 
-#: ../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 cancelou a seguinte tarefa asignada 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 cancelou a seguinte tarefa 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 propuxo as seguintes modificaciÃns na asignaciÃn de tarefas 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 propuxo as seguintes modificaciÃns na asignaciÃn de tarefas:"
 
-#: ../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 rexeitou a seguinte tarefa 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 rexeitou a seguinte tarefa 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 publicou a seguinte 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 publicou a seguinte 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 desexa apuntarse a unha 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 desexa apuntarse a unha 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 cancelou a seguinte 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 cancelou a seguinte nota compartida:"
 
-#: ../plugins/itip-formatter/itip-view.c:693
+#: ../plugins/itip-formatter/itip-view.c:652
 msgid "All day:"
 msgstr "Todo o 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 finalizaciÃn:"
 
-#. 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 finalizaciÃn:"
 
-#. Everything gets the open button
-#: ../plugins/itip-formatter/itip-view.c:851
-msgid "_Open Calendar"
-msgstr "Abrir un calendari_o"
-
-#: ../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 "_Rexeitar"
-
-#: ../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 "_Rexeitar todo"
-
-#: ../plugins/itip-formatter/itip-view.c:862
-msgid "_Tentative all"
-msgstr "Facer 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 "Act_ualizar o estado do participante"
-
-#: ../plugins/itip-formatter/itip-view.c:881
-msgid "_Update"
-msgstr "Act_ualizar"
-
-#. Comment
-#: ../plugins/itip-formatter/itip-view.c:1092
-#: ../plugins/itip-formatter/itip-view.c:1148
+#: ../plugins/itip-formatter/itip-view.c:1099
+msgid "Open Calendar"
+msgstr "Abrir calendario"
+
+#: ../plugins/itip-formatter/itip-view.c:1102
+msgid "Decline all"
+msgstr "Rexeitar todo"
+
+#: ../plugins/itip-formatter/itip-view.c:1105
+msgid "Decline"
+msgstr "Rexeitar"
+
+#: ../plugins/itip-formatter/itip-view.c:1108
+msgid "Tentative all"
+msgstr "Provisional todo"
+
+#: ../plugins/itip-formatter/itip-view.c:1114
+msgid "Accept all"
+msgstr "Aceptar todo"
+
+#: ../plugins/itip-formatter/itip-view.c:1117
+msgid "Accept"
+msgstr "Aceptar"
+
+#: ../plugins/itip-formatter/itip-view.c:1120
+msgid "Send Information"
+msgstr "Enviar informaciÃn"
+
+#: ../plugins/itip-formatter/itip-view.c:1123
+msgid "Update Attendee Status"
+msgstr "_Actualizar o estado do participante"
+
+#: ../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:"
 
-#: ../plugins/itip-formatter/itip-view.c:1131
-msgid "Send _reply to sender"
-msgstr "_Responder ao remitente"
+#. RSVP area
+#: ../plugins/itip-formatter/itip-view.c:1198
+msgid "Send reply to sender"
+msgstr "Responder ao remitente"
+
+#. Updates
+#: ../plugins/itip-formatter/itip-view.c:1212
+msgid "Send updates to attendees"
+msgstr "Enviar actualizaciÃns aos participantes"
 
-#: ../plugins/itip-formatter/itip-view.c:1171
-msgid "Send _updates to attendees"
-msgstr "Enviar as act_ualizaciÃns aos participantes"
+#. The recurrence check button
+#: ../plugins/itip-formatter/itip-view.c:1215
+msgid "Apply to all instances"
+msgstr "Aplicar a todas as instancias"
 
-#: ../plugins/itip-formatter/itip-view.c:1180
-msgid "_Apply to all instances"
-msgstr "_Aplicar en todos os casos"
+#: ../plugins/itip-formatter/itip-view.c:1216
+msgid "Show time as free"
+msgstr "Mostrar hora como libre"
 
-#: ../plugins/itip-formatter/itip-view.c:1191
-msgid "Show time as _free"
-msgstr "Mostrar a hora como _libre"
+#: ../plugins/itip-formatter/itip-view.c:1217
+msgid "Preserve my reminder"
+msgstr "Conservar o meu recordatorio"
 
-#: ../plugins/itip-formatter/itip-view.c:1194
-msgid "_Preserve my reminder"
-msgstr "_Conservar o meu aviso"
+#: ../plugins/itip-formatter/itip-view.c:1218
+msgid "Inherit reminder"
+msgstr "Herdar recordatorio"
 
-#. To Translators: This is a check box to inherit a reminder.
-#: ../plugins/itip-formatter/itip-view.c:1200
-msgid "_Inherit reminder"
-msgstr "Av_iso herdado"
+#: ../plugins/itip-formatter/itip-view.c:1542
+msgid "Tasks:"
+msgstr "Tarefas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1982
-msgid "_Tasks:"
-msgstr "_Tarefas:"
+#: ../plugins/itip-formatter/itip-view.c:1545
+msgid "Memos:"
+msgstr "Notas:"
 
-#: ../plugins/itip-formatter/itip-view.c:1984
-msgid "_Memos:"
-msgstr "_Notas:"
+#: ../plugins/itip-formatter/itip-view.c:2862
+msgid "Save"
+msgstr "Gardar"
 
 #: ../plugins/itip-formatter/org-gnome-itip-formatter.eplug.xml.h:1
 msgid "Itip Formatter"
@@ -19624,6 +19771,33 @@ msgstr ""
 "\n"
 "Cabeceira: {0}"
 
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:5
+msgid "Play sound when new messages arrive."
+msgstr "Reproducir un son cando cheguen mensaxes novas."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:6
+msgid "Whether play sound or beep when new messages arrive."
+msgstr ""
+"Indica se reproducir un son ou un ton de aviso cando cheguen mensaxes novas."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:7
+msgid "Beep or play sound file."
+msgstr "Emitir un ton de aviso ou un ficheiro de son."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:8
+msgid ""
+"If \"true\", then beep, otherwise will play sound file when new messages "
+"arrive."
+msgstr ""
+"Se Ã ÂcertoÂ emitirÃ un ton de aviso, en caso contrario reproducirÃ un "
+"ficheiro de son cando cheguen mensaxes novas."
+
+#: ../plugins/mail-notification/apps-evolution-mail-notification.schemas.in.h:10
+msgid "Sound file to be played when new messages arrive, if not in beep mode."
+msgstr ""
+"Ficheiro de son que desexa reproducir cando chegue unha mensaxe nova, se non "
+"estÃ no modo de ton de aviso."
+
 #: ../plugins/mail-notification/mail-notification.c:384
 #, c-format
 msgid ""
@@ -19703,12 +19877,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Notificar a chegada de mensaxes novas."
 
 #. 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 electrÃnico por %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 "
@@ -19717,7 +19891,7 @@ msgstr ""
 "O calendario seleccionado xa contÃn unha actividade Â%sÂ. Desexa editar a "
 "actividade antiga?"
 
-#: ../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 "
@@ -19726,7 +19900,7 @@ msgstr ""
 "A lista de tarefas seleccionadas xa contÃn unha tarefa Â%sÂ. Desexa editar a "
 "tarefa antiga?"
 
-#: ../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 "
@@ -19736,7 +19910,7 @@ msgstr ""
 "nota antiga?"
 
 #. 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 "
@@ -19752,7 +19926,7 @@ msgstr[1] ""
 "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 "
@@ -19766,7 +19940,7 @@ msgstr[1] ""
 "Seleccionou %d correos para convertelos en tarefas. Desexa engadilos 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 "
@@ -19779,29 +19953,29 @@ msgstr[0] ""
 msgstr[1] ""
 "Seleccionou %d correos para convertelos en notas. Desexa engadilos 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 "Desexa continuar convertendo os correos restantes?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:751
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Sen resumo]"
 
-#: ../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 "O obxecto devolto por un servidor non Ã 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 "Produciuse un erro no proceso: %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 "Non Ã posÃbel abrir o 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."
@@ -19809,7 +19983,7 @@ msgstr ""
 "A fonte seleccionada Ã sÃ de lectura polo que non Ã posÃbel crear "
 "actividades nela. Seleccione outra fonte."
 
-#: ../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."
@@ -19817,7 +19991,7 @@ msgstr ""
 "A fonte seleccionada Ã sÃ de lectura polo que non Ã posÃbel crear tarefas "
 "nela. Seleccione outra fonte."
 
-#: ../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."
@@ -19825,44 +19999,44 @@ msgstr ""
 "A fonte seleccionada Ã sÃ de lectura polo que non Ã posÃbel crear notas "
 "nela. Seleccione outra fonte."
 
-#: ../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 "Non Ã posÃbel obter a lista fonte. %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 "Non hai ningÃn calendario escribÃbel dispoÃÃbel."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1258
+#: ../plugins/mail-to-task/mail-to-task.c:1255
 msgid "Create an _Event"
 msgstr "Cr_ear unha actividade"
 
-#: ../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 unha actividade nova a partir da mensaxe seleccionada"
 
-#: ../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 unha n_ota"
 
-#: ../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 unha nota nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create a _Task"
 msgstr "Crear unha _tarefa"
 
-#: ../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 unha tarefa nova a partir da mensaxe seleccionada"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1279
 msgid "Create a _Meeting"
 msgstr "Crear unha _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 unha reuniÃn nova a partir da mensaxe seleccionada"
 
@@ -19915,19 +20089,19 @@ msgstr "Modo de texto simple"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ver as mensaxes de correo como texto plano aÃnda que conteÃan HTML."
 
-#: ../plugins/prefer-plain/prefer-plain.c:250
+#: ../plugins/prefer-plain/prefer-plain.c:246
 msgid "Show HTML if present"
 msgstr "Mostrar HTML se 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 "Deixar que o Evolution escolla a mellor 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 en texto plano se 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."
@@ -19935,11 +20109,11 @@ msgstr ""
 "Mostrar a parte en texto plano se estÃ presente, doutro xeito permitir que o "
 "Evolution seleccione a mellor 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Ã mostrar en 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."
@@ -19947,11 +20121,11 @@ msgstr ""
 "Mostrar sempre a parte de texto plano e converter en anexos as outras partes "
 "se se solicita."
 
-#: ../plugins/prefer-plain/prefer-plain.c:311
+#: ../plugins/prefer-plain/prefer-plain.c:307
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Mostra as partes HTML _suprimidas convertidas en anexos"
 
-#: ../plugins/prefer-plain/prefer-plain.c:333
+#: ../plugins/prefer-plain/prefer-plain.c:329
 msgid "HTML _Mode"
 msgstr "_Modo HTML"
 
@@ -20321,32 +20495,33 @@ msgstr "vCards inseridas"
 msgid "Show vCards directly in mail messages."
 msgstr "Mostrar as vCards directamente nas mensaxes 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:372
+msgid "Save To Addressbook"
+msgstr "Gardar na axenda de enderezos"
+
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../plugins/vcard-inline/vcard-inline.c:272
+#: ../plugins/vcard-inline/vcard-inline.c:381
 msgid "There is one other contact."
 msgstr "Hai outro contacto mÃis."
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../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] "Hai %d contacto mÃis."
 msgstr[1] "Hai %d contactos mÃis."
 
-#: ../plugins/vcard-inline/vcard-inline.c:302
-msgid "Save in Address Book"
-msgstr "Gardar na axenda de enderezos"
-
 #: ../plugins/webdav-account-setup/org-gnome-evolution-webdav.eplug.xml.h:1
 msgid "WebDAV contacts"
 msgstr "Contactos WebDAV"
@@ -20896,13 +21071,13 @@ msgid "New"
 msgstr "Novo"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:577
+#: ../shell/e-shell-window-private.c:582
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:188
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20939,7 +21114,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro traballo, e\n"
 "agardamos con ansias as sÃas colaboraciÃns!\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20947,13 +21122,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:219
+#: ../shell/main.c:221
 msgid "Do not tell me again"
 msgstr "Non preguntarme de novo"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:310
+#: ../shell/main.c:312
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20961,47 +21136,47 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoÃente indicado. As opciÃn dispoÃÃbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:316
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa indicada Ã xanela principal"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:320
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:322
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoÃibilidade da rede"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:324
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo ÂexpressÂ"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:330
+#: ../shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:334
+#: ../shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saÃda dun proceso de execuciÃn do Evolution"
 
-#: ../shell/main.c:510 ../shell/main.c:518
+#: ../shell/main.c:515 ../shell/main.c:523
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:583
+#: ../shell/main.c:588
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21010,7 +21185,7 @@ msgstr ""
 "%s: --online e --offline non poden usarse Ã vez.\n"
 "  Use Â%s --helpÂ para mÃis informaciÃn.\n"
 
-#: ../shell/main.c:589
+#: ../shell/main.c:594
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21863,49 +22038,49 @@ msgid "Attached message"
 msgstr "Mensaxe anexada"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1811 ../widgets/misc/e-attachment.c:2349
+#: ../widgets/misc/e-attachment.c:1821 ../widgets/misc/e-attachment.c:2369
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1854 ../widgets/misc/e-attachment.c:2651
+#: ../widgets/misc/e-attachment.c:1869 ../widgets/misc/e-attachment.c:2671
 msgid "A load operation is already in progress"
 msgstr "Xa se estÃ en proceso unha operaciÃn de carga"
 
-#: ../widgets/misc/e-attachment.c:1862 ../widgets/misc/e-attachment.c:2659
+#: ../widgets/misc/e-attachment.c:1877 ../widgets/misc/e-attachment.c:2679
 msgid "A save operation is already in progress"
 msgstr "Xa se estÃ en proceso unha operaciÃn de gardado"
 
-#: ../widgets/misc/e-attachment.c:1954
+#: ../widgets/misc/e-attachment.c:1974
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posÃbel cargar Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1957
+#: ../widgets/misc/e-attachment.c:1977
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posÃbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2230
+#: ../widgets/misc/e-attachment.c:2250
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posÃbel abrir Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2233
+#: ../widgets/misc/e-attachment.c:2253
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posÃbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2667
+#: ../widgets/misc/e-attachment.c:2687
 msgid "Attachment contents not loaded"
 msgstr "Non se cargaron os contidos do anexo"
 
-#: ../widgets/misc/e-attachment.c:2743
+#: ../widgets/misc/e-attachment.c:2763
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posÃbel gardar Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2746
+#: ../widgets/misc/e-attachment.c:2766
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posÃbel gardar o anexo"
@@ -22017,7 +22192,7 @@ msgid "Open this attachment in %s"
 msgstr "Abrir este anexo en %s"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../widgets/misc/e-buffer-tagger.c:387
+#: ../widgets/misc/e-buffer-tagger.c:389
 msgid "Ctrl-click to open a link"
 msgstr "Ctrl+clic para abrir unha ligazÃn"
 
@@ -22042,7 +22217,7 @@ msgstr "Introduza o conxunto de caracteres que se vai usar"
 msgid "Other..."
 msgstr "Outroâ"
 
-#: ../widgets/misc/e-contact-map-window.c:355
+#: ../widgets/misc/e-contact-map-window.c:359
 msgid "Contacts Map"
 msgstr "Mapa dos contactos"
 
@@ -22225,48 +22400,48 @@ msgstr ""
 msgid "Evolution Preferences"
 msgstr "Preferencias do Evolution"
 
-#: ../widgets/misc/e-search-bar.c:85
+#: ../widgets/misc/e-search-bar.c:79
 #, c-format
-msgid "Matches: %d"
-msgstr "Coincidencias: %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 "Pechar esta barra de busca"
 
-#: ../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 "Limpar a busca"
 
-#: ../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 a anterior apariciÃn na frase"
 
-#: ../widgets/misc/e-search-bar.c:629
+#: ../widgets/misc/e-search-bar.c:590
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: ../widgets/misc/e-search-bar.c:635
+#: ../widgets/misc/e-search-bar.c:596
 msgid "Find the next occurrence of the phrase"
 msgstr "Buscar a seguinte apariciÃn na frase"
 
-#: ../widgets/misc/e-search-bar.c:648
+#: ../widgets/misc/e-search-bar.c:609
 msgid "Mat_ch case"
 msgstr "_Coincidir maiÃsculas e minÃsculas"
 
-#: ../widgets/misc/e-search-bar.c:676
+#: ../widgets/misc/e-search-bar.c:637
 msgid "Reached bottom of page, continued from top"
 msgstr "Alcanzouse o final da pÃxina, continÃase desde o inicio"
 
-#: ../widgets/misc/e-search-bar.c:698
+#: ../widgets/misc/e-search-bar.c:659
 msgid "Reached top of page, continued from bottom"
 msgstr "Alcanzouse o inicio da pÃxina, continÃase desde o final"
 
@@ -22458,49 +22633,53 @@ msgstr "O ficheiro do script debe ser executÃbel."
 msgid "Click here to go to URL"
 msgstr "Prema aquÃ para ir ao URL"
 
-#: ../widgets/misc/e-web-view.c:410
+#: ../widgets/misc/e-web-view.c:275 ../widgets/misc/e-web-view-gtkhtml.c:409
 msgid "_Copy Link Location"
 msgstr "_Copiar a localizaciÃn da ligazÃn"
 
-#: ../widgets/misc/e-web-view.c:412
+#: ../widgets/misc/e-web-view.c:277 ../widgets/misc/e-web-view-gtkhtml.c:411
 msgid "Copy the link to the clipboard"
 msgstr "Copiar a ligazÃn no portapapeis"
 
-#: ../widgets/misc/e-web-view.c:420
+#: ../widgets/misc/e-web-view.c:285 ../widgets/misc/e-web-view-gtkhtml.c:419
 msgid "_Open Link in Browser"
 msgstr "_Abrir a ligazÃn no navegador"
 
-#: ../widgets/misc/e-web-view.c:422
+#: ../widgets/misc/e-web-view.c:287 ../widgets/misc/e-web-view-gtkhtml.c:421
 msgid "Open the link in a web browser"
 msgstr "_Abrir a ligazÃn no navegador web"
 
-#: ../widgets/misc/e-web-view.c:430
+#: ../widgets/misc/e-web-view.c:295 ../widgets/misc/e-web-view-gtkhtml.c:429
 msgid "_Copy Email Address"
 msgstr "Copiar o enderezo de _correo"
 
-#: ../widgets/misc/e-web-view.c:447
+#: ../widgets/misc/e-web-view.c:312 ../widgets/misc/e-web-view-gtkhtml.c:446
 msgid "_Copy Image"
 msgstr "_Copiar imaxe"
 
-#: ../widgets/misc/e-web-view.c:449
+#: ../widgets/misc/e-web-view.c:314 ../widgets/misc/e-web-view-gtkhtml.c:448
 msgid "Copy the image to the clipboard"
 msgstr "Copiar a imaxe ao portapapeis"
 
-#: ../widgets/misc/e-web-view.c:469 ../widgets/misc/e-web-view.c:1318
+#: ../widgets/misc/e-web-view.c:334 ../widgets/misc/e-web-view.c:1410
+#: ../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 o texto e as imaxes"
 
-#: ../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:1067 ../widgets/misc/e-web-view.c:1069
+#: ../widgets/misc/e-web-view.c:1071 ../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 "Prema para chamar a %s"
 
-#: ../widgets/misc/e-web-view.c:988
+#: ../widgets/misc/e-web-view.c:1073 ../widgets/misc/e-web-view-gtkhtml.c:963
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:990
+#: ../widgets/misc/e-web-view.c:1075 ../widgets/misc/e-web-view-gtkhtml.c:965
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -22783,6 +22962,54 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "FIXME"
+#~ msgstr "ARRANXAR"
+
+#~ msgid "Formatting message"
+#~ msgstr "Formatando a mensaxe"
+
+#~ msgid "Formatting Message..."
+#~ msgstr "Formatando a mensaxeâ"
+
+#~ msgid "Retrieving '%s'"
+#~ msgstr "Obtendo Â%sÂ"
+
+#~ msgid "Unknown external-body part."
+#~ msgstr "Parte do corpo externo descoÃecida."
+
+#~ msgid ""
+#~ "Evolution cannot render this email as it is too large to process. You can "
+#~ "view it unformatted or with an external text editor."
+#~ msgstr ""
+#~ "O Evolution non pode renderizar este correo electrÃnico porque o seu "
+#~ "procesamento demora demasiado. Pode visualizalo sen formato ou ben con un "
+#~ "editor de texto externo."
+
+#~ msgid "View _Unformatted"
+#~ msgstr "Visualizar sen _formato"
+
+#~ msgid "Hide _Unformatted"
+#~ msgstr "Oc_ultar sen formato"
+
+#~ msgid "O_pen With"
+#~ msgstr "A_brir con"
+
+#~ msgctxt "Button"
+#~ msgid "Attachment"
+#~ msgstr "Anexo"
+
+#~ msgid "No HTML stream available"
+#~ msgstr "Non hai un fluxo HTML dispoÃÃbel"
+
+#~ msgid "_Decline"
+#~ msgstr "_Rexeitar"
+
+#~ msgid "A_ccept"
+#~ msgstr "A_ceptar"
+
+#~ msgid "_Tentative"
+#~ msgstr "_Provisional"
+
 #~ msgid "Recent _Documents"
 #~ msgstr "_Documentos recentes"
 
@@ -23048,18 +23275,9 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Header Value Contains:"
 #~ msgstr "O valor da cabeceira contÃn:"
 
-#~ msgid "Header Name:"
-#~ msgstr "Nome da cabeceira:"
-
 #~ msgid "I_nclude threads"
 #~ msgstr "I_ncluÃr fÃos"
 
-#~ msgid "Decline"
-#~ msgstr "Rexeitar"
-
-#~ msgid "Accept"
-#~ msgstr "Aceptar"
-
 #~ msgid "_Group:"
 #~ msgstr "_Grupo:"
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]