[evolution] Updated Galician translations



commit 6225b7f61ef8d46d17e6359802f85ee1b8cbce4d
Author: Fran DiÃguez <fran dieguez mabishu com>
Date:   Wed Oct 31 11:00:09 2012 +0100

    Updated Galician translations

 po/gl.po | 1845 +++++++++++++++++++++++++++++++-------------------------------
 1 files changed, 923 insertions(+), 922 deletions(-)
---
diff --git a/po/gl.po b/po/gl.po
index 464ddec..d0d753c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1,10 +1,8 @@
 # translation of evolution to Galician.
 # Copyright (C) 2000 JesÃs Bravo Ãlvarez.
 # Copyright (C) 2001 Manuel A. FernÃndez Montecelo.
-#
 # Proxecto Trasno - AdaptaciÃn do software libre à lingua galega:  Se desexas
 # colaborar connosco, podes atopar mÃis informaciÃn en http://www.trasno.net
-#
 # JesÃs Bravo Ãlvarez <jba pobox com>, 2000.
 # Manuel A. FernÃndez Montecelo <manuel sindominio net>, 2001, 2005.
 # Ignacio Casal Quinteiro <nacho resa gmail com>, 2005, 2006.
@@ -15,22 +13,21 @@
 # Fran DiÃguez <frandieguez gnome org>, 2009, 2010, 2011, 2012.
 # Leandro Regueiro <leandro regueiro gmail com>, 2012.
 # Fran Dieguez <frandieguez gnome org>, 2012.
-#
-#: ../shell/main.c:555
+#: ../shell/main.c:586
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution-master-po-gl-53747.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-30 04:00+0200\n"
-"PO-Revision-Date: 2012-08-30 04:01+0200\n"
+"POT-Creation-Date: 2012-10-31 10:55+0100\n"
+"PO-Revision-Date: 2012-10-31 10:59+0200\n"
 "Last-Translator: Fran Dieguez <frandieguez gnome org>\n"
-"Language-Team: Galician <gnome-l10n-gl gnome org>\n"
+"Language-Team: gnome-l10n-gl gnome org\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-"X-Generator: Gtranslator 2.91.5\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
@@ -334,7 +331,7 @@ msgstr "PÃxi_na web:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:722
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1842
+#: ../modules/itip-formatter/itip-view.c:1858
 msgid "_Calendar:"
 msgstr "_Calendario:"
 
@@ -438,7 +435,7 @@ msgstr "Aniversario"
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
+#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:135
 msgid "Birthday"
 msgstr "Aniversario"
 
@@ -479,7 +476,7 @@ msgstr "_Enderezo:"
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:193
 #: ../addressbook/gui/widgets/eab-contact-display.c:399
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../widgets/misc/e-contact-map.c:306
 msgid "Home"
 msgstr "Particular"
 
@@ -488,7 +485,7 @@ msgstr "Particular"
 #: ../addressbook/gui/widgets/eab-contact-display.c:396
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:74
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../widgets/misc/e-contact-map.c:314
 msgid "Work"
 msgstr "Traballo"
 
@@ -572,15 +569,15 @@ msgstr "Produciuse un erro ao retirar o contacto"
 msgid "Contact Editor - %s"
 msgstr "Editor de contactos - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3450
 msgid "Please select an image for this contact"
 msgstr "Escolla unha imaxe para este contacto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3451
 msgid "_No image"
 msgstr "_Sen imaxe"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3784
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -588,28 +585,28 @@ msgstr ""
 "Os datos do contacto son incorrectos:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3790
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "Â%s ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3797
 #, 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:3766
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3805
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%sÂ%s ten un formato incorrecto"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3818
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3832
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%sÂ%s està baleiro"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3847
 msgid "Invalid contact."
 msgstr "Contacto incorrecto."
 
@@ -849,7 +846,7 @@ msgid "Send a mail message to this address"
 msgstr "Enviar unha mensaxe a este enderezo"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1102 ../widgets/misc/e-web-view-gtkhtml.c:973
+#: ../widgets/misc/e-web-view.c:1097 ../widgets/misc/e-web-view-gtkhtml.c:973
 #, c-format
 msgid "Click to mail %s"
 msgstr "Prema para enviar un correo a %s"
@@ -1562,7 +1559,7 @@ msgstr[1] "horas"
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/gui/dialogs/recurrence-page.c:1199
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dÃa"
@@ -1590,11 +1587,11 @@ msgid "_Dismiss"
 msgstr "_Ignorar"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1755
-#: ../calendar/alarm-notify/alarm-queue.c:1765
+#: ../calendar/alarm-notify/alarm-queue.c:1757
+#: ../calendar/alarm-notify/alarm-queue.c:1767
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1460
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../modules/itip-formatter/itip-view.c:1472
+#: ../modules/itip-formatter/itip-view.c:1583
 msgid "Location:"
 msgstr "LocalizaciÃn:"
 
@@ -1623,43 +1620,41 @@ msgstr "dÃas"
 msgid "hours"
 msgstr "horas"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
 #: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minutos"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1604
-#: ../calendar/alarm-notify/alarm-queue.c:1736
+#: ../calendar/alarm-notify/alarm-queue.c:1606
+#: ../calendar/alarm-notify/alarm-queue.c:1738
 msgid "No summary available."
 msgstr "Non hai un resumo dispoÃÃbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1613
 #: ../calendar/alarm-notify/alarm-queue.c:1615
+#: ../calendar/alarm-notify/alarm-queue.c:1617
 msgid "No description available."
 msgstr "Non hai unha descriciÃn dispoÃÃbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1625
 msgid "No location information available."
 msgstr "Non hai informaciÃn da localizaciÃn dispoÃÃbel."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1669
+#: ../calendar/alarm-notify/alarm-queue.c:1671
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "Ten %d recordatorio"
 msgstr[1] "Ten %d recordatorios"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1865
-#: ../calendar/alarm-notify/alarm-queue.c:1900
+#: ../calendar/alarm-notify/alarm-queue.c:1867
+#: ../calendar/alarm-notify/alarm-queue.c:1902
 msgid "Warning"
 msgstr "Aviso"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1869
+#: ../calendar/alarm-notify/alarm-queue.c:1871
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1671,7 +1666,7 @@ msgstr ""
 "para enviar unha mensaxe de correo electrÃnico. No seu lugar\n"
 "O Evolution vai mostrar un diÃlogo de aviso normal."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1906
+#: ../calendar/alarm-notify/alarm-queue.c:1908
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1688,7 +1683,7 @@ msgstr ""
 "\n"
 "Està seguro de que desexa executar este programa?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1921
+#: ../calendar/alarm-notify/alarm-queue.c:1923
 msgid "Do not ask me about this program again."
 msgstr "Non volver preguntar sobre este programa."
 
@@ -1963,7 +1958,7 @@ msgstr ""
 "anexos."
 
 #: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3078
+#: ../modules/itip-formatter/itip-view.c:3094
 msgid "_Save"
 msgstr "_Gardar"
 
@@ -2563,7 +2558,7 @@ msgid "Close the current window"
 msgstr "Pechar a xanela actual"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
+#: ../shell/e-shell-window-actions.c:1443
 #: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
 #: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1428
 #: ../widgets/misc/e-web-view-gtkhtml.c:456
@@ -2572,14 +2567,14 @@ msgid "Copy the selection"
 msgstr "Copiar a selecciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
+#: ../shell/e-shell-window-actions.c:1450
 #: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
 #: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
 msgid "Cut the selection"
 msgstr "Cortar a selecciÃn"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
+#: ../shell/e-shell-window-actions.c:1457
 #: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
 msgid "Delete the selection"
 msgstr "Eliminar a selecciÃn"
@@ -2589,7 +2584,7 @@ msgid "View help"
 msgstr "Ver a axuda"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
+#: ../shell/e-shell-window-actions.c:1478
 #: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
 #: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
 msgid "Paste the clipboard"
@@ -2600,7 +2595,7 @@ msgid "Save current changes"
 msgstr "Gardar os cambios actuais"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:294
+#: ../widgets/misc/e-mail-signature-editor.c:301
 msgid "Save and Close"
 msgstr "Gardar e pechar"
 
@@ -2609,7 +2604,7 @@ msgid "Save current changes and close editor"
 msgstr "Gardar os cambios actuais e pechar o editor"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
+#: ../shell/e-shell-window-actions.c:1555
 #: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
 msgid "Select all text"
 msgstr "Seleccionar todo o texto"
@@ -2622,19 +2617,19 @@ msgstr "_ClasificaciÃn"
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
 #: ../mail/e-mail-browser.c:169
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
+#: ../shell/e-shell-window-actions.c:1583
 #: ../widgets/menus/gal-define-views.ui.h:5
 msgid "_Edit"
 msgstr "_Editar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:299
+#: ../shell/e-shell-window-actions.c:1590
+#: ../widgets/misc/e-mail-signature-editor.c:306
 msgid "_File"
 msgstr "_Ficheiro"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../shell/e-shell-window-actions.c:1597
 msgid "_Help"
 msgstr "A_xuda"
 
@@ -2648,7 +2643,7 @@ msgid "_Options"
 msgstr "_OpciÃns"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../shell/e-shell-window-actions.c:1632 ../smime/gui/smime-ui.ui.h:28
 msgid "_View"
 msgstr "_Vista"
 
@@ -2741,19 +2736,19 @@ msgid "Attach"
 msgstr "Anexar"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2647
-#: ../calendar/gui/dialogs/comp-editor.c:3651
+#: ../calendar/gui/dialogs/comp-editor.c:2650
+#: ../calendar/gui/dialogs/comp-editor.c:3654
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "As modificaciÃns realizadas neste elemento pÃdense rexeitar se chega unha "
 "actualizaciÃn"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3615
+#: ../calendar/gui/dialogs/comp-editor.c:3618
 #: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
 msgid "attachment"
 msgstr "anexo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3683
+#: ../calendar/gui/dialogs/comp-editor.c:3686
 msgid "Unable to use current version!"
 msgstr "Non à posÃbel usar a versiÃn actual!"
 
@@ -2913,7 +2908,7 @@ msgstr "_DispoÃibilidade"
 msgid "Query free / busy information for the attendees"
 msgstr "Consultar a informaciÃn de dispoÃibilidade para os participantes"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
+#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3391
 msgid "Appointment"
 msgstr "Cita"
 
@@ -3163,7 +3158,7 @@ msgstr "Seleccionar unha data"
 msgid "Select _Today"
 msgstr "Seleccionar o dÃa de _hoxe"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
+#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3395
 msgid "Memo"
 msgstr "Nota"
 
@@ -3199,9 +3194,9 @@ msgstr "Non à posÃbel abrir as notas en Â%sÂ: %s"
 #: ../em-format/e-mail-parser-inlinepgp-signed.c:96
 #: ../em-format/e-mail-parser-multipart-encrypted.c:122
 #: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
-#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
-#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
+#: ../libemail-engine/mail-ops.c:760 ../mail/e-mail-reader.c:1733
+#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4574
+#: ../modules/itip-formatter/itip-view.c:4925 ../plugins/face/face.c:174
 #: ../smime/gui/certificate-manager.c:317
 msgid "Unknown error"
 msgstr "Erro descoÃecido"
@@ -3284,14 +3279,14 @@ msgstr "Esta cita contÃn repeticiÃns que o Evolution non pode editar."
 msgid "Recurrence date is invalid"
 msgstr "A data da repeticiÃn non à correcta"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1013
 msgid "End time of the recurrence was before event's start"
 msgstr ""
 "A hora de finalizaciÃn da repeticiÃn era anterior à do inicio da actividade"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1043
 msgid "on"
 msgstr "en"
 
@@ -3299,7 +3294,7 @@ msgstr "en"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1106
 msgid "first"
 msgstr "primeiro"
 
@@ -3308,7 +3303,7 @@ msgstr "primeiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1112
 msgid "second"
 msgstr "segundo"
 
@@ -3316,7 +3311,7 @@ msgstr "segundo"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1117
 msgid "third"
 msgstr "terceiro"
 
@@ -3324,7 +3319,7 @@ msgstr "terceiro"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1122
 msgid "fourth"
 msgstr "cuarto"
 
@@ -3332,7 +3327,7 @@ msgstr "cuarto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1127
 msgid "fifth"
 msgstr "quinto"
 
@@ -3340,13 +3335,13 @@ msgstr "quinto"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1132
 msgid "last"
 msgstr "Ãltimo"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1152
+#: ../calendar/gui/dialogs/recurrence-page.c:1156
 msgid "Other Date"
 msgstr "Outra data"
 
@@ -3354,7 +3349,7 @@ msgstr "Outra data"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1158
+#: ../calendar/gui/dialogs/recurrence-page.c:1162
 msgid "1st to 10th"
 msgstr "Do 1 ao 10"
 
@@ -3362,7 +3357,7 @@ msgstr "Do 1 ao 10"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1164
+#: ../calendar/gui/dialogs/recurrence-page.c:1168
 msgid "11th to 20th"
 msgstr "do 11 ao 20"
 
@@ -3370,41 +3365,41 @@ msgstr "do 11 ao 20"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1174
 msgid "21st to 31st"
 msgstr "Do 21 ao 31"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1200
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Luns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1201
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Martes"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1202
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "MÃrcores"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/gui/dialogs/recurrence-page.c:1203
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Xoves"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Venres"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "SÃbado"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Domingo"
@@ -3412,31 +3407,31 @@ msgstr "Domingo"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1326
+#: ../calendar/gui/dialogs/recurrence-page.c:1330
 msgid "on the"
 msgstr "no"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1505
+#: ../calendar/gui/dialogs/recurrence-page.c:1509
 msgid "occurrences"
 msgstr "apariciÃns"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2221
+#: ../calendar/gui/dialogs/recurrence-page.c:2225
 msgid "Add exception"
 msgstr "Engadir unha excepciÃn"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2266
 msgid "Could not get a selection to modify."
 msgstr "Non foi posÃbel obter unha selecciÃn para modificar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2268
+#: ../calendar/gui/dialogs/recurrence-page.c:2272
 msgid "Modify exception"
 msgstr "Modificar a excepciÃn"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2312
+#: ../calendar/gui/dialogs/recurrence-page.c:2316
 msgid "Could not get a selection to delete."
 msgstr "Non foi posÃbel obter unha selecciÃn para eliminar."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2451
+#: ../calendar/gui/dialogs/recurrence-page.c:2455
 msgid "Date/Time"
 msgstr "Data e hora"
 
@@ -3553,7 +3548,7 @@ msgstr "Sen definir"
 #: ../calendar/gui/e-cal-model-tasks.c:489
 #: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
 #: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/print.c:3472 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Non iniciada"
 
@@ -3564,7 +3559,7 @@ msgstr "Non iniciada"
 #: ../calendar/gui/e-cal-model-tasks.c:776
 #: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
 #: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3408
+#: ../calendar/gui/print.c:3475
 msgid "In Progress"
 msgstr "En progreso"
 
@@ -3575,7 +3570,7 @@ msgstr "En progreso"
 #: ../calendar/gui/e-cal-model-tasks.c:778
 #: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
 #: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3478
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
@@ -3587,7 +3582,7 @@ msgstr "Completada"
 #: ../calendar/gui/e-cal-model-tasks.c:495
 #: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
 #: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/print.c:3481 ../mail/mail-send-recv.c:879
 msgid "Canceled"
 msgstr "Cancelada"
 
@@ -3636,7 +3631,7 @@ msgstr "Prema para cambiar ou ver a informaciÃn do estado da tarefa"
 msgid "_Send Options"
 msgstr "OpciÃn_s de envÃo"
 
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
+#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3393
 #: ../widgets/misc/e-send-options.c:553
 msgid "Task"
 msgstr "Tarefa"
@@ -3792,7 +3787,7 @@ msgid "Gnome Calendar"
 msgstr "Calendario do GNOME"
 
 #: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../modules/calendar/e-cal-shell-view-private.c:1104
 msgid "%A %d %b %Y"
 msgstr "%A, %d de %b de %Y"
 
@@ -3805,16 +3800,16 @@ msgstr "%A, %d de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
 #: ../calendar/gui/e-day-view-top-item.c:835
 #: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1089
+#: ../modules/calendar/e-cal-shell-view-private.c:1108
 msgid "%a %d %b"
 msgstr "%a, %d de %b"
 
 #: ../calendar/gui/ea-gnome-calendar.c:204
 #: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1092
-#: ../modules/calendar/e-cal-shell-view-private.c:1098
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../modules/calendar/e-cal-shell-view-private.c:1111
+#: ../modules/calendar/e-cal-shell-view-private.c:1117
+#: ../modules/calendar/e-cal-shell-view-private.c:1120
 msgid "%a %d %b %Y"
 msgstr "%a, %d de %b de %Y"
 
@@ -3822,10 +3817,10 @@ msgstr "%a, %d de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:234
 #: ../calendar/gui/ea-gnome-calendar.c:240
 #: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1118
-#: ../modules/calendar/e-cal-shell-view-private.c:1129
-#: ../modules/calendar/e-cal-shell-view-private.c:1136
-#: ../modules/calendar/e-cal-shell-view-private.c:1139
+#: ../modules/calendar/e-cal-shell-view-private.c:1137
+#: ../modules/calendar/e-cal-shell-view-private.c:1148
+#: ../modules/calendar/e-cal-shell-view-private.c:1155
+#: ../modules/calendar/e-cal-shell-view-private.c:1158
 msgid "%d %b %Y"
 msgstr "%d de %b de %Y"
 
@@ -3837,7 +3832,7 @@ msgstr "%d de %b de %Y"
 #: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
 #: ../calendar/gui/e-day-view-top-item.c:839
 #: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1125
+#: ../modules/calendar/e-cal-shell-view-private.c:1144
 msgid "%d %b"
 msgstr "%d de %b"
 
@@ -3943,7 +3938,7 @@ 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:237 ../filter/e-filter-rule.c:748
+#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:751
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Sen tÃtulo"
@@ -3969,8 +3964,8 @@ msgid "Due Date:"
 msgstr "Data de vencemento:"
 
 #: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1463
-#: ../modules/itip-formatter/itip-view.c:1578
+#: ../modules/itip-formatter/itip-view.c:1475
+#: ../modules/itip-formatter/itip-view.c:1592
 msgid "Status:"
 msgstr "Estado:"
 
@@ -4085,7 +4080,7 @@ msgid "Organizer: %s"
 msgstr "Organizador: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
+#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3427
 #, c-format
 msgid "Location: %s"
 msgstr "LocalizaciÃn: %s"
@@ -4108,10 +4103,10 @@ msgstr "Data de finalizaciÃn"
 #: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
 #: ../calendar/gui/e-meeting-list-view.c:200
 #: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
-#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3462
-#: ../modules/itip-formatter/itip-view.c:5962
+#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1222
+#: ../calendar/gui/print.c:1239 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3480
+#: ../modules/itip-formatter/itip-view.c:6012
 #: ../modules/plugin-manager/evolution-plugin-manager.c:101
 msgid "Unknown"
 msgstr "DescoÃecido"
@@ -4145,14 +4140,14 @@ msgstr "Abrindo %s"
 #: ../calendar/gui/e-cal-model.c:3565
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5950
+#: ../modules/itip-formatter/itip-view.c:6000
 msgid "Accepted"
 msgstr "Aceptado"
 
 #: ../calendar/gui/e-cal-model.c:3566
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5956
+#: ../modules/itip-formatter/itip-view.c:6006
 msgid "Declined"
 msgstr "Rexeitado"
 
@@ -4166,7 +4161,7 @@ msgstr "Provisional"
 #: ../calendar/gui/e-cal-model.c:3568
 #: ../calendar/gui/e-meeting-list-view.c:225
 #: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5959
+#: ../modules/itip-formatter/itip-view.c:6009
 msgid "Delegated"
 msgstr "Delegado"
 
@@ -4221,15 +4216,15 @@ msgstr ""
 
 #. String to use in 12-hour time format for times in the morning.
 #: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
-#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
+#: ../calendar/gui/print.c:1048 ../calendar/gui/print.c:1067
+#: ../calendar/gui/print.c:2564 ../calendar/gui/print.c:2584
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
 #: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
-#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
+#: ../calendar/gui/print.c:1053 ../calendar/gui/print.c:1069
+#: ../calendar/gui/print.c:2569 ../calendar/gui/print.c:2586
 msgid "pm"
 msgstr "pm"
 
@@ -4240,12 +4235,12 @@ msgstr "pm"
 #. * order but don't change the specifiers or add
 #. * anything.
 #: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
+#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:2044
 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:2671
+#: ../calendar/gui/e-day-view.c:2673
 #, c-format
 msgid "Week %d"
 msgstr "Semana %d"
@@ -4298,49 +4293,49 @@ msgstr "Recursos"
 
 #: ../calendar/gui/e-meeting-list-view.c:182
 #: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
+#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1218
 msgid "Individual"
 msgstr "Individual"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/print.c:1219 ../widgets/table/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupo"
 
 #: ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1157
+#: ../calendar/gui/print.c:1220
 msgid "Resource"
 msgstr "Recurso"
 
 #: ../calendar/gui/e-meeting-list-view.c:185
 #: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1158
+#: ../calendar/gui/print.c:1221
 msgid "Room"
 msgstr "Sala"
 
 #: ../calendar/gui/e-meeting-list-view.c:196
 #: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1172
+#: ../calendar/gui/print.c:1235
 msgid "Chair"
 msgstr "Presidente"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
+#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1236
 msgid "Required Participant"
 msgstr "Participante necesario"
 
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1174
+#: ../calendar/gui/print.c:1237
 msgid "Optional Participant"
 msgstr "Participante opcional"
 
 #: ../calendar/gui/e-meeting-list-view.c:199
 #: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/print.c:1238
 msgid "Non-Participant"
 msgstr "Non-participante"
 
@@ -4523,7 +4518,7 @@ msgstr "Prema para engadir unha nota"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
+#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2353
 #: ../calendar/importers/icalendar-importer.c:84
 #: ../calendar/importers/icalendar-importer.c:1082
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
@@ -4563,11 +4558,11 @@ msgstr "Seleccionar un fuso horario"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
+#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:2025
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2315
+#: ../calendar/gui/gnome-cal.c:2318
 msgid "Purging"
 msgstr "Purgando"
 
@@ -4687,233 +4682,234 @@ msgstr ""
 "outra."
 
 #: ../calendar/gui/itip-utils.c:1127
-msgid "Unable to book a resource, error: "
-msgstr "Non foi posÃbel reservar un recurso, erro: "
+#, c-format
+msgid "Unable to book a resource, error: %s"
+msgstr "Non foi posÃbel reservar un recurso, erro: %s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1303
 msgid "You must be an attendee of the event."
 msgstr "Debe ser un participante na actividade."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "1st"
 msgstr "1"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "2nd"
 msgstr "2"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "3rd"
 msgstr "3"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "4th"
 msgstr "4"
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:652
 msgid "5th"
 msgstr "5"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "6th"
 msgstr "6"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "7th"
 msgstr "7"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "8th"
 msgstr "8"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "9th"
 msgstr "9"
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:653
 msgid "10th"
 msgstr "10"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "11th"
 msgstr "11"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "12th"
 msgstr "12"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "13th"
 msgstr "13"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "14th"
 msgstr "14"
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:654
 msgid "15th"
 msgstr "15"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "16th"
 msgstr "16"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "17th"
 msgstr "17"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "18th"
 msgstr "18"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "19th"
 msgstr "19"
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:655
 msgid "20th"
 msgstr "20"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "21st"
 msgstr "21"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "22nd"
 msgstr "22"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "23rd"
 msgstr "23"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "24th"
 msgstr "24"
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:656
 msgid "25th"
 msgstr "25"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "26th"
 msgstr "26"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "27th"
 msgstr "27"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "28th"
 msgstr "28"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "29th"
 msgstr "29"
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:657
 msgid "30th"
 msgstr "30"
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:658
 msgid "31st"
 msgstr "31"
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "Su"
 msgstr "Do"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "Mo"
 msgstr "Lu"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "Tu"
 msgstr "Ma"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:715
 msgid "We"
 msgstr "MÃ"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:716
 msgid "Th"
 msgstr "Xo"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:716
 msgid "Fr"
 msgstr "Ve"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:716
 msgid "Sa"
 msgstr "SÃ"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3220
 msgid " to "
 msgstr " para "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3230
 msgid " (Completed "
 msgstr " (Completado "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3169
+#: ../calendar/gui/print.c:3236
 msgid "Completed "
 msgstr "Completado "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3179
+#: ../calendar/gui/print.c:3246
 msgid " (Due "
 msgstr " (Vencemento "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3186
+#: ../calendar/gui/print.c:3253
 msgid "Due "
 msgstr "Vencemento "
 
-#: ../calendar/gui/print.c:3351
+#: ../calendar/gui/print.c:3418
 #, c-format
 msgid "Summary: %s"
 msgstr "Resumo: %s"
 
-#: ../calendar/gui/print.c:3378
+#: ../calendar/gui/print.c:3445
 msgid "Attendees: "
 msgstr "Participantes: "
 
-#: ../calendar/gui/print.c:3421
+#: ../calendar/gui/print.c:3488
 #, c-format
 msgid "Status: %s"
 msgstr "Estado: %s"
 
-#: ../calendar/gui/print.c:3436
+#: ../calendar/gui/print.c:3503
 #, c-format
 msgid "Priority: %s"
 msgstr "Prioridade: %s"
 
-#: ../calendar/gui/print.c:3454
+#: ../calendar/gui/print.c:3521
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Porcentaxe completada: %i"
 
-#: ../calendar/gui/print.c:3465
+#: ../calendar/gui/print.c:3532
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3478
+#: ../calendar/gui/print.c:3545
 #, c-format
 msgid "Categories: %s"
 msgstr "CategorÃas: %s"
 
-#: ../calendar/gui/print.c:3489
+#: ../calendar/gui/print.c:3556
 msgid "Contacts: "
 msgstr "Contactos: "
 
@@ -4944,7 +4940,7 @@ msgstr "Citas e reuniÃns"
 
 #: ../calendar/importers/icalendar-importer.c:468
 #: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5564
+#: ../modules/itip-formatter/itip-view.c:5614
 msgid "Opening calendar"
 msgstr "Abrindo o calendario"
 
@@ -6678,7 +6674,7 @@ msgid "Save as..."
 msgstr "Gardar comoâ"
 
 #: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
+#: ../widgets/misc/e-mail-signature-editor.c:292
 msgid "_Close"
 msgstr "_Pechar"
 
@@ -6694,7 +6690,7 @@ msgstr "_Mensaxe nova"
 msgid "Open New Message window"
 msgstr "Abrir unha xanela de mensaxe nova"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1492
 msgid "Configure Evolution"
 msgstr "Configurar o Evolution"
 
@@ -6730,7 +6726,7 @@ msgstr "Gardar como borra_dor"
 msgid "Save as draft"
 msgstr "Gardar como borrador"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
+#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:327
 msgid "S_end"
 msgstr "_Enviar"
 
@@ -6867,11 +6863,11 @@ msgid "S_ubject:"
 msgstr "_Asunto:"
 
 #: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:491
 msgid "Si_gnature:"
 msgstr "Si_natura:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Premer aquà para ir à axenda de enderezos"
 
@@ -6879,7 +6875,7 @@ msgstr "Premer aquà para ir à axenda de enderezos"
 msgid "Click here to select folders to post to"
 msgstr "Premer aquà para seleccionar os cartafoles de destino"
 
-#: ../composer/e-composer-private.c:345
+#: ../composer/e-composer-private.c:347
 msgid "Save draft"
 msgstr "Gardar o borrador"
 
@@ -6904,12 +6900,12 @@ msgstr ""
 msgid "Compose Message"
 msgstr "Escribir unha mensaxe"
 
-#: ../composer/e-msg-composer.c:4198
+#: ../composer/e-msg-composer.c:4204
 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 editar."
 
-#: ../composer/e-msg-composer.c:4875
+#: ../composer/e-msg-composer.c:4881
 msgid "Untitled Message"
 msgstr "Mensaxe sen tÃtulo"
 
@@ -7097,6 +7093,10 @@ msgstr "Correo e calendario do Evolution"
 msgid "Manage your email, contacts and schedule"
 msgstr "Xestione o seu correo, contactos e programaciÃn"
 
+#: ../data/evolution.desktop.in.in.h:5
+msgid "mail;calendar;contact;addressbook;task;"
+msgstr "correo;calendario;contacto;caderno de enderezos;tarefas;"
+
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Email Settings"
 msgstr "Axustes do correo electrÃnico"
@@ -9416,7 +9416,7 @@ msgstr "Cartafol inicial do seleccionador de ficheiros"
 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/main.c:311
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:317
 msgid "Start in offline mode"
 msgstr "Iniciar en modo sen conexiÃn"
 
@@ -9521,18 +9521,10 @@ msgid "Use SpamAssassin daemon and client"
 msgstr "Usar o daemon e o cliente SpamAssassin"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Usar o daemon e o cliente SpamAssassin (spamc/spamd)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid "SpamAssassin client binary"
-msgstr "Binario do cliente de SpamAssassin"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-msgid "SpamAssassin daemon binary"
-msgstr "Binario do Âdaemon de SpamAssassin"
+msgid "Use spamc and spamd programs, if available."
+msgstr "Usar os programas spamc e spamd, se estÃn dispoÃÃbeis"
 
-#: ../em-format/e-mail-formatter-attachment.c:363
+#: ../em-format/e-mail-formatter-attachment.c:364
 #: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
 #: ../widgets/misc/e-attachment-bar.c:106
 #: ../widgets/misc/e-attachment-paned.c:176
@@ -9542,7 +9534,7 @@ msgid_plural "Attachments"
 msgstr[0] "Anexo"
 msgstr[1] "Anexos"
 
-#: ../em-format/e-mail-formatter-attachment.c:369
+#: ../em-format/e-mail-formatter-attachment.c:370
 msgid "Display as attachment"
 msgstr "Mostrar como anexo"
 
@@ -9628,7 +9620,7 @@ msgstr "Formatar parte como mensaxe RFC822"
 
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1270
 #: ../modules/cal-config-google/e-google-chooser.c:209
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 #: ../widgets/menus/gal-define-views-dialog.c:352
@@ -9693,12 +9685,12 @@ msgid "Format part as HTML"
 msgstr "Formatar parte como HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:182
+#: ../em-format/e-mail-formatter-text-plain.c:183
 msgid "Plain Text"
 msgstr "Texto plano"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:188
+#: ../em-format/e-mail-formatter-text-plain.c:189
 msgid "Format part as plain text"
 msgstr "Formatar parte como texto plano"
 
@@ -9813,12 +9805,12 @@ msgstr ""
 "difÃcil para un intruso ver o contido desta mensaxe dentro dun perÃodo de "
 "tempo razoÃbel."
 
-#: ../em-format/e-mail-formatter-secure-button.c:190
+#: ../em-format/e-mail-formatter-secure-button.c:191
 #: ../smime/gui/smime-ui.ui.h:43
 msgid "_View Certificate"
 msgstr "_Visualizar o certificado"
 
-#: ../em-format/e-mail-formatter-secure-button.c:205
+#: ../em-format/e-mail-formatter-secure-button.c:206
 msgid "This certificate is not viewable"
 msgstr "Este certificado non à visÃbel"
 
@@ -9898,7 +9890,7 @@ msgstr "Non foi posÃbel analizar a mensaxe PGP/MIME: %s"
 msgid "Unsupported signature format"
 msgstr "O formato da sinatura non à compatÃbel"
 
-#: ../em-format/e-mail-part-utils.c:493
+#: ../em-format/e-mail-part-utils.c:496
 #, c-format
 msgid "%s attachment"
 msgstr "%s anexo"
@@ -10171,11 +10163,11 @@ msgstr "Produciuse un erro ao actualizar a fonte de datos Â{0}Â."
 msgid "Failed to delete resource &quot;{0}&quot;."
 msgstr "Produciuse un erro ao eliminar o recurso Â{0}Â."
 
-#: ../e-util/e-util.c:243
+#: ../e-util/e-util.c:249
 msgid "Could not open the link."
 msgstr "Non foi posÃbel abrir a ligazÃn."
 
-#: ../e-util/e-util.c:290
+#: ../e-util/e-util.c:296
 msgid "Could not display help for Evolution."
 msgstr "Non foi posÃbel mostrar a axuda do Evolution."
 
@@ -10306,7 +10298,7 @@ msgstr "agora"
 msgid "%d-%b-%Y"
 msgstr "%d-%b-%Y"
 
-#: ../filter/e-filter-datespec.c:289
+#: ../filter/e-filter-datespec.c:291
 msgid "Select a time to compare against"
 msgstr "Seleccionar un tempo co que comparar"
 
@@ -10314,23 +10306,23 @@ msgstr "Seleccionar un tempo co que comparar"
 msgid "Choose a File"
 msgstr "Seleccionar un ficheiro"
 
-#: ../filter/e-filter-rule.c:741
+#: ../filter/e-filter-rule.c:744
 msgid "R_ule name:"
 msgstr "Nome da r_egra:"
 
-#: ../filter/e-filter-rule.c:791
+#: ../filter/e-filter-rule.c:794
 msgid "all the following conditions"
 msgstr "todas as seguintes condiciÃns"
 
-#: ../filter/e-filter-rule.c:792
+#: ../filter/e-filter-rule.c:795
 msgid "any of the following conditions"
 msgstr "calquera das seguintes condiciÃns"
 
-#: ../filter/e-filter-rule.c:798
+#: ../filter/e-filter-rule.c:801
 msgid "_Find items which match:"
 msgstr "_Buscar elementos que coincidan con:"
 
-#: ../filter/e-filter-rule.c:820
+#: ../filter/e-filter-rule.c:824
 msgid "Find items that meet the following conditions"
 msgstr "Encontrar os elementos que cumpran as seguintes condiciÃns"
 
@@ -10338,51 +10330,51 @@ msgstr "Encontrar os elementos que cumpran as seguintes condiciÃns"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../filter/e-filter-rule.c:839 ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 #: ../widgets/misc/e-mail-signature-combo-box.c:369
 msgid "None"
 msgstr "Ningunha"
 
-#: ../filter/e-filter-rule.c:836
+#: ../filter/e-filter-rule.c:840
 msgid "All related"
 msgstr "Todos os relacionados"
 
-#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
+#: ../filter/e-filter-rule.c:841 ../widgets/misc/e-send-options.ui.h:19
 msgid "Replies"
 msgstr "Respostas"
 
-#: ../filter/e-filter-rule.c:838
+#: ../filter/e-filter-rule.c:842
 msgid "Replies and parents"
 msgstr "Respostas e pais"
 
-#: ../filter/e-filter-rule.c:839
+#: ../filter/e-filter-rule.c:843
 msgid "No reply or parent"
 msgstr "Sen resposta nin pai"
 
-#: ../filter/e-filter-rule.c:842
+#: ../filter/e-filter-rule.c:846
 msgid "I_nclude threads:"
 msgstr "I_ncluÃr fÃos:"
 
-#: ../filter/e-filter-rule.c:919
+#: ../filter/e-filter-rule.c:923
 msgid "A_dd Condition"
 msgstr "Enga_dir unha condiciÃn"
 
-#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
+#: ../filter/e-filter-rule.c:1240 ../filter/filter.ui.h:1
 #: ../mail/em-utils.c:302
 msgid "Incoming"
 msgstr "Entrante"
 
-#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
+#: ../filter/e-filter-rule.c:1240 ../mail/em-utils.c:303
 msgid "Outgoing"
 msgstr "SaÃnte"
 
-#: ../filter/e-rule-editor.c:273
+#: ../filter/e-rule-editor.c:288
 msgid "Add Rule"
 msgstr "Engadir unha regra"
 
-#: ../filter/e-rule-editor.c:366
+#: ../filter/e-rule-editor.c:395
 msgid "Edit Rule"
 msgstr "Editar a  regra"
 
@@ -10508,53 +10500,53 @@ msgstr ""
 msgid "Invalid authentication result code (%d)"
 msgstr "CÃdigo de resposta (%d) de autenticaciÃn non vÃlido"
 
-#: ../libemail-engine/e-mail-folder-utils.c:112
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Gardando a mensaxe no cartafol Â%sÂ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:565
+#: ../libemail-engine/e-mail-folder-utils.c:566
 msgid "Forwarded messages"
 msgstr "Mensaxes reencamiÃadas"
 
-#: ../libemail-engine/e-mail-folder-utils.c:675
-#: ../libemail-engine/e-mail-folder-utils.c:926
+#: ../libemail-engine/e-mail-folder-utils.c:676
+#: ../libemail-engine/e-mail-folder-utils.c:927
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Descargando %d mensaxe"
 msgstr[1] "Descargando %d mensaxes"
 
-#: ../libemail-engine/e-mail-folder-utils.c:769
+#: ../libemail-engine/e-mail-folder-utils.c:770
 msgid "Scanning messages for duplicates"
 msgstr "Buscando mensaxes duplicadas"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1177
+#: ../libemail-engine/e-mail-folder-utils.c:1178
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Retirando o cartafol Â%sÂ"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1314
+#: ../libemail-engine/e-mail-folder-utils.c:1315
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Retirouse o ficheiro Â%sÂ."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1318
+#: ../libemail-engine/e-mail-folder-utils.c:1319
 msgid "File has been removed."
 msgstr "Retirouse o ficheiro."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1377
+#: ../libemail-engine/e-mail-folder-utils.c:1378
 msgid "Removing attachments"
 msgstr "Retirando os anexos"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1541
+#: ../libemail-engine/e-mail-folder-utils.c:1542
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
 msgstr[0] "Gardando %d mensaxe"
 msgstr[1] "Gardando %d mensaxes"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
+#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:613
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "O URI do cartafol Â%s non à vÃlido"
@@ -10593,22 +10585,22 @@ msgstr "Enviados"
 msgid "Templates"
 msgstr "Modelos"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1315
 #, c-format
 msgid "User cancelled operation"
 msgstr "O usuario cancelou a operaciÃn"
 
-#: ../libemail-engine/e-mail-session.c:1489
+#: ../libemail-engine/e-mail-session.c:1485
 #, c-format
 msgid "%s authentication failed"
 msgstr "A autenticaciÃn %s fallou"
 
-#: ../libemail-engine/e-mail-session.c:1534
+#: ../libemail-engine/e-mail-session.c:1530
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Non foi posÃbel atopar os datos para o UID Â%sÂ"
 
-#: ../libemail-engine/e-mail-session.c:1585
+#: ../libemail-engine/e-mail-session.c:1581
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -10616,7 +10608,7 @@ msgid ""
 msgstr ""
 "Non se forneceu ningÃn enderezo de destino, cancelouse o reenvÃo do mensaxe."
 
-#: ../libemail-engine/e-mail-session.c:1598
+#: ../libemail-engine/e-mail-session.c:1594
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
@@ -10633,14 +10625,14 @@ msgid "UID '%s' is not a mail transport"
 msgstr "UID Â%s non à un transporte de correo"
 
 #: ../libemail-engine/e-mail-session-utils.c:641
-#: ../libemail-engine/mail-ops.c:698
+#: ../libemail-engine/mail-ops.c:738
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Produciuse un erro ao aplicar os filtros ao correo saÃnte: %s"
 
 #: ../libemail-engine/e-mail-session-utils.c:670
 #: ../libemail-engine/e-mail-session-utils.c:704
-#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
+#: ../libemail-engine/mail-ops.c:755 ../libemail-engine/mail-ops.c:791
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -10650,13 +10642,13 @@ msgstr ""
 "No seu lugar anexaranse ao cartafol local ÂEnviadosÂ."
 
 #: ../libemail-engine/e-mail-session-utils.c:724
-#: ../libemail-engine/mail-ops.c:773
+#: ../libemail-engine/mail-ops.c:813
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Produciuse un erro ao anexar ao cartafol local ÂEnviadosÂ: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:954
-#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
+#: ../libemail-engine/e-mail-session-utils.c:968
+#: ../libemail-engine/mail-ops.c:945 ../libemail-engine/mail-ops.c:1047
 msgid "Sending message"
 msgstr "Enviando a mensaxe"
 
@@ -10675,7 +10667,7 @@ msgstr "Conectando novamente con %s"
 msgid "Preparing account '%s' for offline"
 msgstr "Preparando a conta Â%s para o modo sen conexiÃn"
 
-#: ../libemail-engine/mail-folder-cache.c:876
+#: ../libemail-engine/mail-folder-cache.c:880
 #, c-format
 msgid "Pinging %s"
 msgstr "Facendo ping a %s"
@@ -10684,56 +10676,57 @@ msgstr "Facendo ping a %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtrando as mensaxes seleccionadas"
 
-#: ../libemail-engine/mail-ops.c:216
-msgid "Fetching Mail"
-msgstr "Recibindo o correo"
+#: ../libemail-engine/mail-ops.c:219
+#, c-format
+msgid "Fetching mail from '%s'"
+msgstr "Obtendo o correo de Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:916
+#: ../libemail-engine/mail-ops.c:956
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: ../libemail-engine/mail-ops.c:968
+#: ../libemail-engine/mail-ops.c:1008
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Produciuse un erro ao enviar unha mensaxe"
 msgstr[1] "Produciuse un erro ao enviar %d de %d mensaxes"
 
-#: ../libemail-engine/mail-ops.c:974
+#: ../libemail-engine/mail-ops.c:1014
 msgid "Canceled."
 msgstr "Cancelado."
 
-#: ../libemail-engine/mail-ops.c:976
+#: ../libemail-engine/mail-ops.c:1016
 msgid "Complete."
 msgstr "Completado."
 
-#: ../libemail-engine/mail-ops.c:1088
+#: ../libemail-engine/mail-ops.c:1128
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Movendo as mensaxes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1129
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Copiando as mensaxes a Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1207
+#: ../libemail-engine/mail-ops.c:1247
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gardando o cartafol Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1281
+#: ../libemail-engine/mail-ops.c:1321
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expurgando e gardando a conta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1282
+#: ../libemail-engine/mail-ops.c:1322
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Gardando a conta Â%sÂ"
 
-#: ../libemail-engine/mail-ops.c:1356
+#: ../libemail-engine/mail-ops.c:1396
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Baleirando o lixo de Â%sÂ"
@@ -10803,7 +10796,7 @@ msgid "De_fault"
 msgstr "Prede_finido"
 
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:505
+#: ../modules/mail/em-composer-prefs.c:495
 #: ../modules/plugin-manager/evolution-plugin-manager.c:360
 #: ../plugins/publish-calendar/publish-calendar.c:864
 msgid "Enabled"
@@ -10815,7 +10808,7 @@ msgstr "Nome da conta"
 
 #: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3661
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "predeterminado"
@@ -10848,13 +10841,13 @@ msgstr "Non se forneceu ningÃn enderezo de correo"
 msgid "Missing domain in email address"
 msgstr "Falta o dominio no enderezo de correo"
 
-#: ../mail/e-mail-backend.c:734
+#: ../mail/e-mail-backend.c:737
 msgid "Unknown background operation"
 msgstr "OperaciÃn en segundo plano descoÃecida"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
+#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1415
+#: ../shell/e-shell-window-actions.c:1422
+#: ../shell/e-shell-window-actions.c:1429
 msgid "Close this window"
 msgstr "Pechar esta xanela"
 
@@ -10889,83 +10882,87 @@ msgstr ""
 msgid "Done"
 msgstr "Feito"
 
-#: ../mail/e-mail-config-defaults-page.c:539
+#: ../mail/e-mail-config-defaults-page.c:552
 msgid "Special Folders"
 msgstr "Cartafoles especiais"
 
-#: ../mail/e-mail-config-defaults-page.c:548
+#: ../mail/e-mail-config-defaults-page.c:561
 msgid "Draft Messages _Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:571
 msgid "Choose a folder for saving draft messages."
 msgstr "Seleccione un cartafol no que gardar os borradores."
 
-#: ../mail/e-mail-config-defaults-page.c:572
+#: ../mail/e-mail-config-defaults-page.c:585
 msgid "Sent _Messages Folder:"
 msgstr "Cartafol das _mensaxes enviadas:"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:595
 msgid "Choose a folder for saving sent messages."
 msgstr "Seleccione un cartafol no que gardar os mensaxes enviados."
 
-#: ../mail/e-mail-config-defaults-page.c:596
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr "G_argar respostas no cartafol da mensaxe respondida"
+
+#: ../mail/e-mail-config-defaults-page.c:631
 msgid "_Restore Defaults"
 msgstr "_Restaurar valores predeterminados"
 
-#: ../mail/e-mail-config-defaults-page.c:610
+#: ../mail/e-mail-config-defaults-page.c:645
 msgid "Use a Real Folder for _Trash:"
 msgstr "Usar un cartafol real para o _Lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:646
 msgid "Choose a folder for deleted messages."
 msgstr "Seleccione un cartafol no que gardar as mensaxes eliminadas."
 
-#: ../mail/e-mail-config-defaults-page.c:620
+#: ../mail/e-mail-config-defaults-page.c:655
 msgid "Use a Real Folder for _Junk:"
 msgstr "Usar un cartafol real para o _lixo:"
 
-#: ../mail/e-mail-config-defaults-page.c:621
+#: ../mail/e-mail-config-defaults-page.c:656
 msgid "Choose a folder for junk messages."
 msgstr "Seleccione un cartafol para o spam."
 
-#: ../mail/e-mail-config-defaults-page.c:638
+#: ../mail/e-mail-config-defaults-page.c:673
 msgid "Composing Messages"
 msgstr "Escribir unha mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:647
+#: ../mail/e-mail-config-defaults-page.c:682
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Enviar _sempre unha copia de carbÃn (Cc) a:"
 
-#: ../mail/e-mail-config-defaults-page.c:672
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Enviar sempre unha copia de carbÃn _oculta (Cco) a:"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:742
 msgid "Message Receipts"
 msgstr "ConfirmaciÃns de lectura das mensaxes"
 
-#: ../mail/e-mail-config-defaults-page.c:716
+#: ../mail/e-mail-config-defaults-page.c:751
 msgid "S_end message receipts:"
 msgstr "_Enviar as confirmaciÃns de lectura das mensaxes:"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:776
 msgid "Never"
 msgstr "Nunca"
 
-#: ../mail/e-mail-config-defaults-page.c:747
+#: ../mail/e-mail-config-defaults-page.c:782
 msgid "Always"
 msgstr "Sempre"
 
-#: ../mail/e-mail-config-defaults-page.c:753
+#: ../mail/e-mail-config-defaults-page.c:788
 msgid "Ask for each message"
 msgstr "Preguntar para cada mensaxe"
 
-#: ../mail/e-mail-config-defaults-page.c:824
+#: ../mail/e-mail-config-defaults-page.c:859
 msgid "Defaults"
 msgstr "PredefiniciÃns"
 
-#: ../mail/e-mail-config-identity-page.c:254
+#: ../mail/e-mail-config-identity-page.c:269
 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 "
@@ -10975,12 +10972,12 @@ msgstr ""
 "necesitan encherse, a non ser que desexe incluÃr esta informaciÃn no correo "
 "que envÃe."
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:297
 #: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "InformaciÃn da conta"
 
-#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-identity-page.c:306
 #: ../mail/e-mail-config-summary-page.c:333
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -10989,44 +10986,43 @@ msgstr ""
 "Escriba o nome polo que quere identificar esta conta.\n"
 "Por exemplo: ÂTraballo ou ÂPersoalÂ"
 
-#: ../mail/e-mail-config-identity-page.c:299
+#: ../mail/e-mail-config-identity-page.c:314
 #: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
 #: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
 #: ../widgets/misc/e-mail-signature-script-dialog.c:417
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: ../mail/e-mail-config-identity-page.c:336
+#: ../mail/e-mail-config-identity-page.c:351
 msgid "Required Information"
 msgstr "InformaciÃn solicitada"
 
-#: ../mail/e-mail-config-identity-page.c:345
+#: ../mail/e-mail-config-identity-page.c:360
 msgid "Full Nam_e:"
 msgstr "Nom_e completo:"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:387
 msgid "Email _Address:"
 msgstr "_Enderezo de correo:"
 
-#: ../mail/e-mail-config-identity-page.c:409
+#: ../mail/e-mail-config-identity-page.c:434
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "InformaciÃn opcional"
 
-#: ../mail/e-mail-config-identity-page.c:417
+#: ../mail/e-mail-config-identity-page.c:442
 msgid "Re_ply-To:"
 msgstr "Res_ponder a:"
 
-#: ../mail/e-mail-config-identity-page.c:444
+#: ../mail/e-mail-config-identity-page.c:469
 msgid "Or_ganization:"
 msgstr "Organi_zaciÃn:"
 
-#: ../mail/e-mail-config-identity-page.c:499
+#: ../mail/e-mail-config-identity-page.c:524
 msgid "Add Ne_w Signature..."
 msgstr "Engadir unha sinatura _novaâ"
 
-#: ../mail/e-mail-config-identity-page.c:640
+#: ../mail/e-mail-config-identity-page.c:680
 msgid "Identity"
 msgstr "Identidade"
 
@@ -11189,13 +11185,13 @@ msgid "Server Type:"
 msgstr "Tipo de servidor:"
 
 #: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:610
 #: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
 msgid "Server:"
 msgstr "Servidor:"
 
 #: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Username:"
 msgstr "Nome do usuario:"
 
@@ -11345,621 +11341,621 @@ msgstr "Valor da cabecera"
 msgid "Headers"
 msgstr "Cabeceiras"
 
-#: ../mail/e-mail-reader.c:349
+#: ../mail/e-mail-reader.c:350
 msgid "Save Image"
 msgstr "Gardar imaxe"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:432 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Copiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:432 ../mail/em-folder-utils.c:492
 msgid "C_opy"
 msgstr "C_opiar"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:966 ../mail/em-filter-i18n.h:53
 msgid "Move to Folder"
 msgstr "Mover ao cartafol"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:966 ../mail/em-folder-utils.c:492
 msgid "_Move"
 msgstr "_Mover"
 
-#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
-#: ../mail/e-mail-reader.c:1535
+#: ../mail/e-mail-reader.c:1314 ../mail/e-mail-reader.c:1496
+#: ../mail/e-mail-reader.c:1536
 msgid "_Do not ask me again."
 msgstr "_Non preguntar de novo."
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1542
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Ignorar sempre ÂResponder a:Â para as listas de correo."
 
-#: ../mail/e-mail-reader.c:1726
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "Produciuse un erro ao obter a mensaxe:"
 
-#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
+#: ../mail/e-mail-reader.c:1778 ../mail/e-mail-reader.c:2868
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Recuperando a mensaxe Â%sÂ"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1955
 msgid "A_dd Sender to Address Book"
 msgstr "Enga_dir o remitente à axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1957
 msgid "Add sender to address book"
 msgstr "Engadir o remitente à axenda de enderezos"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1962
 msgid "Check for _Junk"
 msgstr "Comprobar se hai correo li_xo"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1964
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrar as mensaxes seleccionadas polo estado de correo lixo"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1969
 msgid "_Copy to Folder..."
 msgstr "_Copiar ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1971
 msgid "Copy selected messages to another folder"
 msgstr "Copiar as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1976
 msgid "_Delete Message"
 msgstr "E_liminar a mensaxe"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1978
 msgid "Mark the selected messages for deletion"
 msgstr "Marcar as mensaxes seleccionadas para eliminalas"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1983
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Crear unha regra de filtrado segundo a _rolda de correoâ"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1985
 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:1984
+#: ../mail/e-mail-reader.c:1990
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Crear unha regra de filtrado segundo os _destinatariosâ"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1992
 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:1991
+#: ../mail/e-mail-reader.c:1997
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Crear unha regra de filtrado segundo o re_mitenteâ"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1999
 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:1998
+#: ../mail/e-mail-reader.c:2004
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Crear unha regra de filtrado segundo o _asuntoâ"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2006
 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:2005
+#: ../mail/e-mail-reader.c:2011
 msgid "A_pply Filters"
 msgstr "_Aplicar os filtros"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2013
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplicar as regras de filtrado Ãs mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2018
 msgid "_Find in Message..."
 msgstr "_Buscar na mensaxeâ"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2020
 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:2019
+#: ../mail/e-mail-reader.c:2025
 msgid "_Clear Flag"
 msgstr "E_liminar a marca"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2027
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Retirar as marcas de seguimento das mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2032
 msgid "_Flag Completed"
 msgstr "_Marcar como completado"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2034
 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:2033
+#: ../mail/e-mail-reader.c:2039
 msgid "Follow _Up..."
 msgstr "Seguimentoâ"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2041
 msgid "Flag the selected messages for follow-up"
 msgstr "Marcar as mensaxes seleccionadas para o seguimento"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2046
 msgid "_Attached"
 msgstr "_Anexada"
 
-#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2055
 msgid "Forward the selected message to someone as an attachment"
 msgstr "ReencamiÃar a mensaxe seleccionada como un anexo"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2053
 msgid "Forward As _Attached"
 msgstr "ReencamiÃar como un _anexo"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2060
 msgid "_Inline"
 msgstr "_Inserida"
 
-#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2062 ../mail/e-mail-reader.c:2069
 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:2061
+#: ../mail/e-mail-reader.c:2067
 msgid "Forward As _Inline"
 msgstr "ReencamiÃar _inserida"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2074
 msgid "_Quoted"
 msgstr "_Citada"
 
-#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2076 ../mail/e-mail-reader.c:2083
 msgid "Forward the selected message quoted like a reply"
 msgstr "ReencamiÃar a mensaxe seleccionada citada como unha resposta"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2081
 msgid "Forward As _Quoted"
 msgstr "ReencamiÃar _citada"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2088
 msgid "_Load Images"
 msgstr "_Cargar as imaxes"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2090
 msgid "Force images in HTML mail to be loaded"
 msgstr "Forzar a carga de imaxes no correo HTML"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2095
 msgid "_Important"
 msgstr "_Importante"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2097
 msgid "Mark the selected messages as important"
 msgstr "Marcar as mensaxes seleccionadas como importantes"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2102
 msgid "_Junk"
 msgstr "_Correo lixo"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2104
 msgid "Mark the selected messages as junk"
 msgstr "Marcar as mensaxes seleccionadas como correo lixo"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2109
 msgid "_Not Junk"
 msgstr "_Non à correo lixo"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2111
 msgid "Mark the selected messages as not being junk"
 msgstr "Marcar as mensaxes seleccionadas como non lixo"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2116
 msgid "_Read"
 msgstr "_Lida"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2118
 msgid "Mark the selected messages as having been read"
 msgstr "Marcar as mensaxes seleccionadas como lidas"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2123
 msgid "Uni_mportant"
 msgstr "Non i_mportante"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2125
 msgid "Mark the selected messages as unimportant"
 msgstr "Marcar as mensaxes seleccionadas como non importantes"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2130
 msgid "_Unread"
 msgstr "_Sen ler"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2132
 msgid "Mark the selected messages as not having been read"
 msgstr "Marcar as mensaxes seleccionadas como non lidas"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2137
 msgid "_Edit as New Message..."
 msgstr "_Editar como unha mensaxe novaâ"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2139
 msgid "Open the selected messages in the composer for editing"
 msgstr "Abrir as mensaxes seleccionadas no editor para editalas"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2144
 msgid "Compose _New Message"
 msgstr "Redactar unha mensaxe _nova"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2146
 msgid "Open a window for composing a mail message"
 msgstr "Abrir unha xanela para escribir unha mensaxe de correo"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2151
 msgid "_Open in New Window"
 msgstr "Abrir nunha xanela n_ova"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2153
 msgid "Open the selected messages in a new window"
 msgstr "Abrir as mensaxes seleccionadas nunha xanela nova"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2158
 msgid "_Move to Folder..."
 msgstr "_Mover ao cartafolâ"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2160
 msgid "Move selected messages to another folder"
 msgstr "Mover as mensaxes seleccionadas a outro cartafol"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2165
 msgid "_Switch to Folder"
 msgstr "_Cambiar ao cartafol"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2167
 msgid "Display the parent folder"
 msgstr "Mostrar o cartafol pai"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2172
 msgid "Switch to _next tab"
 msgstr "Cambiar à lapela segui_nte"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2174
 msgid "Switch to the next tab"
 msgstr "Cambiar à lapela seguinte"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2179
 msgid "Switch to _previous tab"
 msgstr "Cambiar à lapela a_nterior"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2181
 msgid "Switch to the previous tab"
 msgstr "Cambiar à lapela anterior"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2186
 msgid "Cl_ose current tab"
 msgstr "Pe_char a lapela actual"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2188
 msgid "Close current tab"
 msgstr "Pechar a lapela actual"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2193
 msgid "_Next Message"
 msgstr "Segui_nte mensaxe"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2195
 msgid "Display the next message"
 msgstr "Mostrar a seguinte mensaxe"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2200
 msgid "Next _Important Message"
 msgstr "Seguinte mensaxe _importante"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2202
 msgid "Display the next important message"
 msgstr "Mostrar a seguinte mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2207
 msgid "Next _Thread"
 msgstr "Seguin_te fÃo"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2209
 msgid "Display the next thread"
 msgstr "Mostrar o seguinte fÃo"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2214
 msgid "Next _Unread Message"
 msgstr "Seguinte mensaxe _sen ler"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2216
 msgid "Display the next unread message"
 msgstr "Mostrar a seguinte mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2221
 msgid "_Previous Message"
 msgstr "_Mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2223
 msgid "Display the previous message"
 msgstr "Mostrar a mensaxe anterior"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2228
 msgid "Pr_evious Important Message"
 msgstr "Ant_erior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2230
 msgid "Display the previous important message"
 msgstr "Mostrar a anterior mensaxe importante"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2235
 msgid "Previous T_hread"
 msgstr "_Conversa anterior"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2237
 msgid "Display the previous thread"
 msgstr "Mostrar o fÃo anterior"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2242
 msgid "P_revious Unread Message"
 msgstr "Ante_rior mensaxe sen ler"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2244
 msgid "Display the previous unread message"
 msgstr "Mostrar a anterior mensaxe non lida"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2251
 msgid "Print this message"
 msgstr "Imprimir esta mensaxe"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2258
 msgid "Preview the message to be printed"
 msgstr "Previsualizar a mensaxe que se vai imprimir"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2263
 msgid "Re_direct"
 msgstr "Re_direccionar"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2265
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Redireccionar a alguÃn a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2270
 msgid "Remo_ve Attachments"
 msgstr "Eliminar os _anexos"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2272
 msgid "Remove attachments"
 msgstr "Retirar os anexos"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2277
 msgid "Remove Du_plicate Messages"
 msgstr "Retirar as mensaxes du_plicadas"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2279
 msgid "Checks selected messages for duplicates"
 msgstr "Comprobar se hai mensaxes seleccionadas que estean duplicadas"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2284 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:182
+#: ../modules/mail/e-mail-attachment-handler.c:160
 msgid "Reply to _All"
 msgstr "Responder a t_odos"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2286
 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:2285 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2291 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Responder à _lista"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2293
 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:2292
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:2298
+#: ../modules/mail/e-mail-attachment-handler.c:167
 msgid "_Reply to Sender"
 msgstr "_Responder ao remitente"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2300
 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:2299
+#: ../mail/e-mail-reader.c:2305
 msgid "_Save as mbox..."
 msgstr "Gardar como mboxâ"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2307
 msgid "Save selected messages as an mbox file"
 msgstr "Gardar as mensaxes seleccionadas como un ficheiro mbox"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2312
 msgid "_Message Source"
 msgstr "Fonte da _mensaxe"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2314
 msgid "Show the raw email source of the message"
 msgstr "Mostrar a fonte en bruto da mensaxe"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2326
 msgid "_Undelete Message"
 msgstr "_Recuperar a mensaxe"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2328
 msgid "Undelete the selected messages"
 msgstr "Recuperar as mensaxes seleccionadas"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2333
 msgid "_Normal Size"
 msgstr "TamaÃo _normal"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2335
 msgid "Reset the text to its original size"
 msgstr "Restabelecer o texto ao seu tamaÃo orixinal"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2340
 msgid "_Zoom In"
 msgstr "_Ampliar"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2342
 msgid "Increase the text size"
 msgstr "Aumentar o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2347
 msgid "Zoom _Out"
 msgstr "_Reducir"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2349
 msgid "Decrease the text size"
 msgstr "DiminuÃr o tamaÃo do texto"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2356
 msgid "Cre_ate"
 msgstr "Cre_ar"
 
-#: ../mail/e-mail-reader.c:2357
+#: ../mail/e-mail-reader.c:2363
 msgid "Ch_aracter Encoding"
 msgstr "CodificaciÃn de car_acteres"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2370
 msgid "F_orward As"
 msgstr "ReencamiÃar c_omoâ"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2377
 msgid "_Group Reply"
 msgstr "_Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2384
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2391
 msgid "Mar_k As"
 msgstr "Mar_car como"
 
-#: ../mail/e-mail-reader.c:2392
+#: ../mail/e-mail-reader.c:2398
 msgid "_Message"
 msgstr "_Mensaxe"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2405
 msgid "_Zoom"
 msgstr "A_mpliar"
 
-#: ../mail/e-mail-reader.c:2409
+#: ../mail/e-mail-reader.c:2415
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Crear un cartafol de busca segundo a ro_lda de correoâ"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2417
 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:2416
+#: ../mail/e-mail-reader.c:2422
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Crear un cartafol de busca segundo os des_tinatariosâ"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2424
 msgid "Create a search folder for these recipients"
 msgstr "Crear un cartafol de busca para estes destinatarios"
 
-#: ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2429
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Crear un cartafol de busca segundo o _remitenteâ"
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2431
 msgid "Create a search folder for this sender"
 msgstr "Crear un cartafol de busca para este remitente"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2436
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Crear un cartafol de busca segundo o as_untoâ"
 
-#: ../mail/e-mail-reader.c:2432
+#: ../mail/e-mail-reader.c:2438
 msgid "Create a search folder for this subject"
 msgstr "Crear un cartafol de busca para este asunto"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2461
 msgid "Mark for Follo_w Up..."
 msgstr "Marcar para _seguimentoâ"
 
-#: ../mail/e-mail-reader.c:2463
+#: ../mail/e-mail-reader.c:2469
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2473
 msgid "Mark as _Junk"
 msgstr "Marcar como correo l_ixo"
 
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2477
 msgid "Mark as _Not Junk"
 msgstr "Desmarcar como correo lixo"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2481
 msgid "Mar_k as Read"
 msgstr "Marcar como _lida"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2485
 msgid "Mark as Uni_mportant"
 msgstr "Marcar como non im_portante"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2489
 msgid "Mark as _Unread"
 msgstr "Marcar como _non lida"
 
-#: ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2533
 msgid "_Caret Mode"
 msgstr "Activar o _cursor"
 
-#: ../mail/e-mail-reader.c:2529
+#: ../mail/e-mail-reader.c:2535
 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:2535
+#: ../mail/e-mail-reader.c:2541
 msgid "All Message _Headers"
 msgstr "Todas as ca_beceiras da mensaxe"
 
-#: ../mail/e-mail-reader.c:2537
+#: ../mail/e-mail-reader.c:2543
 msgid "Show messages with all email headers"
 msgstr "Mostrar as mensaxes con todas as cabeceiras de correo electrÃnico"
 
-#: ../mail/e-mail-reader.c:2868
+#: ../mail/e-mail-reader.c:2874
 msgid "Retrieving message"
 msgstr "Descargando mensaxe"
 
-#: ../mail/e-mail-reader.c:3851
-#: ../modules/mail/e-mail-attachment-handler.c:175
+#: ../mail/e-mail-reader.c:3854
+#: ../modules/mail/e-mail-attachment-handler.c:153
 msgid "_Forward"
 msgstr "_ReencamiÃar"
 
-#: ../mail/e-mail-reader.c:3852
+#: ../mail/e-mail-reader.c:3855
 msgid "Forward the selected message to someone"
 msgstr "ReencamiÃar a mensaxe seleccionada"
 
-#: ../mail/e-mail-reader.c:3871
+#: ../mail/e-mail-reader.c:3874
 msgid "Group Reply"
 msgstr "Responder ao grupo"
 
-#: ../mail/e-mail-reader.c:3872
+#: ../mail/e-mail-reader.c:3875
 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:3929 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3941 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Eliminar"
 
-#: ../mail/e-mail-reader.c:3962
+#: ../mail/e-mail-reader.c:3974
 #: ../modules/calendar/e-cal-shell-view-actions.c:1399
 msgid "Next"
 msgstr "Seguinte"
 
-#: ../mail/e-mail-reader.c:3966
+#: ../mail/e-mail-reader.c:3978
 #: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Previous"
 msgstr "Anterior"
 
-#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3987 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Responder"
 
@@ -11993,7 +11989,7 @@ msgstr[1] ""
 "O cartafol Â%s contÃn %u mensaxes duplicadas. Ten certeza de que quere "
 "eliminalas?"
 
-#: ../mail/e-mail-reader-utils.c:1541
+#: ../mail/e-mail-reader-utils.c:1544
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gardar mensaxe"
@@ -12004,13 +12000,13 @@ 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:1562
+#: ../mail/e-mail-reader-utils.c:1565
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mensaxe"
 msgstr[1] "Mensaxes"
 
-#: ../mail/e-mail-reader-utils.c:2017
+#: ../mail/e-mail-reader-utils.c:2020
 msgid "Parsing message"
 msgstr "Analizando mensaxe"
 
@@ -12043,15 +12039,15 @@ msgstr "-------- Mensaxe reencamiÃada --------"
 msgid "-----Original Message-----"
 msgstr "-----Mensaxe orixinal-----"
 
-#: ../mail/em-composer-utils.c:2573
+#: ../mail/em-composer-utils.c:2617
 msgid "an unknown sender"
 msgstr "un remitente descoÃecido"
 
-#: ../mail/em-composer-utils.c:2991
+#: ../mail/em-composer-utils.c:3036
 msgid "Posting destination"
 msgstr "Destino da publicaciÃn"
 
-#: ../mail/em-composer-utils.c:2992
+#: ../mail/em-composer-utils.c:3037
 msgid "Choose folders to post the message to."
 msgstr "Escolla os cartafoles nos que publicar a mensaxe."
 
@@ -12568,7 +12564,7 @@ msgid "Importing Elm data"
 msgstr "Importando datos Elm"
 
 #: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1074
+#: ../modules/mail/e-mail-shell-view.c:1034
 #: ../widgets/misc/e-send-options.c:538
 msgid "Mail"
 msgstr "Correo"
@@ -12787,6 +12783,10 @@ msgid "_Languages"
 msgstr "I_diomas"
 
 #: ../mail/mail-config.ui.h:23
+msgid "Languages Table"
+msgstr "TÃboa de idiomas"
+
+#: ../mail/mail-config.ui.h:24
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
@@ -12794,10 +12794,6 @@ msgstr ""
 "Esta lista de idiomas mostra unicamente os idiomas para os cales hai "
 "instalado un dicionario."
 
-#: ../mail/mail-config.ui.h:24
-msgid "Languages Table"
-msgstr "TÃboa de idiomas"
-
 #: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Comprobar a ortografÃa men_tres escribe"
@@ -12926,7 +12922,7 @@ msgid "No _Proxy for:"
 msgstr "Sen pro_xy para:"
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "Port:"
 msgstr "Porto:"
 
@@ -13101,17 +13097,17 @@ msgstr ""
 "Ignorarase a opciÃn se se atopa algunha coincidencia para as cabeceiras "
 "personalizadas do correo lixo."
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
+#: ../mail/mail-config.ui.h:110
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:237
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:161
 msgid "No encryption"
 msgstr "Sen cifrado"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111
 msgid "TLS encryption"
 msgstr "Cifrado TLS"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112
 msgid "SSL encryption"
 msgstr "Cifrado SSL"
 
@@ -13958,7 +13954,7 @@ msgstr "Enviar e recibir o correo"
 msgid "Cancel _All"
 msgstr "Cancel_ar todo"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
+#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1041
 msgid "Updating..."
 msgstr "Actualizandoâ"
 
@@ -13968,8 +13964,8 @@ msgstr "Agardandoâ"
 
 #: ../mail/mail-send-recv.c:1020
 #, c-format
-msgid "Checking for new mail"
-msgstr "Comprobando se hai correo novo"
+msgid "Checking for new mail at '%s'"
+msgstr "Comprobando se hai correo novo en Â%sÂ"
 
 #: ../mail/mail-vfolder-ui.c:79
 msgid "Search Folders"
@@ -14107,8 +14103,8 @@ msgid "Due By"
 msgstr "Vencemento por"
 
 #: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "Mensaxes enviadas"
+msgid "Messages To"
+msgstr "Mensaxes para"
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -14501,112 +14497,6 @@ msgstr "Enviar unha _mensaxe à lista"
 msgid "_Send Message to Contact"
 msgstr "Enviar unha _mensaxe ao contacto"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "Anonimamente"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
-msgid "Using email address"
-msgstr "Usando enderezo de correo"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
-msgid "Using distinguished name (DN)"
-msgstr "Empregar o nome distintivo (DN)"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "One"
-msgstr "Un"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:10
-msgid "Sub"
-msgstr "Do"
-
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "Supported Search Bases"
-msgstr "Bases de busca compatÃbeis"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
-msgid "_Port:"
-msgstr "_Porto:"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "Ser_vidor:"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "Usar unha _conexiÃn segura:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "MÃtodo de _inicio de sesiÃn:"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "_Iniciar a sesiÃn:"
-
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "_Base de busca:"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "_Search scope:"
-msgstr "Ãmbito da bu_sca:"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "_Find Possible Search Bases"
-msgstr "_Procurar as bases de busca posÃbeis"
-
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "S_earch filter:"
-msgstr "_Filtro de busca:"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "Filtro de busca"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Filtro de busca à o tipo de obxecto que buscar. Se isto non se modifica, a "
-"busca predeterminada realizarase no tipo ÂpersoaÂ."
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:30
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
-msgid "contacts"
-msgstr "contactos"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Tempo de espera:"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "LÃmite de _descarga:"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:34
-msgid "B_rowse this book until limit reached"
-msgstr "Examina_r esta axenda de enderezos atà alcanzar o lÃmite"
-
 #: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
 msgid "Audio Player"
 msgstr "Reprodutor de audio"
@@ -14715,7 +14605,7 @@ msgid "Back up complete"
 msgstr "Copia de seguranza completada"
 
 #: ../modules/backup-restore/evolution-backup-tool.c:364
-#: ../modules/backup-restore/evolution-backup-tool.c:654
+#: ../modules/backup-restore/evolution-backup-tool.c:659
 msgid "Restarting Evolution"
 msgstr "Reiniciando o Evolution"
 
@@ -14731,49 +14621,49 @@ msgstr "Extraendo os ficheiros desde a copia de seguranza"
 msgid "Loading Evolution settings"
 msgstr "Cargando os axustes do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:624
+#: ../modules/backup-restore/evolution-backup-tool.c:629
 msgid "Removing temporary back up files"
 msgstr "Retirando os ficheiros temporais da copia de seguranza"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:641
 msgid "Reloading registry service"
 msgstr "Recargando o servizo de rexistro"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:861
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Respaldo de Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:862
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Facendo a copia de seguranza no cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Restabelecemento do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Restabelecendo desde o cartafol %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:935
+#: ../modules/backup-restore/evolution-backup-tool.c:940
 msgid "Backing up Evolution Data"
 msgstr "Facendo unha copia de seguranza dos datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:936
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Agarde mentres o Evolution fai unha copia de seguranza dos datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:938
+#: ../modules/backup-restore/evolution-backup-tool.c:943
 msgid "Restoring Evolution Data"
 msgstr "Restabelecendo os datos do Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:939
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Agarde mentres o Evolution restabelece os datos."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:957
+#: ../modules/backup-restore/evolution-backup-tool.c:962
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Isto poderÃa levar algÃn tempo dependendo da cantidade de datos da sÃa conta."
@@ -14833,81 +14723,89 @@ msgstr "Permisos insuficientes"
 msgid "The selected folder is not writable."
 msgstr "O cartafol seleccionado non à escribÃbel."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Produciuse un erro ao iniciar Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 "Produciuse un erro ao enviar o fluxo do contido dos correos a Bogofilter: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter colgouse ou fallou ao procesar unha mensaxe de correo"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "OpciÃns do Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "Converter o texto da mensaxe a _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:449
 msgid "Standard LDAP Port"
 msgstr "Porto LDAP estÃndar"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:455
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP sobre SSL (obsoleto)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:461
 msgid "Microsoft Global Catalog"
 msgstr "CatÃlogo global de Microsoft"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:467
 msgid "Microsoft Global Catalog over SSL"
 msgstr "CatÃlogo global de Microsoft sobre SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:572
 msgid "Connecting to LDAP"
 msgstr "Conecando a LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:589
 msgid "Server Information"
 msgstr "InformaciÃn do servidor"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (recomendado)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:632
 msgid "Encryption:"
 msgstr "Cifrado:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:656
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:258
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "Authentication"
 msgstr "AutenticaciÃn"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Anonymous"
 msgstr "Anonimamente"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+msgid "Using email address"
+msgstr "Usando enderezo de correo"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+msgid "Using distinguished name (DN)"
+msgstr "Empregar o nome distintivo (DN)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "Method:"
 msgstr "MÃtodo:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -14918,36 +14816,36 @@ msgstr ""
 "anÃnimo ao servidor LDAP."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:707
 msgid "Using LDAP"
 msgstr "Usando LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:724
 #: ../modules/mail/e-mail-shell-view.c:116
 msgid "Searching"
 msgstr "Buscando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:746
 msgid "Search Base:"
 msgstr "Base de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:751
 msgid "Find Possible Search Bases"
 msgstr "Buscar bases de busca posÃbeis"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "Un nivel"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "SubÃrbore"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "Ãmbito da busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -14960,28 +14858,32 @@ msgstr ""
 "busca ÂUn nivel sà incluirà as entradas un nivel por embaixo da sÃa base de "
 "busca."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "Filtro de busca:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Descargando"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "LÃmite:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
+msgid "contacts"
+msgstr "contactos"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 msgid "Browse until limit is reached"
 msgstr "Examinar atà chegar ao final"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
 msgid "URL:"
 msgstr "URL:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
 
@@ -14990,23 +14892,23 @@ msgstr "Evitar o IfMatch (necesario no Apache < 2.2.8)"
 msgid "HTTP Error: %s"
 msgstr "Erro HTTP: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:445
 msgid "Could not parse response"
 msgstr "Non foi posÃbel analizar a resposta"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:454
 msgid "Empty response"
 msgstr "Resposta baleira"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:462
 msgid "Unexpected reply from server"
 msgstr "Resposta non agardada do servidor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1066
 msgid "Could not locate user's calendars"
 msgstr "Non foi posÃbel atopar ningÃn calendario do usuario."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1290
 msgid "Path"
 msgstr "Ruta"
 
@@ -15383,7 +15285,7 @@ msgstr "Cale_ndario"
 msgid "Create a new calendar"
 msgstr "Crear un calendario novo"
 
-#: ../modules/calendar/e-cal-shell-backend.c:597
+#: ../modules/calendar/e-cal-shell-backend.c:627
 msgid "Calendar and Tasks"
 msgstr "Calendario e tarefas"
 
@@ -15750,29 +15652,29 @@ msgstr "Abrir a pÃxina _web"
 msgid "Print the selected memo"
 msgstr "Imprimir a nota seleccionada"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1477
+#: ../modules/calendar/e-cal-shell-view-private.c:1496
 msgid "Searching next matching event"
 msgstr "Buscando o seguinte evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1478
+#: ../modules/calendar/e-cal-shell-view-private.c:1497
 msgid "Searching previous matching event"
 msgstr "Buscando o anterior evento coincidente"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1499
+#: ../modules/calendar/e-cal-shell-view-private.c:1518
 #, 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:1503
+#: ../modules/calendar/e-cal-shell-view-private.c:1522
 #, 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:1528
+#: ../modules/calendar/e-cal-shell-view-private.c:1547
 msgid "Cannot search with no active calendar"
 msgstr "Non à posÃbel buscar sen un calendario activo"
 
@@ -16570,7 +16472,7 @@ msgid "Start day:"
 msgstr "DÃa de inicio:"
 
 #: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1461
+#: ../modules/itip-formatter/itip-view.c:1473
 msgid "Start time:"
 msgstr "Hora de inicio:"
 
@@ -16579,246 +16481,246 @@ msgid "End day:"
 msgstr "DÃa de finalizaciÃn:"
 
 #: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1462
+#: ../modules/itip-formatter/itip-view.c:1474
 msgid "End time:"
 msgstr "Hora de finalizaciÃn:"
 
-#: ../modules/itip-formatter/itip-view.c:1010
+#: ../modules/itip-formatter/itip-view.c:1022
 msgid "_Open Calendar"
 msgstr "_Abrir calendario"
 
-#: ../modules/itip-formatter/itip-view.c:1013
+#: ../modules/itip-formatter/itip-view.c:1025
 msgid "_Decline all"
 msgstr "_Rexeitar todo"
 
-#: ../modules/itip-formatter/itip-view.c:1016
+#: ../modules/itip-formatter/itip-view.c:1028
 msgid "_Decline"
 msgstr "_Rexeitar"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1031
 msgid "_Tentative all"
 msgstr "_Provisional todo"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1034
 msgid "_Tentative"
 msgstr "_Provisional"
 
-#: ../modules/itip-formatter/itip-view.c:1025
+#: ../modules/itip-formatter/itip-view.c:1037
 msgid "A_ccept all"
 msgstr "A_ceptar todo"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1040
 msgid "A_ccept"
 msgstr "A_ceptar"
 
-#: ../modules/itip-formatter/itip-view.c:1031
+#: ../modules/itip-formatter/itip-view.c:1043
 msgid "_Send Information"
 msgstr "_Enviar informaciÃn"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1046
 msgid "_Update Attendee Status"
 msgstr "_Actualizar o estado do participante"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1049
 msgid "_Update"
 msgstr "_Actualizar"
 
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1512
-#: ../modules/itip-formatter/itip-view.c:1581
+#: ../modules/itip-formatter/itip-view.c:1476
+#: ../modules/itip-formatter/itip-view.c:1524
+#: ../modules/itip-formatter/itip-view.c:1595
 msgid "Comment:"
 msgstr "Comentario:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1512
 msgid "Send reply to sender"
 msgstr "Responder ao remitente"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:1527
 msgid "Send _updates to attendees"
 msgstr "Enviar _actualizaciÃns aos participantes"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1530
 msgid "_Apply to all instances"
 msgstr "_Aplicar a todas as instancias"
 
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1531
 msgid "Show time as _free"
 msgstr "Mostrar hora como _libre"
 
-#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1532
 msgid "_Preserve my reminder"
 msgstr "_Conservar o meu recordatorio"
 
-#: ../modules/itip-formatter/itip-view.c:1521
+#: ../modules/itip-formatter/itip-view.c:1533
 msgid "_Inherit reminder"
 msgstr "_Herdar recordatorio"
 
-#: ../modules/itip-formatter/itip-view.c:1845
+#: ../modules/itip-formatter/itip-view.c:1861
 msgid "_Tasks:"
 msgstr "_Tarefas:"
 
-#: ../modules/itip-formatter/itip-view.c:1848
+#: ../modules/itip-formatter/itip-view.c:1864
 msgid "_Memos:"
 msgstr "_Notas:"
 
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3493
+#: ../modules/itip-formatter/itip-view.c:3511
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Produciuse un erro ao cargar o calendario Â%s (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3652
+#: ../modules/itip-formatter/itip-view.c:3670
 #, 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"
 
-#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:3699
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Localizouse a cita no calendario Â%sÂ"
 
-#: ../modules/itip-formatter/itip-view.c:3774
+#: ../modules/itip-formatter/itip-view.c:3812
 msgid "Unable to find any calendars"
 msgstr "Non à posÃbel atopar ningÃn calendario"
 
-#: ../modules/itip-formatter/itip-view.c:3782
+#: ../modules/itip-formatter/itip-view.c:3820
 msgid "Unable to find this meeting in any calendar"
 msgstr "Non à posÃbel atopar esta reuniÃn en ningÃn calendario"
 
-#: ../modules/itip-formatter/itip-view.c:3787
+#: ../modules/itip-formatter/itip-view.c:3825
 msgid "Unable to find this task in any task list"
 msgstr "Non à posÃbel atopar esta tarefa en ningunha lista de tarefas"
 
-#: ../modules/itip-formatter/itip-view.c:3792
+#: ../modules/itip-formatter/itip-view.c:3830
 msgid "Unable to find this memo in any memo list"
 msgstr "Non à posÃbel atopar esta nota en ningunha lista de notas"
 
-#: ../modules/itip-formatter/itip-view.c:4132
+#: ../modules/itip-formatter/itip-view.c:4179
 msgid "Opening the calendar. Please wait..."
 msgstr "Abrindo o calendario. Agardeâ"
 
-#: ../modules/itip-formatter/itip-view.c:4137
+#: ../modules/itip-formatter/itip-view.c:4184
 msgid "Searching for an existing version of this appointment"
 msgstr "Buscando unha versiÃn existente desta cita"
 
-#: ../modules/itip-formatter/itip-view.c:4523
+#: ../modules/itip-formatter/itip-view.c:4573
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Non à posÃbel enviar o elemento ao calendario Â%sÂ. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4538
+#: ../modules/itip-formatter/itip-view.c:4588
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Enviado ao calendario Â%s como aceptado"
 
-#: ../modules/itip-formatter/itip-view.c:4543
+#: ../modules/itip-formatter/itip-view.c:4593
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Enviado ao calendario Â%s como provisional"
 
-#: ../modules/itip-formatter/itip-view.c:4549
+#: ../modules/itip-formatter/itip-view.c:4599
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Enviado ao calendario Â%s como rexeitado"
 
-#: ../modules/itip-formatter/itip-view.c:4555
+#: ../modules/itip-formatter/itip-view.c:4605
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Enviado ao calendario Â%s como cancelado"
 
-#: ../modules/itip-formatter/itip-view.c:4576
-#: ../modules/itip-formatter/itip-view.c:5016
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:4626
+#: ../modules/itip-formatter/itip-view.c:5066
+#: ../modules/itip-formatter/itip-view.c:5173
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Gardando os cambios no calendario. Agardeâ"
 
-#: ../modules/itip-formatter/itip-view.c:4617
+#: ../modules/itip-formatter/itip-view.c:4667
 msgid "Unable to parse item"
 msgstr "Non à posÃbel analizar o elemento"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4857
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "O organizador retirou o delegado %s "
 
-#: ../modules/itip-formatter/itip-view.c:4822
+#: ../modules/itip-formatter/itip-view.c:4872
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Enviouse unha notificaciÃn de cancelaciÃn ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:4826
+#: ../modules/itip-formatter/itip-view.c:4876
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Non foi posÃbel enviar unha notificaciÃn de cancelaciÃn ao delegado"
 
-#: ../modules/itip-formatter/itip-view.c:4874
+#: ../modules/itip-formatter/itip-view.c:4924
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Non à posÃbel actualizar o participante. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4882
+#: ../modules/itip-formatter/itip-view.c:4932
 msgid "Attendee status updated"
 msgstr "Actualizouse o estado de participante"
 
-#: ../modules/itip-formatter/itip-view.c:4905
+#: ../modules/itip-formatter/itip-view.c:4955
 msgid "The meeting is invalid and cannot be updated"
 msgstr "A reuniÃn no à vÃlida e non pode actualizarse"
 
-#: ../modules/itip-formatter/itip-view.c:4981
+#: ../modules/itip-formatter/itip-view.c:5031
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5053
-#: ../modules/itip-formatter/itip-view.c:5093
+#: ../modules/itip-formatter/itip-view.c:5103
+#: ../modules/itip-formatter/itip-view.c:5143
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5156
+#: ../modules/itip-formatter/itip-view.c:5206
 msgid "Meeting information sent"
 msgstr "Enviouse a informaciÃn da reuniÃn"
 
-#: ../modules/itip-formatter/itip-view.c:5161
+#: ../modules/itip-formatter/itip-view.c:5211
 msgid "Task information sent"
 msgstr "Enviouse a informaciÃn da tarefa"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5216
 msgid "Memo information sent"
 msgstr "Enviouse a informaciÃn da nota"
 
-#: ../modules/itip-formatter/itip-view.c:5177
+#: ../modules/itip-formatter/itip-view.c:5227
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5182
+#: ../modules/itip-formatter/itip-view.c:5232
 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"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5237
 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.
-#: ../modules/itip-formatter/itip-view.c:5252
+#: ../modules/itip-formatter/itip-view.c:5302
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5257
+#: ../modules/itip-formatter/itip-view.c:5307
 msgid "Save Calendar"
 msgstr "Gardar o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:5310
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5360
+#: ../modules/itip-formatter/itip-view.c:5373
 msgid "The calendar attached is not valid"
 msgstr "O calendario anexado non à vÃlido"
 
-#: ../modules/itip-formatter/itip-view.c:5311
-#: ../modules/itip-formatter/itip-view.c:5324
+#: ../modules/itip-formatter/itip-view.c:5361
+#: ../modules/itip-formatter/itip-view.c:5374
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16826,15 +16728,15 @@ msgstr ""
 "A mensaxe di que contÃn un calendario pero o calendario non à un iCalendar "
 "correcto."
 
-#: ../modules/itip-formatter/itip-view.c:5366
-#: ../modules/itip-formatter/itip-view.c:5396
-#: ../modules/itip-formatter/itip-view.c:5496
+#: ../modules/itip-formatter/itip-view.c:5416
+#: ../modules/itip-formatter/itip-view.c:5446
+#: ../modules/itip-formatter/itip-view.c:5546
 msgid "The item in the calendar is not valid"
 msgstr "O elemento do calendario non à vÃlido"
 
-#: ../modules/itip-formatter/itip-view.c:5367
-#: ../modules/itip-formatter/itip-view.c:5397
-#: ../modules/itip-formatter/itip-view.c:5497
+#: ../modules/itip-formatter/itip-view.c:5417
+#: ../modules/itip-formatter/itip-view.c:5447
+#: ../modules/itip-formatter/itip-view.c:5547
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16842,11 +16744,11 @@ msgstr ""
 "A mensaxe contÃn un calendario pero o calendario non contÃn actividades, "
 "tarefas nin informaciÃn de dispoÃibilidade"
 
-#: ../modules/itip-formatter/itip-view.c:5412
+#: ../modules/itip-formatter/itip-view.c:5462
 msgid "The calendar attached contains multiple items"
 msgstr "O calendario anexado contÃn mÃltiples elementos"
 
-#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5463
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16854,24 +16756,24 @@ msgstr ""
 "Para procesar todos estes elementos, deberÃa gardarse o ficheiro e "
 "importarse o calendario"
 
-#: ../modules/itip-formatter/itip-view.c:5937
+#: ../modules/itip-formatter/itip-view.c:5987
 msgctxt "cal-itip"
 msgid "None"
 msgstr "NingÃn"
 
-#: ../modules/itip-formatter/itip-view.c:5953
+#: ../modules/itip-formatter/itip-view.c:6003
 msgid "Tentatively Accepted"
 msgstr "Aceptado provisionalmente"
 
-#: ../modules/itip-formatter/itip-view.c:6096
+#: ../modules/itip-formatter/itip-view.c:6146
 msgid "This meeting recurs"
 msgstr "Esta cita repÃtese"
 
-#: ../modules/itip-formatter/itip-view.c:6099
+#: ../modules/itip-formatter/itip-view.c:6149
 msgid "This task recurs"
 msgstr "Esta tarefa repÃtese"
 
-#: ../modules/itip-formatter/itip-view.c:6102
+#: ../modules/itip-formatter/itip-view.c:6152
 msgid "This memo recurs"
 msgstr "Esta nota repÃtese"
 
@@ -16970,6 +16872,7 @@ msgid "Choose a mbox spool directory"
 msgstr "Seleccione un cartafol spool de mbox"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:149
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:82
 #: ../modules/plugin-manager/evolution-plugin-manager.c:160
 msgid "Configuration"
@@ -16981,6 +16884,11 @@ msgstr "ConfiguraciÃn"
 msgid "_Server:"
 msgstr "_Servidor:"
 
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
+msgid "_Port:"
+msgstr "_Porto:"
+
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:193
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:229
 msgid "User_name:"
@@ -17001,6 +16909,32 @@ msgstr "STARTTLS despois de conectarse"
 msgid "SSL on a dedicated port"
 msgstr "SSL nun porto adicado"
 
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "_Usar binario personalizado, no lugar de ÂsendmailÂ"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+msgid "_Custom binary:"
+msgstr "Binario _personalizado:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+msgid "U_se custom arguments"
+msgstr "U_sar argumentos personalizados"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+msgid "Cus_tom arguments:"
+msgstr "Argumentos persona_lizados:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+"Os argumentos personalizados son '-i -f %F -- %R', onde\n"
+"   %F - Ã o enderezo de Desde\n"
+"   %R - Ã o enderezo do remitente"
+
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:125
 msgid "Ser_ver requires authentication"
 msgstr "O ser_vidor solicita autenticaciÃn"
@@ -17018,7 +16952,7 @@ msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Engadir Ca_lendario e Tarefas de Yahoo! a esta conta"
 
 # (pofilter) variables: (u'translation contains variables not in original: %d',)
-#: ../modules/mail/e-mail-attachment-handler.c:390
+#: ../modules/mail/e-mail-attachment-handler.c:368
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -17075,7 +17009,6 @@ msgid "None"
 msgstr "NingÃn"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1226
-#: ../modules/mail/e-mail-shell-view.c:975
 msgid "_Disable Account"
 msgstr "_Desactivar a conta"
 
@@ -17386,10 +17319,6 @@ msgstr "Buscar en todas as contas"
 msgid "Account Search"
 msgstr "Buscar na conta"
 
-#: ../modules/mail/e-mail-shell-view.c:973
-msgid "Proxy _Logout"
-msgstr "_SaÃr da sesiÃn proxy"
-
 #: ../modules/mail/e-mail-shell-view-private.c:962
 #, c-format
 msgid "%d selected, "
@@ -17455,7 +17384,7 @@ msgstr "Lixo"
 msgid "Send / Receive"
 msgstr "Enviar / Recibir"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:499
 msgid "Language(s)"
 msgstr "Idioma(s)"
 
@@ -17548,7 +17477,8 @@ msgid ""
 msgstr ""
 "O Evolution conectarase de novo cando se estabeleza a conexiÃn coa rede"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
+#: ../modules/online-accounts/camel-sasl-xoauth2.c:166
+#: ../modules/online-accounts/camel-sasl-xoauth.c:298
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17556,11 +17486,12 @@ msgstr ""
 "Non foi posÃbel atopar a conta correspondente no servizo org.gnome."
 "OnlineAccounts desde a que obter un token de autenticaciÃn."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
-msgid "OAuth"
-msgstr "OAuth"
+#: ../modules/online-accounts/camel-sasl-xoauth2.c:222
+msgid "OAuth2"
+msgstr "OAuth2"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
+#: ../modules/online-accounts/camel-sasl-xoauth2.c:224
+#: ../modules/online-accounts/camel-sasl-xoauth.c:379
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
@@ -17568,6 +17499,10 @@ msgstr ""
 "Esta opciÃn conectara co servidor a travÃs do servizo de Contas en liÃa de "
 "GNOME"
 
+#: ../modules/online-accounts/camel-sasl-xoauth.c:377
+msgid "OAuth"
+msgstr "OAuth"
+
 #: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Author(s)"
 msgstr "AutorÃa"
@@ -17673,42 +17608,42 @@ 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."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:185
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Produciuse un erro ao iniciar SpamAssassin (%s) "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:208
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 "Produciuse un erro ao enviar o fluxo do contido dos correos a SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:227
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Produciuse un erro ao escribir Â%s a SpamAssasin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:255
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Produciuse un erro ao ler a saÃda de SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:310
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssasin colgouse ou fallou ao procesar unha mensaxe de correo"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
+#: ../modules/spamassassin/evolution-spamassassin.c:748
 msgid "SpamAssassin Options"
 msgstr "OpciÃns do SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
+#: ../modules/spamassassin/evolution-spamassassin.c:763
 msgid "I_nclude remote tests"
 msgstr "I_ncluÃr probas remotas"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:777
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Isto farà que SpamAssassin sexa mÃis fiÃbel, pero tamÃn mÃis lento"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:1034
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
@@ -17762,11 +17697,11 @@ msgstr "_Formatar comoâ"
 msgid "_Other languages"
 msgstr "_Outros idiomas"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:365
 msgid "Text Highlight"
 msgstr "Realzado do texto"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
 msgid "Syntax highlighting of mail parts"
 msgstr "Realzado de sintaxe das partes do correo"
 
@@ -19089,15 +19024,19 @@ msgstr "Gardar como un _modelo"
 msgid "Save as Template"
 msgstr "Gardar como un modelo"
 
-#: ../shell/e-shell.c:313
+#: ../shell/e-shell.c:314
 msgid "Preparing to go offline..."
 msgstr "Preparando a desconexiÃnâ"
 
-#: ../shell/e-shell.c:366
+#: ../shell/e-shell.c:367
 msgid "Preparing to go online..."
 msgstr "Preparando a conexiÃnâ"
 
-#: ../shell/e-shell.c:437
+#: ../shell/e-shell.c:441
+msgid "Preparing to quit"
+msgstr "Preparando a saÃda"
+
+#: ../shell/e-shell.c:447
 msgid "Preparing to quit..."
 msgstr "Preparando a saÃdaâ"
 
@@ -19173,261 +19112,261 @@ msgstr "Sitio web do Evolution"
 msgid "Categories Editor"
 msgstr "Editor de categorÃas"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Bug Buddy is not installed."
 msgstr "O Bug buddy non està instalado."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Bug Buddy could not be run."
 msgstr "Non foi posÃbel executar o Bug Buddy."
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:1408
 msgid "Show information about Evolution"
 msgstr "Mostrar informaciÃn sobre o Evolution"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:1413
+#: ../shell/e-shell-window-actions.c:1427
 msgid "_Close Window"
 msgstr "Pe_char a xanela"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:1434
 msgid "_Contents"
 msgstr "_Contidos"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:1436
 msgid "Open the Evolution User Guide"
 msgstr "Abrir a guÃa de usuario do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:1462
 msgid "I_mport..."
 msgstr "I_mportarâ"
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:1464
 msgid "Import data from other programs"
 msgstr "Importar os datos doutros programas"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:1469
 msgid "New _Window"
 msgstr "_Xanela nova"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:1471
 msgid "Create a new window displaying this view"
 msgstr "Crear unha xanela nova mostrando esta vista"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:1483
 msgid "Available Cate_gories"
 msgstr "Cate_gorias dispoÃÃbeis"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:1485
 msgid "Manage available categories"
 msgstr "Xestionar as categorÃas dispoÃÃbeis"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:1497
 msgid "_Quick Reference"
 msgstr "_Referencia rÃpida"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:1499
 msgid "Show Evolution's shortcut keys"
 msgstr "Mostrar as teclas dos atallos do Evolution"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:1506
 msgid "Exit the program"
 msgstr "SaÃr do programa"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:1511
 msgid "_Advanced Search..."
 msgstr "Busca _avanzadaâ"
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:1513
 msgid "Construct a more advanced search"
 msgstr "ConstruÃr unha busca mÃis avanzada"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:1520
 msgid "Clear the current search parameters"
 msgstr "Limpar os parÃmetros da busca actual"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:1525
 msgid "_Edit Saved Searches..."
 msgstr "_Editar as buscas gardadasâ"
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:1527
 msgid "Manage your saved searches"
 msgstr "Xestionar as buscas gardadas"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:1534
 msgid "Click here to change the search type"
 msgstr "Prema aquà para cambiar o tipo de busca"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:1539
 msgid "_Find Now"
 msgstr "_Buscar agora"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:1541
 msgid "Execute the current search parameters"
 msgstr "Executar os parÃmetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:1546
 msgid "_Save Search..."
 msgstr "_Gardar a buscaâ"
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:1548
 msgid "Save the current search parameters"
 msgstr "Gardar os parÃmetros de busca actuais"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:1560
 msgid "Submit _Bug Report..."
 msgstr "Enviar un _informe de falloâ"
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:1562
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Enviar un informe de fallo usando o Bug Buddy"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1567
 msgid "_Work Offline"
 msgstr "_Traballar sen conexiÃn"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1569
 msgid "Put Evolution into offline mode"
 msgstr "PoÃer o Evolution en modo sen conexiÃn"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1574
 msgid "_Work Online"
 msgstr "_Traballar conectado"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1576
 msgid "Put Evolution into online mode"
 msgstr "PoÃer o Evolution en modo conectado"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1604
 msgid "Lay_out"
 msgstr "Disp_osiciÃn"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1611
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1618
 msgid "_Search"
 msgstr "_Buscar"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1625
 msgid "_Switcher Appearance"
 msgstr "Aparencia do _selector"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1639
 msgid "_Window"
 msgstr "_Xanela"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1668
 msgid "Show Side _Bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1670
 msgid "Show the side bar"
 msgstr "Mostrar a _barra lateral"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1676
 msgid "Show _Buttons"
 msgstr "Mostrar os botÃns"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1678
 msgid "Show the switcher buttons"
 msgstr "Mostrar os botÃns do selector"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1684
 msgid "Show _Status Bar"
 msgstr "Mostrar a _barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1686
 msgid "Show the status bar"
 msgstr "Mostrar a barra de estado"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1692
 msgid "Show _Tool Bar"
 msgstr "Mostrar a barra de ferramen_tas"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1694
 msgid "Show the tool bar"
 msgstr "Mostrar a barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1716
 msgid "_Icons Only"
 msgstr "SÃ _iconas"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1718
 msgid "Display window buttons with icons only"
 msgstr "Mostrar os botÃns da xanela sà con iconas"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1723
 msgid "_Text Only"
 msgstr "SÃ _texto"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1725
 msgid "Display window buttons with text only"
 msgstr "Mostrar os botÃns da xanela sà con texto"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1730
 msgid "Icons _and Text"
 msgstr "Icon_as e texto"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1732
 msgid "Display window buttons with icons and text"
 msgstr "Mostrar os botÃns da xanela con iconas e texto"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1737
 msgid "Tool_bar Style"
 msgstr "Estilo da _barra de ferramentas"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1739
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Mostrar os botÃns da xanela usando a configuraciÃn da barra de ferramentas "
 "do escritorio"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1747
 msgid "Define Views..."
 msgstr "Definir as vistasâ"
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1749
 msgid "Create or edit views"
 msgstr "Crear ou editar vistas"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1754
 msgid "Save Custom View..."
 msgstr "Gardar a vista personalizadaâ"
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1756
 msgid "Save current custom view"
 msgstr "Gardar a vista personalizada actual"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1763
 msgid "C_urrent View"
 msgstr "Vista act_ual"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1773
 msgid "Custom View"
 msgstr "Vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1775
 msgid "Current view is a customized view"
 msgstr "A vista actual à unha vista personalizada"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1785
 msgid "Change the page settings for your current printer"
 msgstr "Cambiar os axustes da pÃxina para a impresora actual"
 
-#: ../shell/e-shell-window-actions.c:2178
+#: ../shell/e-shell-window-actions.c:2175
 #, c-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
-#: ../shell/e-shell-window-actions.c:2299
+#: ../shell/e-shell-window-actions.c:2296
 #, c-format
 msgid "Select view: %s"
 msgstr "Seleccionar vista: %s"
 
-#: ../shell/e-shell-window-actions.c:2400
+#: ../shell/e-shell-window-actions.c:2397
 msgid "Execute these search parameters"
 msgstr "Executar estes parÃmetros de busca"
 
@@ -19442,7 +19381,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:184
+#: ../shell/main.c:190
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19478,7 +19417,7 @@ msgstr ""
 "Esperamos que lles sexa de proveito o resultado do noso duro\n"
 "traballo, e agardamos con ansias as sÃas colaboraciÃns!\n"
 
-#: ../shell/main.c:208
+#: ../shell/main.c:214
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19486,13 +19425,13 @@ msgstr ""
 "Grazas\n"
 "O equipo do Evolution\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:220
 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:305
+#: ../shell/main.c:311
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19500,47 +19439,56 @@ msgstr ""
 "Iniciar o Evolution mostrando o compoÃente indicado. As opciÃn dispoÃÃbeis "
 "son 'mail', 'calendar', 'contacts', 'tasks' e 'memos'"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:315
 msgid "Apply the given geometry to the main window"
 msgstr "Aplicar a xeometrÃa indicada à xanela principal"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:319
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:321
 msgid "Ignore network availability"
 msgstr "Ignorar a dispoÃibilidade da rede"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:323
 msgid "Start in \"express\" mode"
 msgstr "Iniciar en modo ÂexpressÂ"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:326
 msgid "Forcibly shut down Evolution"
 msgstr "Forzar o peche do Evolution"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:329
 msgid "Disable loading of any plugins."
 msgstr "Desactivar a carga de todos os engadidos."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:331
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desactivar o panel de vista previa de correo, contactos e tarefas."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:335
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Importar URI ou nomes de ficheiros fornecidos como argumentos."
 
-#: ../shell/main.c:331
+#: ../shell/main.c:337
 msgid "Request a running Evolution process to quit"
 msgstr "Solicitar a saÃda dun proceso de execuciÃn do Evolution"
 
-#: ../shell/main.c:504
+#: ../shell/main.c:426
+#, c-format
+msgid ""
+"Cannot start Evolution, other instance is probably running and is "
+"unresponsive. System error: %s"
+msgstr ""
+"Non à posÃbel iniciar Evolution, outra instancia probabelmente xa estea en "
+"execuciÃn e non responda. Erro do sistema: %s"
+
+#: ../shell/main.c:528 ../shell/main.c:533
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Cliente de correo e XIP Evolution"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:600
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19549,7 +19497,7 @@ msgstr ""
 "%s: non à posÃbel usar à vez --online e --offline.\n"
 "  Use Â%s --help para mÃis informaciÃn.\n"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:606
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19596,70 +19544,6 @@ msgstr ""
 "PorÃn, como soluciÃn pode intentar anovar primeiro a Evolution 2 e despois a "
 "Evolution 3."
 
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "O ficheiro non à un ficheiro .desktop correcto"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Non se recoÃece a versiÃn de ficheiro desktop Â%sÂ"
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Iniciando %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "O aplicativo non acepta documentos pola liÃa de ordes"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Non se recoÃece a opciÃn de inicio: %d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr ""
-"Non à posÃbel pasar URIs de documento a unha entrada de desktop 'Type=Link'"
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Non à un elemento executÃbel"
-
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "Desactivar a conexiÃn ao xestor de sesiÃn"
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "Indicar o ficheiro que contÃn a configuraciÃn gardada"
-
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "FICHEIRO"
-
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "Indicar o ID de xestiÃn de sesiÃn"
-
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "ID"
-
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "OpciÃns de xestiÃn de sesiÃn:"
-
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "Mostrar as opciÃns de xestiÃn de sesiÃn"
-
 #: ../smime/gui/ca-trust-dialog.c:107
 #, c-format
 msgid ""
@@ -20377,54 +20261,54 @@ msgstr "Vista de lista"
 #. * message when, for example, attaching it to a composer. When the
 #. * message to be attached has also filled Subject, then this text is
 #. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:966
+#: ../widgets/misc/e-attachment.c:979
 msgid "Attached message"
 msgstr "Mensaxe anexada"
 
 #. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
+#: ../widgets/misc/e-attachment.c:1842 ../widgets/misc/e-attachment.c:2397
 #: ../widgets/misc/e-attachment-store.c:525
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
+#: ../widgets/misc/e-attachment.c:1887 ../widgets/misc/e-attachment.c:2699
 msgid "A load operation is already in progress"
 msgstr "Xa se està en proceso unha operaciÃn de carga"
 
-#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
+#: ../widgets/misc/e-attachment.c:1895 ../widgets/misc/e-attachment.c:2707
 msgid "A save operation is already in progress"
 msgstr "Xa se està en proceso unha operaciÃn de gardado"
 
-#: ../widgets/misc/e-attachment.c:1989
+#: ../widgets/misc/e-attachment.c:2002
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Non foi posÃbel cargar Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:1992
+#: ../widgets/misc/e-attachment.c:2005
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Non foi posÃbel cargar o anexo"
 
-#: ../widgets/misc/e-attachment.c:2265
+#: ../widgets/misc/e-attachment.c:2278
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Non foi posÃbel abrir Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2268
+#: ../widgets/misc/e-attachment.c:2281
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Non foi posÃbel abrir o anexo"
 
-#: ../widgets/misc/e-attachment.c:2702
+#: ../widgets/misc/e-attachment.c:2715
 msgid "Attachment contents not loaded"
 msgstr "Non se cargaron os contidos do anexo"
 
-#: ../widgets/misc/e-attachment.c:2778
+#: ../widgets/misc/e-attachment.c:2791
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Non foi posÃbel gardar Â%sÂ"
 
-#: ../widgets/misc/e-attachment.c:2781
+#: ../widgets/misc/e-attachment.c:2794
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Non foi posÃbel gardar o anexo"
@@ -20795,23 +20679,23 @@ msgstr "Prema en ÂAplicar para comezar a importar o ficheiro ao Evolution."
 msgid "Autogenerated"
 msgstr "Xerado automaticamente"
 
-#: ../widgets/misc/e-mail-signature-editor.c:287
+#: ../widgets/misc/e-mail-signature-editor.c:294
 msgid "Close"
 msgstr "Pechar"
 
-#: ../widgets/misc/e-mail-signature-editor.c:292
+#: ../widgets/misc/e-mail-signature-editor.c:299
 msgid "_Save and Close"
 msgstr "G_ardar e pechar"
 
-#: ../widgets/misc/e-mail-signature-editor.c:506
+#: ../widgets/misc/e-mail-signature-editor.c:513
 msgid "Edit Signature"
 msgstr "Editar a sinatura"
 
-#: ../widgets/misc/e-mail-signature-editor.c:526
+#: ../widgets/misc/e-mail-signature-editor.c:533
 msgid "_Signature Name:"
 msgstr "Nome da _sinatura:"
 
-#: ../widgets/misc/e-mail-signature-editor.c:572
+#: ../widgets/misc/e-mail-signature-editor.c:579
 msgid "Unnamed"
 msgstr "Sen nome"
 
@@ -20819,11 +20703,11 @@ msgstr "Sen nome"
 msgid "Add _Script"
 msgstr "Engadir un _script"
 
-#: ../widgets/misc/e-mail-signature-manager.c:421
+#: ../widgets/misc/e-mail-signature-manager.c:422
 msgid "Add Signature Script"
 msgstr "Engadir un script de sinatura"
 
-#: ../widgets/misc/e-mail-signature-manager.c:491
+#: ../widgets/misc/e-mail-signature-manager.c:492
 msgid "Edit Signature Script"
 msgstr "Editar o script de sinatura"
 
@@ -21059,30 +20943,30 @@ msgstr "Devolver notificaciÃn"
 msgid "Sta_tus Tracking"
 msgstr "Seguimento de es_tado"
 
-#: ../widgets/misc/e-source-config.c:675 ../widgets/misc/e-source-config.c:679
+#: ../widgets/misc/e-source-config.c:680 ../widgets/misc/e-source-config.c:684
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../widgets/misc/e-source-config.c:687 ../widgets/misc/e-source-config.c:691
+#: ../widgets/misc/e-source-config.c:692 ../widgets/misc/e-source-config.c:696
 msgid "Name:"
 msgstr "Nome:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1289
+#: ../widgets/misc/e-source-config.c:1294
 msgid "Refresh every"
 msgstr "Actualizar cada"
 
-#: ../widgets/misc/e-source-config.c:1319
-#: ../widgets/misc/e-source-config.c:1347
+#: ../widgets/misc/e-source-config.c:1324
+#: ../widgets/misc/e-source-config.c:1373
 msgid "Use a secure connection"
 msgstr "Usar unha conexiÃn segura"
 
-#: ../widgets/misc/e-source-config.c:1361
+#: ../widgets/misc/e-source-config.c:1397
 msgid "Ignore invalid SSL certificate"
 msgstr "Ignorar certificado SSL non vÃlido"
 
-#: ../widgets/misc/e-source-config.c:1398
+#: ../widgets/misc/e-source-config.c:1434
 msgid "User"
 msgstr "Usuario"
 
@@ -21148,19 +21032,19 @@ msgstr "Copiar a imaxe ao portapapeis"
 msgid "Select all text and images"
 msgstr "Seleccionar todo o texto e as imaxes"
 
-#: ../widgets/misc/e-web-view.c:1104 ../widgets/misc/e-web-view.c:1106
-#: ../widgets/misc/e-web-view.c:1108 ../widgets/misc/e-web-view-gtkhtml.c:975
+#: ../widgets/misc/e-web-view.c:1099 ../widgets/misc/e-web-view.c:1101
+#: ../widgets/misc/e-web-view.c:1103 ../widgets/misc/e-web-view-gtkhtml.c:975
 #: ../widgets/misc/e-web-view-gtkhtml.c:977
 #: ../widgets/misc/e-web-view-gtkhtml.c:979
 #, c-format
 msgid "Click to call %s"
 msgstr "Prema para chamar a %s"
 
-#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
+#: ../widgets/misc/e-web-view.c:1105 ../widgets/misc/e-web-view-gtkhtml.c:981
 msgid "Click to hide/unhide addresses"
 msgstr "Prema para ocultar/mostrar os enderezos"
 
-#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
+#: ../widgets/misc/e-web-view.c:1107 ../widgets/misc/e-web-view-gtkhtml.c:983
 #, c-format
 msgid "Click to open %s"
 msgstr "Prema para abrir %s"
@@ -21471,6 +21355,126 @@ msgstr "Seleccionar todo"
 msgid "Input Methods"
 msgstr "MÃtodos de entrada"
 
+#~ msgid "Use SpamAssassin daemon and client (spamc/spamd)."
+#~ msgstr "Usar o daemon e o cliente SpamAssassin (spamc/spamd)."
+
+#~ msgid "SpamAssassin client binary"
+#~ msgstr "Binario do cliente de SpamAssassin"
+
+#~ msgid "SpamAssassin daemon binary"
+#~ msgstr "Binario do Âdaemon de SpamAssassin"
+
+#~ msgid "Sent Messages"
+#~ msgstr "Mensaxes enviadas"
+
+#~ msgid "Anonymously"
+#~ msgstr "Anonimamente"
+
+#~ msgid "One"
+#~ msgstr "Un"
+
+#~ msgid "Sub"
+#~ msgstr "Do"
+
+#~ msgid "Supported Search Bases"
+#~ msgstr "Bases de busca compatÃbeis"
+
+#~ msgid "Ser_ver:"
+#~ msgstr "Ser_vidor:"
+
+#~ msgid "Use secure _connection:"
+#~ msgstr "Usar unha _conexiÃn segura:"
+
+#~ msgid "_Login method:"
+#~ msgstr "MÃtodo de _inicio de sesiÃn:"
+
+#~ msgid "Lo_gin:"
+#~ msgstr "_Iniciar a sesiÃn:"
+
+#~ msgid "Search _base:"
+#~ msgstr "_Base de busca:"
+
+#~ msgid "_Search scope:"
+#~ msgstr "Ãmbito da bu_sca:"
+
+#~ msgid "_Find Possible Search Bases"
+#~ msgstr "_Procurar as bases de busca posÃbeis"
+
+#~ msgid "S_earch filter:"
+#~ msgstr "_Filtro de busca:"
+
+#~ msgid "Search Filter"
+#~ msgstr "Filtro de busca"
+
+#~ msgid ""
+#~ "Search filter is the type of object to be searched for. If this is not "
+#~ "modified, the default search will be performed on the type \"person\"."
+#~ msgstr ""
+#~ "Filtro de busca à o tipo de obxecto que buscar. Se isto non se modifica, "
+#~ "a busca predeterminada realizarase no tipo ÂpersoaÂ."
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "5"
+#~ msgstr "5"
+
+#~ msgid "_Timeout:"
+#~ msgstr "_Tempo de espera:"
+
+#~ msgid "_Download limit:"
+#~ msgstr "LÃmite de _descarga:"
+
+#~ msgid "B_rowse this book until limit reached"
+#~ msgstr "Examina_r esta axenda de enderezos atà alcanzar o lÃmite"
+
+#~ msgid "Proxy _Logout"
+#~ msgstr "_SaÃr da sesiÃn proxy"
+
+#~ msgid "File is not a valid .desktop file"
+#~ msgstr "O ficheiro non à un ficheiro .desktop correcto"
+
+#~ msgid "Unrecognized desktop file Version '%s'"
+#~ msgstr "Non se recoÃece a versiÃn de ficheiro desktop Â%sÂ"
+
+#~ msgid "Starting %s"
+#~ msgstr "Iniciando %s"
+
+#~ msgid "Application does not accept documents on command line"
+#~ msgstr "O aplicativo non acepta documentos pola liÃa de ordes"
+
+#~ msgid "Unrecognized launch option: %d"
+#~ msgstr "Non se recoÃece a opciÃn de inicio: %d"
+
+#~ msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
+#~ msgstr ""
+#~ "Non à posÃbel pasar URIs de documento a unha entrada de desktop "
+#~ "'Type=Link'"
+
+#~ msgid "Not a launchable item"
+#~ msgstr "Non à un elemento executÃbel"
+
+#~ msgid "Disable connection to session manager"
+#~ msgstr "Desactivar a conexiÃn ao xestor de sesiÃn"
+
+#~ msgid "Specify file containing saved configuration"
+#~ msgstr "Indicar o ficheiro que contÃn a configuraciÃn gardada"
+
+#~ msgid "FILE"
+#~ msgstr "FICHEIRO"
+
+#~ msgid "Specify session management ID"
+#~ msgstr "Indicar o ID de xestiÃn de sesiÃn"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Session management options:"
+#~ msgstr "OpciÃns de xestiÃn de sesiÃn:"
+
+#~ msgid "Show session management options"
+#~ msgstr "Mostrar as opciÃns de xestiÃn de sesiÃn"
+
 #~ msgctxt "New"
 #~ msgid "_Test Item"
 #~ msgstr "Elemento de _proba"
@@ -23408,9 +23412,6 @@ msgstr "MÃtodos de entrada"
 #~ msgid "Unable to retrieve message"
 #~ msgstr "Non se puido obter a mensaxe"
 
-#~ msgid "Custom Alarm:"
-#~ msgstr "Alarma personalizada:"
-
 #~ msgid "Evolution _FAQ"
 #~ msgstr "_FAQ do Evolution"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]