[evolution] Updated Basque language



commit cb0965c08c069756c4ae9ee6641a019aab944a72
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date:   Sat Apr 4 12:59:08 2015 +0200

    Updated Basque language

 po/eu.po | 3868 +++++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 2084 insertions(+), 1784 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 7284cfb..dcf42e7 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,25 +1,25 @@
 # Basque translation of evolution.
 # Copyright (C) 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
+#: ../shell/main.c:506
 # Hizkuntza Politikarako Sailburuordetza <hizpol ej-gv es>, 2004.
 # Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2005, 2006, 2008, 2009, 2010.
-# Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2011, 2013, 2014.
+# Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2011, 2013, 2014, 2015.
 #
-#: ../shell/main.c:503
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2015-01-08 15:14+0100\n"
-"PO-Revision-Date: 2015-01-08 15:15+0100\n"
+"POT-Creation-Date: 2015-04-04 12:31+0200\n"
+"PO-Revision-Date: 2015-04-04 12:58+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
 "Language-Team: Basque <librezale librezale org>\n"
 "Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.4\n"
+"X-Generator: Lokalize 1.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../addressbook/addressbook.error.xml.h:1
@@ -202,7 +202,7 @@ msgstr ""
 #: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
 #: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
 #: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
-#: ../mail/mail-config.ui.h:53 ../modules/mail/em-composer-prefs.c:397
+#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:416
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
 #: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
@@ -347,7 +347,7 @@ msgstr "_Gune nagusia:"
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1881
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Calendar:"
 msgstr "_Egutegia:"
 
@@ -364,7 +364,7 @@ msgid "Home Page:"
 msgstr "Gune nagusia:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:93
+#: ../modules/cal-config-google/e-cal-config-google.c:92
 msgid "Calendar:"
 msgstr "Egutegia:"
 
@@ -480,6 +480,7 @@ msgid "_PO Box:"
 msgstr "_Posta-kutxa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "Helbi_dea:"
 
@@ -524,7 +525,7 @@ msgid "_Help"
 msgstr "_Laguntza"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:34
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
 msgid "Options"
 msgstr "Aukerak"
 
@@ -532,7 +533,7 @@ msgstr "Aukerak"
 #. no flags
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
@@ -545,13 +546,13 @@ msgstr "Aukerak"
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:15
 #: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
 #: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:370
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:406
 #: ../e-util/e-categories-dialog.c:82 ../e-util/e-category-editor.c:138
 #: ../e-util/e-category-editor.c:208 ../e-util/e-charset-combo-box.c:101
 #: ../e-util/e-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
-#: ../e-util/e-html-editor-actions.c:480 ../e-util/e-html-editor-actions.c:573
+#: ../e-util/e-html-editor-actions.c:614 ../e-util/e-html-editor-actions.c:708
 #: ../e-util/e-image-chooser-dialog.c:171
 #: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
@@ -559,20 +560,18 @@ msgstr "Aukerak"
 #: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
 #: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
 #: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3043
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3136
 #: ../e-util/gal-view-instance-save-as-dialog.c:269
 #: ../mail/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
 #: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
 #: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
 #: ../mail/mail-send-recv.c:820 ../mail/mail-vfolder-ui.c:148
 #: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:886
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:277
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:187
+#: ../modules/backup-restore/evolution-backup-tool.c:900
 #: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
-#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/face/face.c:291
+#: ../plugins/publish-calendar/publish-calendar.c:790
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
 #: ../plugins/save-calendar/save-calendar.c:187 ../shell/e-shell-content.c:659
 #: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
@@ -589,9 +588,9 @@ msgstr "_Utzi"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
 #: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:215 ../composer/e-composer-actions.c:355
 #: ../e-util/e-attachment-store.c:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3044
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3137
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
 #: ../smime/gui/certificate-manager.c:653
@@ -641,7 +640,7 @@ msgstr "Erakutsi oharrak"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:257
 #: ../calendar/gui/dialogs/comp-editor.c:1298
-#: ../e-util/e-html-editor-actions.c:994
+#: ../e-util/e-html-editor-actions.c:1129
 msgid "_Undo"
 msgstr "_Desegin"
 
@@ -652,7 +651,7 @@ msgstr "Desegin"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
 #: ../calendar/gui/dialogs/comp-editor.c:1305
-#: ../e-util/e-html-editor-actions.c:980
+#: ../e-util/e-html-editor-actions.c:1115
 msgid "_Redo"
 msgstr "_Berregin"
 
@@ -686,7 +685,7 @@ msgstr "Hautatu irudi bat kontaktu honentzat"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
 #: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
-#: ../e-util/e-html-editor-actions.c:481 ../e-util/e-html-editor-actions.c:574
+#: ../e-util/e-html-editor-actions.c:615 ../e-util/e-html-editor-actions.c:709
 #: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
 #: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
@@ -729,7 +728,7 @@ msgstr "%s'%s' hutsik dago"
 msgid "Invalid contact."
 msgstr "Kontaktua ez da baliozkoa."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
 #: ../addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../addressbook/gui/widgets/eab-gui-util.c:319
@@ -740,7 +739,7 @@ msgstr "Kontaktua ez da baliozkoa."
 #: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
 #: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
 #: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
-#: ../e-util/e-html-editor-link-dialog.c:370 ../e-util/e-passwords.c:471
+#: ../e-util/e-html-editor-link-dialog.c:388 ../e-util/e-passwords.c:471
 #: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
 #: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
 #: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
@@ -882,14 +881,14 @@ msgstr "Kendu helbide elektronikoa arbeletik"
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:460
 #: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
 #: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
 #: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
-#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:54
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
 #: ../plugins/email-custom-header/email-custom-header.c:849
-#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../plugins/templates/templates.c:463
 msgid "_Remove"
@@ -944,19 +943,19 @@ msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1253
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
 msgid "Name contains"
 msgstr "_Izenak hau dauka:"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
 msgid "Email begins with"
 msgstr "Helb. el. honela hasten da:"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1239
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181
 #: ../modules/calendar/e-cal-shell-view-actions.c:1611
 #: ../modules/calendar/e-memo-shell-view-actions.c:733
 #: ../modules/calendar/e-task-shell-view-actions.c:933
@@ -989,7 +988,7 @@ msgid "Send a mail message to this address"
 msgstr "Bidali mezu bat helbide honetara"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view.c:999
 #, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik %s bidaltzeko"
@@ -1355,7 +1354,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Itsatsi kontaktuak arbeletik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:1053
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Ezabatu hautatutako kontaktuak"
 
@@ -1390,15 +1389,14 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ziur zaude kontaktu hau (%s) ezabatu nahi duzula?"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1242
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:785
+#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
 #: ../e-util/evolution-source-viewer.c:805
 #: ../mail/e-mail-account-manager.c:736
-#: ../modules/addressbook/e-book-shell-view-actions.c:1125
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 #: ../modules/calendar/e-cal-shell-view-actions.c:1434
 #: ../modules/calendar/e-memo-shell-view-actions.c:635
 #: ../modules/calendar/e-task-shell-view-actions.c:788
-#: ../modules/mail/e-mail-shell-view-actions.c:1661
+#: ../modules/mail/e-mail-shell-view-actions.c:1680
 #: ../shell/e-shell-window-actions.c:943
 #: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
@@ -1598,13 +1596,13 @@ msgstr "_Handiagotu"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2363
 msgid "Zoom _Out"
 msgstr "_Txikiagotu"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:1972
+#: ../e-util/e-html-editor-actions.c:2108
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
@@ -1671,9 +1669,9 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Inportatzen..."
 
@@ -1929,13 +1927,12 @@ msgstr "_Utzi geroko"
 #: ../calendar/gui/dialogs/event-page.ui.h:24
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:20
 #: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-categories-editor.c:278 ../e-util/e-html-editor-actions.c:1003
+#: ../e-util/e-html-editor-actions.c:1138
 #: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:58
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
 #: ../plugins/email-custom-header/email-custom-header.c:844
-#: ../plugins/mail-to-task/mail-to-task.c:594
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
@@ -1953,9 +1950,9 @@ msgstr "_Itxi"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/alarm-notify/alarm-queue.c:1844
 #: ../calendar/alarm-notify/alarm-queue.c:1854
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1493
-#: ../modules/itip-formatter/itip-view.c:1604
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1627
 msgid "Location:"
 msgstr "Kokalekua:"
 
@@ -2512,92 +2509,92 @@ msgstr "Huts egin du '{0}' zereginen zerrenda irekitzean"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:93
-msgid "Failed to create an event in a calendar '{0}'"
-msgstr "Huts egin du gertaera bat '{0}' egutegian sortzean"
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "Huts egin du gertaera '{0}' egutegian sortzean"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:95
-msgid "Failed to create a memo in a memo list '{0}'"
+msgid "Failed to create a memo in the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendan sortzean"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:97
-msgid "Failed to create a task in a task list '{0}'"
+msgid "Failed to create a task in the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendan sortzean"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:99
-msgid "Failed to modify an event in a calendar '{0}'"
+msgid "Failed to modify an event in the calendar '{0}'"
 msgstr "Huts egin du gertaera '{0}' egutegian aldatzean"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:101
-msgid "Failed to modify a memo in a memo list '{0}'"
+msgid "Failed to modify a memo in the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendan aldatzean"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:103
-msgid "Failed to modify a task in a task list '{0}'"
+msgid "Failed to modify a task in the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendan aldatzean"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:105
-msgid "Failed to delete an event in a calendar '{0}'"
+msgid "Failed to delete an event in the calendar '{0}'"
 msgstr "Huts egin du gertaera '{0}' egutegitik ezabatzean"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:107
-msgid "Failed to delete a memo in a memo list '{0}'"
+msgid "Failed to delete a memo in the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendatik ezabatzean"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:109
-msgid "Failed to delete a task in a task list '{0}'"
+msgid "Failed to delete a task in the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendatik ezabatzean"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:111
-msgid "Failed to update an event in a calendar '{0}'"
+msgid "Failed to update an event in the calendar '{0}'"
 msgstr "Huts egin du gertaera '{0}' egutegian eguneratzean"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:113
-msgid "Failed to update a memo in a memo list '{0}'"
+msgid "Failed to update a memo in the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendan eguneratzean"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:115
-msgid "Failed to update a task in a task list '{0}'"
+msgid "Failed to update a task in the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendan eguneratzean"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:117
-msgid "Failed to send an event to a calendar '{0}'"
+msgid "Failed to send an event to the calendar '{0}'"
 msgstr "Huts egin du gertaera '{0}' egutegira bidaltzean"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:119
-msgid "Failed to send a memo to a memo list '{0}'"
+msgid "Failed to send a memo to the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendara bidaltzean"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:121
-msgid "Failed to send a task to a task list '{0}'"
+msgid "Failed to send a task to the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendara bidaltzean"
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:123
-msgid "Error creating view for a calendar '{0}'"
+msgid "Error creating view for the calendar '{0}'"
 msgstr "Errorea '{0}' egutegiaren ikuspegia sortzean"
 
 #. Translators: {0} is the name of the task list.
 #: ../calendar/calendar.error.xml.h:125
-msgid "Error creating view for a task list '{0}'"
+msgid "Error creating view for the task list '{0}'"
 msgstr "Errorea '{0}' zereginen zerrendaren ikuspegia sortzean"
 
 #. Translators: {0} is the name of the memo list.
 #: ../calendar/calendar.error.xml.h:127
-msgid "Error creating view for a memo list '{0}'"
+msgid "Error creating view for the memo list '{0}'"
 msgstr "Errorea '{0}' zirkularren zerrendaren ikuspegia sortzean"
 
 #. Translators: {0} is the name of the calendar.
@@ -2746,7 +2743,7 @@ msgstr "Pribatua"
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
 #: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
 #: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
+#: ../e-util/e-html-editor-page-dialog.c:116 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Konfidentziala"
 
@@ -2763,7 +2760,7 @@ msgstr "Partaidea"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
@@ -2776,21 +2773,21 @@ msgstr "Kategoria"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
-#: ../mail/vfoldertypes.xml.in.h:49
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "Attachments"
 msgstr "Eranskinak"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 msgid "Exist"
 msgstr "Bai"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
-#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr "Ez"
 
@@ -3042,10 +3039,10 @@ msgstr "Ezin da zerbitzariarekin sinkronizatu"
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:374 ../e-util/e-html-editor-dialog.c:196
+#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
 #: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
 #: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
@@ -3059,8 +3056,8 @@ msgstr "Itxi uneko leihoa"
 
 #. copy menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
-#: ../e-util/e-html-editor-actions.c:959 ../e-util/e-text.c:2089
-#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../e-util/e-html-editor-actions.c:1094 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:134
 #: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Kopiatu"
@@ -3068,22 +3065,22 @@ msgstr "_Kopiatu"
 #: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
 #: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
 #: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1325 ../mail/e-mail-browser.c:135
+#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:136
 #: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Kopiatu hautapena"
 
 #. cut menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:966 ../e-util/e-text.c:2075
-#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
+#: ../e-util/e-html-editor-actions.c:1101 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "_Ebaki"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
 #: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
-#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1319
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1322
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Ebaki hautapena"
 
@@ -3099,27 +3096,27 @@ msgstr "Ikusi laguntza"
 
 #. paste menu item
 #: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:973 ../e-util/e-text.c:2101
-#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
+#: ../e-util/e-html-editor-actions.c:1108 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Itsatsi"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
 #: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
-#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1331
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1334
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Arbelaren edukia itsasten du"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1263
-#: ../composer/e-composer-actions.c:428 ../mail/e-mail-reader.c:2262
-#: ../modules/addressbook/e-book-shell-view-actions.c:1263
-#: ../modules/addressbook/e-book-shell-view-actions.c:1277
+#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2265
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2272
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
 #: ../modules/calendar/e-cal-shell-view-actions.c:1642
 #: ../modules/calendar/e-memo-shell-view-actions.c:764
 #: ../modules/calendar/e-task-shell-view-actions.c:964
@@ -3140,14 +3137,14 @@ msgid "Save current changes and close editor"
 msgstr "Gorde uneko aldaketak eta itxi editorea"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:987 ../e-util/e-web-view.c:349
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
+#: ../e-util/e-html-editor-actions.c:1122 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "Hautatu _denak"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
 #: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Hautatu testu osoa"
 
@@ -3156,36 +3153,36 @@ msgid "_Classification"
 msgstr "_Sailkapena"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1328
-#: ../e-util/e-html-editor-actions.c:1010
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../e-util/e-html-editor-actions.c:1145
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
 #: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Fitxategia"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1342
-#: ../e-util/e-html-editor-actions.c:1031
+#: ../e-util/e-html-editor-actions.c:1166
 msgid "_Insert"
 msgstr "_Txertatu"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "Au_kerak"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1052 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1120
+#: ../e-util/e-html-editor-actions.c:1187 ../mail/e-mail-browser.c:178
+#: ../shell/e-shell-window-actions.c:1121
 #: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Ikusi"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1366
-#: ../composer/e-composer-actions.c:367
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "_Eranskina..."
 
 #: ../calendar/gui/dialogs/comp-editor.c:1368
-#: ../composer/e-composer-actions.c:369 ../e-util/e-attachment-view.c:412
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:448
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
@@ -3262,7 +3259,7 @@ msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Partaide-mota eremua erakusten edo ezkutatzen du"
 
 #: ../calendar/gui/dialogs/comp-editor.c:2232
-#: ../composer/e-composer-actions.c:636
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Erantsi"
 
@@ -3527,8 +3524,8 @@ msgstr "_Kokalekua:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
-#: ../e-util/e-html-editor-image-dialog.c:514
-#: ../e-util/e-html-editor-link-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:558
+#: ../e-util/e-html-editor-link-dialog.c:374
 msgid "_Description:"
 msgstr "_Azalpena:"
 
@@ -3639,8 +3636,8 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Zirkularra ezin da bere osotasunean editatu, ez baitzara antolatzailea"
 
 #: ../calendar/gui/dialogs/memo-page.c:1166
-#: ../em-format/e-mail-formatter-utils.c:201
-#: ../em-format/e-mail-formatter-utils.c:218
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
 #: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
 #: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
 #: ../modules/mail/em-mailer-prefs.c:64
@@ -4301,8 +4298,8 @@ msgid "Due Date:"
 msgstr "Mugaeguna:"
 
 #: ../calendar/gui/e-cal-component-preview.c:309
-#: ../modules/itip-formatter/itip-view.c:1496
-#: ../modules/itip-formatter/itip-view.c:1613
+#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1636
 msgid "Status:"
 msgstr "Egoera:"
 
@@ -4524,8 +4521,8 @@ msgstr "Amaiera-eguna"
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3500
-#: ../modules/itip-formatter/itip-view.c:6087
+#: ../modules/itip-formatter/itip-view.c:3607
+#: ../modules/itip-formatter/itip-view.c:6197
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Ezezaguna"
@@ -4576,14 +4573,14 @@ msgstr "Ez"
 #: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6075
+#: ../modules/itip-formatter/itip-view.c:6185
 msgid "Accepted"
 msgstr "Onartua"
 
 #: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6081
+#: ../modules/itip-formatter/itip-view.c:6191
 msgid "Declined"
 msgstr "Ukatua"
 
@@ -4597,7 +4594,7 @@ msgstr "Behin-behinekoa"
 #: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6084
+#: ../modules/itip-formatter/itip-view.c:6194
 msgid "Delegated"
 msgstr "Delegatua"
 
@@ -4771,28 +4768,28 @@ msgstr[1] "%d gertaera kopiatzen"
 
 #: ../calendar/gui/e-cal-ops.c:2041
 #, c-format
-msgid "Moving an memo"
+msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Zirkular bat lekuz aldatzen"
 msgstr[1] "%d zirkular lekuz aldatzen"
 
 #: ../calendar/gui/e-cal-ops.c:2042
 #, c-format
-msgid "Copying an memo"
+msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Zirkular bat kopiatzen"
 msgstr[1] "%d zirkular kopiatzen"
 
 #: ../calendar/gui/e-cal-ops.c:2048
 #, c-format
-msgid "Moving an task"
+msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Zeregin bat lekuz aldatzen"
 msgstr[1] "%d zeregin lekuz aldatzen"
 
 #: ../calendar/gui/e-cal-ops.c:2049
 #, c-format
-msgid "Copying an task"
+msgid "Copying a task"
 msgid_plural "Copying %d tasks"
 msgstr[0] "Zeregin bat kopiatzen"
 msgstr[1] "%d zeregin kopiatzen"
@@ -5077,7 +5074,7 @@ msgid "Language"
 msgstr "Hizkuntza"
 
 #: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1573
+#: ../modules/calendar/e-cal-shell-content.c:1602
 #: ../modules/calendar/e-memo-shell-view-actions.c:180
 #: ../modules/calendar/e-memo-shell-view-actions.c:195
 #: ../modules/calendar/e-memo-shell-view.c:308
@@ -5134,9 +5131,9 @@ msgstr "%% %d"
 
 #: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1072
+#: ../calendar/importers/icalendar-importer.c:1062
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1531
+#: ../modules/calendar/e-cal-shell-content.c:1560
 #: ../modules/calendar/e-task-shell-view-actions.c:203
 #: ../modules/calendar/e-task-shell-view-actions.c:218
 #: ../modules/calendar/e-task-shell-view.c:466
@@ -5560,181 +5557,181 @@ msgstr "hau baino txikiagoa da"
 msgid "Appointments and Meetings"
 msgstr "Hitzorduak eta bilerak"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "Egutegia irekitzea"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar fitxategiak (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-en iCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr "Oroitu!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar fitxategiak (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-en vCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:1065
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "Egutegi-gertaerak"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1098
 msgid "Gnome Calendar"
 msgstr "Gnome egutegia"
 
-#: ../calendar/importers/icalendar-importer.c:1109
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-en egutegiaren inportatzaile adimenduna"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Bilera"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../calendar/importers/icalendar-importer.c:1183
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zeregina"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1496
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Zirkularra"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "errepikapenak ditu"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "instantzia bat da"
 
-#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "oroigarriak ditu"
 
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "eranskinak ditu"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1213
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Publikoa"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1226
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Pribatua"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1219
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidentziala"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Sailkapena"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1238
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Laburpena"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Kokalekua"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1252
-#: ../calendar/importers/icalendar-importer.c:1533
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Hasiera"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1263
+#: ../calendar/importers/icalendar-importer.c:1253
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Muga"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Amaiera"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1285
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategoriak"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1309
+#: ../calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Eginda"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URLa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1328
-#: ../calendar/importers/icalendar-importer.c:1331
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Antolatzailea"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1351
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Partaideak"
 
-#: ../calendar/importers/icalendar-importer.c:1368
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Azalpena"
 
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Mota"
@@ -7286,155 +7283,180 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Ez erakutsi mezu hau berriro."
-
-#: ../composer/e-composer-actions.c:265
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
-#: ../composer/e-composer-actions.c:381
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "_Mezu berria"
 
-#: ../composer/e-composer-actions.c:383
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Ireki mezu berriaren leihoa"
 
-#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Konfiguratu Evolution"
 
-#: ../composer/e-composer-actions.c:397
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Gorde hone_la..."
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Gorde uneko fitxategia beste izen batekin"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Inprimatzeko _aurrebista"
 
-#: ../composer/e-composer-actions.c:442
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Gorde _zirriborro gisa"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Gorde zirriborro gisa"
 
-#: ../composer/e-composer-actions.c:449
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "_Bidali"
 
-#: ../composer/e-composer-actions.c:451
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Bidali mezu hau"
 
-#: ../composer/e-composer-actions.c:459
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "PGP _enkriptatzea"
 
-#: ../composer/e-composer-actions.c:461
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Enkriptatu mezu hau PGPrekin"
 
-#: ../composer/e-composer-actions.c:467
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "PGP _sinadura"
 
-#: ../composer/e-composer-actions.c:469
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Sinatu mezu hau zure PGP gakoarekin"
 
-#: ../composer/e-composer-actions.c:475
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "_Irudien galeria"
 
-#: ../composer/e-composer-actions.c:477
+#: ../composer/e-composer-actions.c:437
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Erakutsi irudien galeria bat zure mezura arrastatzeko"
 
-#: ../composer/e-composer-actions.c:483
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "_Eman lehentasuna mezuari"
 
-#: ../composer/e-composer-actions.c:485
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Ezarri mezuaren lehentasuna altuenera"
 
-#: ../composer/e-composer-actions.c:491
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "E_skatu irakurragiriak"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr "Lortu bidaltze-jakinarazpena mezu bat irakurtzean"
 
-#: ../composer/e-composer-actions.c:499
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "S/MIME e_nkriptatzea"
 
-#: ../composer/e-composer-actions.c:501
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
-#: ../composer/e-composer-actions.c:507
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "S/MIME s_inadura"
 
-#: ../composer/e-composer-actions.c:509
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sinatu mezu hau zure S/MIME sinadura-ziurtagiriarekin"
 
-#: ../composer/e-composer-actions.c:563
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+msgid "Unicode smileys"
+msgstr "Unicode aurpegierak"
+
+#: ../composer/e-composer-actions.c:525
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr "Erabili Unicode karaktereak aurpegieretan."
+
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "_Bcc eremua"
 
-#: ../composer/e-composer-actions.c:565
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:571
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "_Cc eremua"
 
-#: ../composer/e-composer-actions.c:573
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:579
+#: ../composer/e-composer-actions.c:547
+msgid "_From Override Field"
+msgstr "_Nork gainjartzearen eremua"
+
+#: ../composer/e-composer-actions.c:549
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr ""
+"'Nork' eremua gainjartzean izena edo helbidea aldatzeko bistaratuko den edo "
+"ez"
+
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
-#: ../composer/e-composer-actions.c:581
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:642
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Gorde zirriborroa"
 
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
+msgid "_Name:"
+msgstr "_Izena:"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Idatzi mezuaren hartzaileak"
@@ -7451,36 +7473,36 @@ msgstr ""
 "Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
 "helbideak."
 
-#: ../composer/e-composer-header-table.c:770
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "Nor_k:"
 
-#: ../composer/e-composer-header-table.c:777
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr "_Erantzun honi:"
 
-#: ../composer/e-composer-header-table.c:782
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "Nor_i:"
 
-#: ../composer/e-composer-header-table.c:788
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:794
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:799
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr "_Bidali hona:"
 
-#: ../composer/e-composer-header-table.c:803
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "_Gaia:"
 
-#: ../composer/e-composer-header-table.c:811
-#: ../mail/e-mail-config-identity-page.c:505
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:504
 msgid "Si_gnature:"
 msgstr "Si_nadura:"
 
@@ -7492,7 +7514,7 @@ msgstr "Egin klik hemen helbide-liburura joateko"
 msgid "Click here to select folders to post to"
 msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
 
-#: ../composer/e-msg-composer.c:858
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7500,7 +7522,7 @@ msgstr ""
 "Ezin da sinatu irteerako mezua: ez dago sinadura-ziurtagiririk kontu "
 "honentzat"
 
-#: ../composer/e-msg-composer.c:867
+#: ../composer/e-msg-composer.c:880
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7509,11 +7531,11 @@ msgstr ""
 "Ezin da enkriptatu irteerako mezua: sinadura-ziurtagiririk ez dago ezarrita "
 "kontu honentzat"
 
-#: ../composer/e-msg-composer.c:1581 ../composer/e-msg-composer.c:2147
+#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2282
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
-#: ../composer/e-msg-composer.c:4390
+#: ../composer/e-msg-composer.c:4601
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak."
 
@@ -7691,6 +7713,27 @@ msgstr ""
 "Mezua bidaltzeko laster-tekla sakatu da. Bertan behera utzi mezua bidaltzea "
 "(ustekabe bat izan bada), edo bidali mezua."
 
+#: ../composer/mail-composer.error.xml.h:39
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Ziur zaude mezu-prestatzailearen modua aldatzea nahi duzula?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+"HTML modua desaktibatzeak testuaren formatu osoa galtzea dakar. Jarraitu "
+"nahi duzu?"
+
+#: ../composer/mail-composer.error.xml.h:41
+msgid "_Don't lose formatting"
+msgstr "_Ez galdu formatua"
+
+#: ../composer/mail-composer.error.xml.h:42
+#, fuzzy
+msgid "Lose _formatting"
+msgstr "_Galdu formatua"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolution-eko alarmaren jakinarazpena"
@@ -7699,7 +7742,7 @@ msgstr "Evolution-eko alarmaren jakinarazpena"
 msgid "Calendar event notifications"
 msgstr "Egutegiko gertaeren jakinarazpenak"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1054
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7885,6 +7928,20 @@ msgstr ""
 "Bihurtu mezuaren testua Unicode UTF-8 kodeketara karaktere-multzo ezberdinak "
 "dituzten token mezu normalen/baztergarrien tokenak bateratzeko."
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr "Komandoaren bide-izen osoa Bogofilter exekutatzeko"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+"Bogofilter komandoaren bide-izen osoa. Ez bada ezartzen, konpilazio-"
+"denborako bide-izena erabiliko da, /usr/bin/bogofilter ohi izaten da. "
+"Komandoak ez luke beste argumenturik eduki beharko."
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "Gorde oroigarrien audioen direktorioa"
@@ -8658,14 +8715,17 @@ msgid "Automatic emoticon recognition"
 msgstr "Aurpegieren ezagutza automatikoa"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "Ezagutu aurpegierak testuan, eta ordeztu irudiekin."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr ""
+"Ezagutu aurpegierak testuan, eta ordeztu irudiekin edo Unicode karaktereekin."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr "Esleitu mezua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -8673,11 +8733,11 @@ msgstr ""
 "Mezu bati erantzutean txertatuko den testua, mezua jatorrizko egileari "
 "esleituz"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr "Birbidali mezua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -8685,11 +8745,11 @@ msgstr ""
 "Mezu bat birbidaltzean txertatuko den testua, birbidalitako mezuak "
 "jarraitzen duela adieraziz"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr "Jatorrizko mezua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -8697,11 +8757,11 @@ msgstr ""
 "Mezu bati erantzutean txertatuko den testua (goian erantzutea), jatorrizko "
 "mezuak jarraitzen duela adieraziz"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Group Reply replies to list"
 msgstr "Taldeari erantzutean zerrendari erantzuten du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8712,11 +8772,11 @@ msgstr ""
 "taldeari' botoiak soilik posta-zerrendari (erantzuten ari zaren mezuaren "
 "kopia jaso duzun zerrendari) erantzuten saiatzea eragiten du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Put the cursor at the bottom of replies"
 msgstr "Jarri kurtsorea erantzunen behean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8726,36 +8786,36 @@ msgstr ""
 "badakite. Honek kurtsorea mezuaren gainean edo azpian kokatuko den zehazten "
 "du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Always request read receipt"
 msgstr "E_skatu beti irakurragiriak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Irakurragiriaren eskaera mezu bakoitzari gehitu lehenetsi gisa edo ez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Send HTML mail by default"
 msgstr "Bidali HTML mezuak lehenespenez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Send HTML mail by default."
 msgstr "Bidali HTML mezuak lehenespenez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Ortografia-egiaztapenaren hizkuntzak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid "List of dictionary language codes used for spell checking."
 msgstr ""
 "Hiztegien hizkuntzen kodeen zerrenda zuzentzaile ortografikoan erabiltzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Bcc\" field when sending a mail message"
 msgstr "Erakutsi \"Bcc\" eremua mezu bat bidaltzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8763,11 +8823,11 @@ msgstr ""
 "Erakutsi \"Bcc\" eremua mezua bidaltzean. Hau 'Ikusi' menutik kontrolatzen "
 "da posta-kontu bat aukeratzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Cc\" field when sending a mail message"
 msgstr "Erakutsi \"Cc\" eremua mezu bat bidaltzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8775,11 +8835,23 @@ msgstr ""
 "Erakutsi \"Cc\" eremua mezua bidaltzean. Hau 'Ikusi' menutik kontrolatzen da "
 "posta-kontu bat aukeratzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "Show \"From\" override field when sending a mail message"
+msgstr "Erakutsi \"Nork\" gainjartzeko eremua mezu bat bidaltzean"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"Erakutsi \"Nork\" gainjartzeko eremua mezua bidaltzean. Hau 'Ikusi' menutik "
+"kontrolatzen da posta-kontu bat aukeratzean."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Erakutsi \"Erantzun honi\" eremua mezua bidaltzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8787,11 +8859,11 @@ msgstr ""
 "Erakutsi \"Erantzun honi\" eremua mezua bidaltzean. Hau 'Ikusi' menutik "
 "kontrolatzen da posta-kontu bat aukeratzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Erakutsi \"Nork\" eremua mezu bat bidaltzean berri-talde bati"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8799,11 +8871,11 @@ msgstr ""
 "Erakutsi \"Nork\" eremua mezua bidaltzean berri-talde bati. Hau 'Ikusi' "
 "menutik kontrolatzen da posta-kontu bat aukeratzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Erakutsi \"Erantzun honi\" eremua mezua bidaltzean berri-talde bati"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8811,11 +8883,11 @@ msgstr ""
 "Erakutsi \"Erantzun honi\" eremua mezua bidaltzean berri-talde bati. Hau "
 "'Ikusi' menutik kontrolatzen da posta-kontu bat aukeratzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Sinatu digitalki erantzuna jatorrizko mezua sinatuta dagoenean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8823,11 +8895,11 @@ msgstr ""
 "Gaitu automatikoki PGP edo S/MIME sinadurak PGP edo S/MIME-rekin sinatutako "
 "mezu bati erantzutean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Kodetu fitxategi-izenak Outlook/Gmail moduan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8839,11 +8911,11 @@ msgstr ""
 "bidalitako fitxategi-izenak, zeren eta haiek ez baitute RFC 2231 jarraitzen, "
 "okerreko RFC 2047 estandarra baizik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid "Send messages through Outbox folder"
 msgstr "Bidali mezuak 'Irteerako ontzia' karpetaren bidez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
@@ -8851,11 +8923,11 @@ msgstr ""
 "Mzuak beti gorde 'Irteerako ontzia' karpetan bidaltzean, erabiltzaileari "
 "mezuak noiz bidaliko diren aukera eskaintzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Put personalized signatures at the top of replies"
 msgstr "Jarri sinadura pertsonalizatuak erantzunen goian"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8865,11 +8937,11 @@ msgstr ""
 "badakite. Honek sinadura mezuaren gainean edo azpian kokatuko den zehazten "
 "du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Do not add signature delimiter"
 msgstr "Ez gehitu sinaduraren mugatzailea"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8877,11 +8949,11 @@ msgstr ""
 "Ezarri TRUE (egia) gisa sinaduraren mugatzailea gehitzerik ez baduzu nahi "
 "zure sinaduraren aurretik mezu bat prestatzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Ignore list Reply-To:"
 msgstr "Ezikusi egin zerrendaren 'Erantzun honi':"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8901,11 +8973,11 @@ msgstr ""
 "'Erantzun honi:' eta 'Posta-zerrenda:' (egonez gero) goiburuak konparatuz "
 "lantzen da."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
 msgstr "Lokalizatutako 'Re'-en zerrenda"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
@@ -8915,39 +8987,39 @@ msgstr ""
 "erantzutean gaiaren testua saltatzeko, \"Re\" aurrizki estandarraren "
 "gehigarri gisa. Adibidez: 'SV,AV'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Enable developer mode"
 msgstr "Gaitu garatzaileen modua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enables some hidden actions and tools aimed for development and debugging."
 msgstr ""
 "Ezkutuko ekintza eta tresna batzuk gaitzen ditu garapenerako eta "
 "arazketarako."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Number of characters for wrapping"
 msgstr "Karaktere kopurua itzulbiratzeko"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Will autowrap lines after given number of characters."
 msgstr ""
 "Emandako karaktere kopuruaren ondoren lerroak automatikoki itzulbiratzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Save file format for drag-and-drop operation"
 msgstr "Gorde fitxategiaren formatua arrastatu eta jaregin eragiketetan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "'mbox' edo 'pdf' izan daiteke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Show image animations"
 msgstr "Erakutsi irudi animatuak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8955,11 +9027,11 @@ msgstr ""
 "Gaitu irudi animatuak HTML mezuetan. Erabiltzaile askok nazka diote irudi "
 "animatuei, eta nahiago dute irudi estatikoak."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Gaitu edo desgaitu 'bilatu idaztean' funtzioa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8967,11 +9039,11 @@ msgstr ""
 "Gaitu alboko barrako bilaketa eginbidea karpeten izenen bilaketa "
 "elkarreragilea baimentzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable magic space bar"
 msgstr "Gaitu edo desgaitu 'zuriune magikoa'"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8979,75 +9051,75 @@ msgstr ""
 "Hau gaituz Zuriunea tekla erabiliko da mezuaren aurrebistan, mezuen "
 "zerrendan eta karpetetan korritzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Gaitu mezuen zerrendaren ikuspegiaren antzeko ezarpenak erabiltzeko karpeta "
 "guztientzako"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Gaitu mezuen zerrendaren ikuspegiaren antzeko ezarpenak erabiltzeko karpeta "
 "guztientzako."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Citation highlight color"
 msgstr "Aipuak nabarmentzeko kolorea"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Citation highlight color."
 msgstr "Aipuak nabarmentzeko kolorea."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable/disable caret mode"
 msgstr "Gaitu/desgaitu kurtsore modua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Gaitu kurtsore modua, mezuak irakurtzean kurtsorea ikusteko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Default charset in which to display messages"
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Default charset in which to display messages."
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Kargatu automatikoki HTML mezuen irudiak HTTP bidez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show Animations"
 msgstr "Erakutsi animazioak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Show animated images as animations."
 msgstr "Erakutsi irudi-animazioak animazio gisa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show all message headers"
 msgstr "Erakutsi mezu guztien goiburukoak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show all the headers when viewing a messages."
 msgstr "Erakutsi goiburuko guztiak mezua ikustean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "List of headers to show when viewing a message."
 msgstr "Erakutsi goiburukoen zerrenda mezua ikustean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -9058,43 +9130,55 @@ msgstr ""
 "dira erakutsiko mezu bat ikustean, baina Hobespenetan zerrendatuta "
 "jarraituko dute."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show photo of the sender"
 msgstr "Erakutsi bidaltzailearen argazkia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Erakutsi bidaltzailearen argazkia mezuak irakurtzeko panelean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Bilatu gravatar.com webgunean bidaltzailearen argazkia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr "Bilatu bidaltzailearen argazkia gravatar.com webgunean baita ere."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout"
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Mark as Seen after specified timeout."
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+msgid "Mark as Seen always after specified timeout"
+msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+"TRUE (egia) gisa ezartzean, hautatutako mezua irakurri gabe gisa ezarriko da "
+"denbora-muga baten ostean, nahiz eta karpetaz aldatu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Timeout for marking messages as seen"
 msgstr "Mezua 'Ikusita'ko gisa markatzeko denbora-muga"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Mezua 'Ikusita'ko gisa markatzeko denbora-muga (milisegundotan)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Sender email-address column in the message list"
 msgstr "Bidaltzailearen helb.elek. zutabea mezuen zerrendan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -9102,7 +9186,7 @@ msgstr ""
 "Erakutsi bidaltzailearen helbide elektronikoa bereiztutako zutabean mezuen "
 "zerrendan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -9111,7 +9195,7 @@ msgstr ""
 "\" (Gaia) lerroetako letra-tipo berdinak erabili behar diren ala ez zehazten "
 "du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -9120,19 +9204,19 @@ msgstr ""
 "\" (Gaia) lerroetako letra-tipo berdinak erabili behar diren ala ez zehazten "
 "du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi ezabatutako mezuak mezuen zerrendan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Erakutsi ezabatutako mezuak (marratuta) mezuen zerrendan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Enable Unmatched search folder"
 msgstr "Gaitu 'Sailkatu gabeak' bilaketako karpetak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -9140,11 +9224,11 @@ msgstr ""
 "Gaitu 'Sailkatu gabeak' bilaketa karpeta 'Bilaketa-karpetak'. Ez du ezer "
 "egiten 'Bilaketa-karpeta' desgaituta badago."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Karpetaren aurrebista ezkutatu eta hautapena ezabatzen du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -9153,31 +9237,31 @@ msgstr ""
 "berrezartzen da irakurri ostean. Mezua desautatzen du zerrendatik eta "
 "karpetako aurrebista ezabatzen du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Height of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren altuera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Height of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren altuera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Mezuen goiburuak erabiltzailearen interfazean tolestuko diren edo ez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Width of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren zabalera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Width of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren zabalera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Layout style"
 msgstr "Diseinuaren estiloa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -9189,35 +9273,35 @@ msgstr ""
 "zerrendaren azpian kokatzen du; \"1\" (ikuspegi bertikala) aurrebistaren "
 "panela mezuen zerrendaren alboan jartzen du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Variable width font"
 msgstr "Zabalera aldakorreko letra-tipoa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The variable width font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den zabalera aldakorreko letra-tipoa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Terminal font"
 msgstr "Terminaleko letra-tipoa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The terminal font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den terminaleko letra-tipoa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Use custom fonts"
 msgstr "Erabili letra-tipo pertsonalizatuak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Use custom fonts for displaying mail."
 msgstr "Erabili letra-tipo pertsonalizatuak mezuak bistaratzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Konprimituta bistaratu Nori/CC/BCC eremuko helbideak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9225,11 +9309,11 @@ msgstr ""
 "Konprimituta bistaratu Nori/CC/BCC eremuko helbideak 'helbide-kopurua'n "
 "zehaztutako kopuruaren arabera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Helbide-kopurua Nori/CC/BCC eremuetan erakusteko"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9237,11 +9321,11 @@ msgstr ""
 "Honek helbide-kopurua ezartzen du mezuaren zerrendako ikuspegi lehenetsian "
 "erakusteko, eta harutzago '...' erakutsiko da."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Thread the message-list based on Subject"
 msgstr "Sartu harian mezuen zerrenda, Gaiaren arabera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9249,11 +9333,11 @@ msgstr ""
 "Gaikako harian sartzera itzuli nahi duzun edo ez, mezuek ez daukatenean "
 "'Erantzun honi' edo 'Erreferentzia' goibururik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default value for thread expand state"
 msgstr "Balio lehenetsia hariaren egoera zabaltzeko"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9261,11 +9345,11 @@ msgstr ""
 "Ezarpen honek hariak zabaltzeko edo tolesteko egoeran lehenetsi gisa egon "
 "behar duten zehazten du. Evolution berrabiaraztea eskatzen du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Hari bateko azken mezuen arabera hariek ordenatu behar diren ala ez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -9275,11 +9359,11 @@ msgstr ""
 "oinarrituko den zehazten du, mezuaren dataren araberaren ordez. Evolution "
 "berrabiaraztea eskatzen du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenatu kontuak alfabetikoki karpeta-zuhaitzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -9291,27 +9375,27 @@ msgstr ""
 "'Ordenagailu honetan' eta 'Bilaketa' karpetetan izan ezik. Bestela, kontuak "
 "erabiltzaileak emandako ordena batean antolatuko dira"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Log filter actions"
 msgstr "Iragazki-ekintzen egunkaria"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Log filter actions to the specified log file."
 msgstr "Erregistratu iragazki-ekintzak zehaztutako egunkari-fitxategian."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Logfile to log filter actions"
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Logfile to log filter actions."
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Flush Outbox after filtering"
 msgstr "Garbitu 'Irteerako ontzia' iragazi ondoren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -9321,77 +9405,77 @@ msgstr ""
 "ontzia soilik garbituko da 'Birbidali' iragazkiaren ekintza erabilitakoan, "
 "eta gutxi gorabehera azken ekintzari deitu eta minutu 1era."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Default forward style"
 msgstr "Birbidaltzeko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Default reply style"
 msgstr "Erantzuteko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Galdetu bidaltzeko laster-tekla erabiltzean (Ktrl+Sartu)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr ""
 "Galdetu erabiltzaileari laster-tekla sakatuz mezu bat bidaltzen saiatzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt on empty subject"
 msgstr "Abisatu gaia hutsik badago"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr ""
 "Abisatu erabiltzaileari, mezu bat gairik gabe bidaltzen saiatzen denean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when emptying the trash"
 msgstr "Galdetu zakarrontzia hustean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Abisatu erabiltzaileari zakarrontzia betirako ezabatu aurretik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt when user expunges"
 msgstr "Abisatu erabiltzaileak betiko borratzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Abisatu erabiltzaileari, karpeta bat betiko ezabatu aurretik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Galdetu bidali aurretik hartzaileen helbide elektronikoa ez denean sartzen"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
 msgstr ""
 "Honek errepikatutako galdera gaitzen/desgaitzen du mezuaren jasotzaileen "
-"helbide eletronikorik ez dela sartu buruz abisu emateko"
+"helbide elektronikorik ez dela sartu buruz abisu emateko"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user only fills Bcc"
 msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Abisatu Nori edo Cc hartzailerik gabeko mezu bat bidali aurretik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Abisatu HTMLrik nahi ez duenari HTML mezua bidali aurretik"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9399,12 +9483,12 @@ msgstr ""
 "Abisatu HTML mezuak bidali aurretik beharbada HTML mezurik jaso nahi ez "
 "duten erabiltzaileei."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Abisatu erabiltzaileak 10 mezu edo gehiago aldi berean irekitzen saiatzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9412,19 +9496,19 @@ msgstr ""
 "Erabiltzaileak 10 mezu edo gehiago irekitzen saiatzen bada aldi berean, "
 "galdetu erabiltzaileari benetan hori egitea nahi duen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt while marking multiple messages"
 msgstr "Gonbitea hainbat mezu markatzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Gonbitea gaitzen/desgaitzen du hainbat mezu markatzen den bitartean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when deleting messages in search folder"
 msgstr "Abisatu mezuak bilaketako karpetatik ezabatzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -9434,13 +9518,13 @@ msgstr ""
 "ezabatzean behin betirako ezabatzen direla (ez direla bilaketako emaitzetik "
 "soilik kentzen) buruzko abisua emateko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Galdetu karpeta bat kopiatuko den edo ez karpeta-zuhaitzean arrastatu eta "
 "jaregitean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -9451,13 +9535,13 @@ msgstr ""
 "jaregitean karpeta-zuhaitzean); 'always' (kopiatu beti galdetu gabe); 'ask' "
 "edo bestelako edozer balio (erabiltzaileari galdetu)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Galdetu karpeta bat lekuz aldatuko den edo ez karpeta-zuhaitzean arrastatu "
 "eta jaregitean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -9468,11 +9552,11 @@ msgstr ""
 "jaregitean karpeta-zuhaitzean); 'always' (aldatu lekuz galdetu gabe); 'ask' "
 "edo bestelako edozer balio (erabiltzaileari galdetu)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when replying privately to list messages"
 msgstr "Galdetu zerrenden mezuei pribatuki erantzutean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -9480,11 +9564,11 @@ msgstr ""
 "Honek errepikatutako galdera gaitzen/desgaitzen du hainbat pertsonei mezu "
 "pribatua erantzuten ari zarenean abisu emateko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Galdetu posta-zerrendak erantzun pribatuak bahitzen dituenean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -9495,11 +9579,11 @@ msgstr ""
 "'Erantzun honi' goiburuak zerrendari erantzutera bideratzen zaituena) "
 "bidaltzen saiatzen ari zarela abisatuz."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when replying to many recipients"
 msgstr "Galdetu hainbat hartzaileei erantzutean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -9507,7 +9591,24 @@ msgstr ""
 "Honek errepikatutako galdera gaitzen/desgaitzen du hainbat pertsonei mezua "
 "erantzuten ari zarenean abisu emateko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+msgid ""
+"Prompt when switching composer mode and the content needs to lose its "
+"formatting"
+msgstr ""
+"Galdetu mezu-prestatzailearen modua noiz aldatu, "
+"baita edukiak bere formatua noiz galdu behar duen ere"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#, fuzzy
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+"Honek errepikatutako galdera gaitzen/desgaitzen du mezuaren jasotzaileen "
+"helbide elektronikorik ez dela sartu buruz abisu emateko"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9515,43 +9616,43 @@ msgstr ""
 "Bistaratutako mezuari birbidaltzean edo erantzutean mezuen arakatzailearen "
 "leihoa automatikoki ixteko araua."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty Trash folders on exit"
 msgstr "Hustu zakarrontziko karpetak irtetzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Hustu zakarrontziko karpeta guztiak Evolution-etik irtetzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Irtetzean zakarrontzia husteko gutxieneko egun-kopurua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Irtetzean zakarrontzia husteko gutxieneko denbora (egunetan)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Last time Empty Trash was run"
 msgstr "Zakarrontzia hustu zen azken aldia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Zakarrontzia hustu zen azken aldia, 1970.eko Urtarrilaren 1etik (Epoch) "
 "iragandako egunetan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr ""
 "Denbora-kopurua (segundotan) errorea egoera-barran bistaratuta egoteko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Level beyond which the message should be logged."
 msgstr "Maila, hortik gora mezua erregistratzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9559,11 +9660,11 @@ msgstr ""
 "Honako balio erabilgarriak daude: \"0\" - erroreak. \"1\" - abisuak. \"2\" - "
 "mezuen arazketa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Show original \"Date\" header value."
 msgstr "Erakutsi jatorrizko \"Date\" goiburuaren balioa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -9573,11 +9674,11 @@ msgstr ""
 "desberdina bada). Bestela, erakutsi beti \"Date\" goiburuaren balioa "
 "erabiltzaileak hobetsitako formatuan eta lokaleko ordu-zonan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "List of Labels and their associated colors"
 msgstr "Etiketen zerrenda, eta bakoitzari asoziatutako koloreak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -9586,46 +9687,46 @@ msgstr ""
 "kolorea duten kateak ditu, eta koloreak HTML kodeketa hamaseitarra "
 "erabiltzen du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Check incoming mail being junk"
 msgstr "Begiratu sarrerako mezuak baztergarriak diren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Run junk test on incoming mail."
 msgstr "Exekutatu mezu baztergarrien proba sarrerako mezuetan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Empty Junk folders on exit"
 msgstr "Hustu baztergarrien karpetak irtetzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Hustu baztergarrien karpeta guztiak Evolution-etik irtetzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Irtetzean baztergarria husteko gutxieneko egun-kopurua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Irtetzean baztergarria husteko gutxieneko denbora (egunetan)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Last time Empty Junk was run"
 msgstr "Baztergarria hustu zen azken aldia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Baztergarria hustu zen azken aldia, 1970.eko Urtarrilaren 1etik (Epoch) "
 "iragandako egunetan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "The default plugin for Junk hook"
 msgstr "Baztergarrientzako plugin lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -9635,13 +9736,13 @@ msgstr ""
 "egon. Zerrendatutako plugin lehenetsia desgaitzen bada, ez ditu beste plugin "
 "erabilgarririk erabiliko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Determines whether to lookup in address book for sender email"
 msgstr ""
 "Bidaltzailearen helbide elek. helbide-liburuan bilatu behar den ala ez "
 "zehazten du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -9654,7 +9755,7 @@ msgstr ""
 "helbide-liburua (LDAP bezalakoa) osaketa automatikoa lantzeko markatuta "
 "badago."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9662,7 +9763,7 @@ msgstr ""
 "Lokaleko helbide-liburuko helbide elektronikoan bilatu behar den mezu "
 "baztergarriak iragazteko ala ez zehazten du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -9672,13 +9773,13 @@ msgstr ""
 "iragazkitik kontaktu ezagunak kanpo gelditzeko lokaleko helbide-liburuan "
 "bilaketa landuko den ala ez zehazteko erabiltzen da."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Mezu baztergarriak klasifikatzeko goiburu pertsonalizatuak erabiliko diren "
 "ala ez zehazten du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -9688,12 +9789,12 @@ msgstr ""
 "ala ez zehazten du. Aukera hau gaituta egonez gero, eta goiburuak aipatuta "
 "badaude, baztergarriak aztertzeko abiadura hobetuko da."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Custom headers to use while checking for junk."
 msgstr ""
 "Erabiliko diren goiburu pertsonalizatuak mezu baztergarriak aztertzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9701,31 +9802,31 @@ msgstr ""
 "Erabiliko diren goiburu pertsonalizatuak mezu baztergarriak aztertzeko. "
 "Zerrendako elementuak \"headername=balioa\" formatukoak dira."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "UID string of the default account."
 msgstr "Kontu lehenetsiaren UID katea."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Save directory"
 msgstr "Gorde direktorioa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Directory for saving mail component files."
 msgstr "Direktorioa mezuaren fitxategi-osagaiak gordetzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Composer load/attach directory"
 msgstr "Mezu-prestatzailearen kargatzeko/eransteko direktorioa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorioa mezu-prestatzaileari fitxategiak kargatzeko/eransteko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Check for new messages on start"
 msgstr "Begiratu mezu berririk dagoen abioan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9733,11 +9834,11 @@ msgstr ""
 "Evolution abiatzean mezu berriak iritsi diren begiratzea edo ez. Irteerako "
 "ontzitik mezuak bidaltzea ere eragiten du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Check for new messages in all active accounts"
 msgstr "Begiratu mezu berririk dagoen kontu aktibo guztietan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -9748,11 +9849,11 @@ msgstr ""
 "Evolution abiatzean edo ez begiratzea adierazten du. Aukera hau "
 "'send_recv_on_start' aukerarekin batera soilik erabil daiteke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Server synchronization interval"
 msgstr "Zerbitzariaren sinkronizazio tartea"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9760,11 +9861,11 @@ msgstr ""
 "Aldaketa lokala urruneko posta zerbitzariarekin sinkronizatzeko maiztasuna "
 "kontrolatzen du. Tartea gutxienez 30 segundokoa izan behar du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Allow expunge in virtual folders"
 msgstr "Baimendu karpeta birtualetatik betirako ezabatzea"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Enables Expunge in virtual folders, which means that the Folder->Expunge "
 "will be callable in virtual folders, while the expunge itself will be done "
@@ -9776,11 +9877,11 @@ msgstr ""
 "karpeta birtualeko karpeta guztietako ezabatutako mezu guztietan egingo den "
 "bitartean, ez bakarrik karpeta birtualeko ezabatutako mezuetan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "An Archive folder for On This Computer folders."
 msgstr "'Ordenagailu honetan' karpeten 'Artxiboa' karpeta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -9788,11 +9889,11 @@ msgstr ""
 "'Artxiboa' karpeta Mezuak|Artxiboa-n erabiltzeko... eginbidea 'Ordenagailu "
 "honetan' karpetan dagoenean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "(Deprecated) Default forward style"
 msgstr "(Zaharkituta) Birbidaltzeko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9800,11 +9901,11 @@ msgstr ""
 "Gako hau 3.10 bertsioan zaharkitu zen eta aurrerantzean ez da gehiago "
 "erabiliko. Erabili 'forward-style-name' horren ordez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "(Deprecated) Default reply style"
 msgstr "(Zaharkituta) Erantzuteko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9812,13 +9913,13 @@ msgstr ""
 "Gako hau 3.10 bertsioan zaharkitu zen eta aurrerantzean ez da gehiago "
 "erabiliko. Erabili 'reply-style-name' horren ordez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr ""
 "(Zaharkituta) Goiburu pertsonalizatuen zerrenda, gaituta dauden edo ez "
 "zehaztuta."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9826,11 +9927,11 @@ msgstr ""
 "Gako hau 3.10 bertsioan zaharkitu zen eta aurrerantzean ez da gehiago "
 "erabiliko. Erabili 'show-headers' horren ordez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Zaharkituta) Kargatu HTML mezuen irudiak HTTP bidez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9838,7 +9939,7 @@ msgstr ""
 "Gako hau 3.10 bertsioan zaharkitu zen eta aurrerantzean ez da gehiago "
 "erabiliko. Erabili 'image-loading-policy' horren ordez."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9846,7 +9947,7 @@ msgstr ""
 "(Zaharkituta) Galdetu ea erabiltzaileak mezua birbidaltzean edo erantzutean "
 "mezuaren leihoa itxiko den edo ez"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -10249,6 +10350,34 @@ msgstr "Spam-proba lokalak bakarrik erabili."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Spam-proba lokalak bakarrik erabili (DNSkorik ez)."
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr "Komandoaren bide-izen osoa spamassassin exekutatzeko"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+"'spamassassin' komandoaren bide-izen osoa Ez bada ezartzen, konpilazio-"
+"denborako bide-izena erabiliko da, /usr/bin/spamassassin ohi izaten da. "
+"Komandoak ez luke beste argumenturik eduki beharko."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr "Komandoaren bide-izen osoa sa-learn exekutatzeko"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+"sa-learn komandoaren bide-izen osoa Ez bada ezartzen, konpilazio-denborako "
+"bide-izena erabiliko da, /usr/bin/sa-learn ohi izaten da. Komandoak ez luke "
+"beste argumenturik eduki beharko."
+
 #: ../em-format/e-mail-formatter-attachment.c:405
 #: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
 #: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
@@ -10280,7 +10409,7 @@ msgstr "Nork"
 msgid "(no subject)"
 msgstr "(gairik ez)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Mezu hau %s(e)k bidali du %s(r)en izenean"
@@ -10304,8 +10433,6 @@ msgstr "Eman formatua zatiari RFC822 mezu bat bezala"
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1271
-#: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Izena"
@@ -10315,29 +10442,6 @@ msgstr "Izena"
 msgid "Size"
 msgstr "Tamaina"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "GPG sinatuta"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "GPG enkriptatuta"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "S/MIME sinatuta"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "S/MIME enkriptatuta"
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:736
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
-msgid "Security"
-msgstr "Segurtasuna"
-
 #: ../em-format/e-mail-formatter-quote-headers.c:174
 #: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
 #: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
@@ -10349,39 +10453,39 @@ msgstr "Gaia"
 
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:193
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1166
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1482
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Testu aberatsa"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Bistaratu aberastutako testuaren zati bezala "
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:361
 msgid "Format part as HTML"
 msgstr "Eman formatua zatiari HTML gisa"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:197
-#: ../e-util/e-html-editor-actions.c:1408
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1544
 msgid "Plain Text"
 msgstr "Testu soila"
 
 #: ../em-format/e-mail-formatter-quote-text-plain.c:124
-#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr "Eman formatua zatiari testu soila bezala"
 
@@ -10492,7 +10596,7 @@ msgstr ""
 "denbora batean."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Ikusi ziurtagiria"
 
@@ -10508,18 +10612,41 @@ msgstr "Iturburua"
 msgid "Display source of a MIME part"
 msgstr "Bistaratu MIME zatiaren iturburua "
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
 #: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Bcc"
 
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "GPG sinatuta"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+msgid "GPG encrypted"
+msgstr "GPG enkriptatuta"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr "S/MIME sinatuta"
+
+#: ../em-format/e-mail-formatter-utils.c:582
+msgid "S/MIME encrypted"
+msgstr "S/MIME enkriptatuta"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:736
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "Segurtasuna"
+
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -10607,7 +10734,7 @@ msgstr "Berri-taldeak"
 msgid "Face"
 msgstr "Aurpegia"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
 #, c-format
 msgid "%s attachment"
 msgstr "%s eranskina"
@@ -10663,12 +10790,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
 #: ../e-util/e-activity-proxy.c:352
-#: ../modules/mail/e-mail-shell-view-actions.c:1824
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Utzi"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "Itxi mezu hau (Ihes)"
 
@@ -10688,58 +10815,58 @@ msgstr "Zerrenda-ikuspegia"
 #. * 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.
-#: ../e-util/e-attachment.c:1197
+#: ../e-util/e-attachment.c:1223
 msgid "Attached message"
 msgstr "Erantsitako mezua"
 
-#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
 msgid "Operation was cancelled"
 msgstr "Eragiketa bertan behera utzita."
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
-#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
+#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
 msgid "attachment.dat"
 msgstr "eranskina.dat"
 
-#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
 msgid "A load operation is already in progress"
 msgstr "Kargatzeko eragiketa lantzen ari da."
 
-#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
 msgid "A save operation is already in progress"
 msgstr "Gordetzeko eragiketa lantzen ari da."
 
-#: ../e-util/e-attachment.c:2473
+#: ../e-util/e-attachment.c:2521
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Ezin izan da '%s' kargatu"
 
-#: ../e-util/e-attachment.c:2476
+#: ../e-util/e-attachment.c:2524
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ezin izan da eranskina kargatu"
 
-#: ../e-util/e-attachment.c:2761
+#: ../e-util/e-attachment.c:2809
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Ezin izan da '%s' ireki"
 
-#: ../e-util/e-attachment.c:2764
+#: ../e-util/e-attachment.c:2812
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ezin izan da eranskina ireki"
 
-#: ../e-util/e-attachment.c:3411
+#: ../e-util/e-attachment.c:3459
 msgid "Attachment contents not loaded"
 msgstr "Eranskinaren edukia ez da kargatu"
 
-#: ../e-util/e-attachment.c:3502
+#: ../e-util/e-attachment.c:3550
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Ezin izan da '%s' gorde"
 
-#: ../e-util/e-attachment.c:3505
+#: ../e-util/e-attachment.c:3553
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ezin izan da eranskina gorde"
@@ -10816,61 +10943,77 @@ msgstr "Gorde erauzitako fitxategiak _soilik"
 msgid "Save extracted files and the original _archive"
 msgstr "Gorde erauzitako fitxategiak eta jatorrizko _artxiboa"
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-view.c:413
 msgid "Open With Other Application..."
 msgstr "Ireki beste aplikazio batekin..."
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:420
 msgid "S_ave All"
 msgstr "Gorde _denak"
 
-#: ../e-util/e-attachment-view.c:391
+#: ../e-util/e-attachment-view.c:427
 msgid "Sa_ve As"
 msgstr "Gorde _honela"
 
-#: ../e-util/e-attachment-view.c:400
+#: ../e-util/e-attachment-view.c:436
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
 msgid "Save _As"
 msgstr "Gorde _honela"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:446
 msgid "A_dd Attachment..."
 msgstr "_Gehitu eranskina..."
 
-#: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../e-util/e-attachment-view.c:453
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
 #: ../modules/calendar/e-cal-shell-view-actions.c:1240
 #: ../modules/calendar/e-memo-shell-view-actions.c:571
 #: ../modules/calendar/e-task-shell-view-actions.c:696
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Propietateak"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:470
 msgid "_Hide"
 msgstr "E_zkutatu"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:477
 msgid "Hid_e All"
 msgstr "_Ezkutatu denak"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:484
 msgid "_View Inline"
 msgstr "_Ikusi barnean"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:491
 msgid "Vie_w All Inline"
 msgstr "_Ikusi denak barnean"
 
-#: ../e-util/e-attachment-view.c:785
+#: ../e-util/e-attachment-view.c:498
+msgid "_Zoom to 100%"
+msgstr "_Zooma % 100"
+
+#: ../e-util/e-attachment-view.c:500
+msgid "Zoom the image to its natural size"
+msgstr "Erakutsi irudia bere tamaina normalean"
+
+#: ../e-util/e-attachment-view.c:505
+msgid "_Zoom to window"
+msgstr "_Zooma leihora"
+
+#: ../e-util/e-attachment-view.c:507
+msgid "Zoom large images to not be wider than the window width"
+msgstr "Egokitu irudi handiak leihoaren zabalera baino handiagoak ez izateko"
+
+#: ../e-util/e-attachment-view.c:850
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Ireki honekin: %s"
 
-#: ../e-util/e-attachment-view.c:788
+#: ../e-util/e-attachment-view.c:853
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Ireki eranskina '%s(r)ekin"
@@ -10967,11 +11110,20 @@ msgid "_Available Categories:"
 msgstr "_Kategoria erabilgarriak:"
 
 #: ../e-util/e-categories-editor.c:274
-#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1099
+msgctxt "category"
 msgid "_New"
 msgstr "_Berria"
 
+#: ../e-util/e-categories-editor.c:278
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Editatu"
+
+#: ../e-util/e-categories-editor.c:282
+msgctxt "category"
+msgid "_Delete"
+msgstr "E_zabatu"
+
 #: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Ikonoa"
@@ -11137,7 +11289,7 @@ msgstr "Adierazi erabili behar den karaktere-jokoa"
 msgid "Other..."
 msgstr "Besterik..."
 
-#: ../e-util/e-client-cache.c:1209
+#: ../e-util/e-client-cache.c:1266
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Ezin da bezeroaren objektu bat sortu '%s' hedapen-izenetik"
@@ -11308,8 +11460,8 @@ msgstr "zuria"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3857
-#: ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3866
+#: ../mail/mail-config.ui.h:69
 msgid "Default"
 msgstr "Lehenetsia"
 
@@ -11428,117 +11580,117 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Hurrengo ig."
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "Erabili lokala lehenetsia"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Formatua:"
 
 #. Translators: :-)
-#: ../e-util/e-emoticon-chooser.c:39
+#: ../e-util/e-emoticon-chooser.c:40
 msgid "_Smile"
 msgstr "_Irribarrea"
 
 #. Translators: :-(
-#: ../e-util/e-emoticon-chooser.c:41
+#: ../e-util/e-emoticon-chooser.c:42
 msgid "S_ad"
 msgstr "_Goibel"
 
 #. Translators: ;-)
-#: ../e-util/e-emoticon-chooser.c:43
+#: ../e-util/e-emoticon-chooser.c:44
 msgid "_Wink"
 msgstr "_Keinu egiten"
 
 #. Translators: :-P
-#: ../e-util/e-emoticon-chooser.c:45
+#: ../e-util/e-emoticon-chooser.c:46
 msgid "Ton_gue"
 msgstr "_Mihia"
 
 #. Translators: :-))
-#: ../e-util/e-emoticon-chooser.c:47
+#: ../e-util/e-emoticon-chooser.c:48
 msgid "Laug_h"
 msgstr "_Barrea egiten"
 
 #. Translators: :-|
-#: ../e-util/e-emoticon-chooser.c:49
+#: ../e-util/e-emoticon-chooser.c:50
 msgid "_Plain"
 msgstr "_Soila"
 
 #. Translators: :-!
-#: ../e-util/e-emoticon-chooser.c:51
+#: ../e-util/e-emoticon-chooser.c:52
 msgid "Smi_rk"
 msgstr "Irribarre _maltzurra"
 
 #. Translators: :"-)
-#: ../e-util/e-emoticon-chooser.c:53
+#: ../e-util/e-emoticon-chooser.c:54
 msgid "_Embarrassed"
 msgstr "_Lotsatia"
 
 #. Translators: :-D
-#: ../e-util/e-emoticon-chooser.c:55
+#: ../e-util/e-emoticon-chooser.c:56
 msgid "_Big Smile"
 msgstr "_Irribarrea"
 
 #. Translators: :-/
-#: ../e-util/e-emoticon-chooser.c:57
+#: ../e-util/e-emoticon-chooser.c:58
 msgid "Uncer_tain"
 msgstr "_Zalantza"
 
 #. Translators: :-O
-#: ../e-util/e-emoticon-chooser.c:59
+#: ../e-util/e-emoticon-chooser.c:60
 msgid "S_urprise"
 msgstr "_Harridura"
 
 #. Translators: :-S
-#: ../e-util/e-emoticon-chooser.c:61
+#: ../e-util/e-emoticon-chooser.c:62
 msgid "W_orried"
 msgstr "_Kezkati"
 
 #. Translators: :-*
-#: ../e-util/e-emoticon-chooser.c:63
+#: ../e-util/e-emoticon-chooser.c:64
 msgid "_Kiss"
 msgstr "_Muxua"
 
 #. Translators: X-(
-#: ../e-util/e-emoticon-chooser.c:65
+#: ../e-util/e-emoticon-chooser.c:66
 msgid "A_ngry"
 msgstr "Ha_serre"
 
 #. Translators: B-)
-#: ../e-util/e-emoticon-chooser.c:67
+#: ../e-util/e-emoticon-chooser.c:68
 msgid "_Cool"
 msgstr "_Sekulakoa"
 
 #. Translators: O:-)
-#: ../e-util/e-emoticon-chooser.c:69
+#: ../e-util/e-emoticon-chooser.c:70
 msgid "Ange_l"
 msgstr "_Aingerua"
 
 #. Translators: :'(
-#: ../e-util/e-emoticon-chooser.c:71
+#: ../e-util/e-emoticon-chooser.c:72
 msgid "Cr_ying"
 msgstr "_Negartia"
 
 #. Translators: :-Q
-#: ../e-util/e-emoticon-chooser.c:73
+#: ../e-util/e-emoticon-chooser.c:74
 msgid "S_ick"
 msgstr "_Gaixoa"
 
 #. Translators: |-)
-#: ../e-util/e-emoticon-chooser.c:75
+#: ../e-util/e-emoticon-chooser.c:76
 msgid "Tire_d"
 msgstr "_Nekatua"
 
 #. Translators: >:-)
-#: ../e-util/e-emoticon-chooser.c:77
+#: ../e-util/e-emoticon-chooser.c:78
 msgid "De_vilish"
 msgstr "_Inpernukoa"
 
 #. Translators: :-(|)
-#: ../e-util/e-emoticon-chooser.c:79
+#: ../e-util/e-emoticon-chooser.c:80
 msgid "_Monkey"
 msgstr "_Tximinoa"
 
@@ -11705,12 +11857,12 @@ msgstr "Bilatu honako baldintzak betetzen dituzten elementuak"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
-#: ../e-util/e-mail-identity-combo-box.c:472
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:62
+#: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Bat ere ez"
 
@@ -11739,662 +11891,667 @@ msgid "A_dd Condition"
 msgstr "Gehitu _baldintza"
 
 #: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
-#: ../mail/em-utils.c:229
+#: ../mail/em-utils.c:164
 msgid "Incoming"
 msgstr "Sarrerakoa"
 
-#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:165
 msgid "Outgoing"
 msgstr "Irteerakoa"
 
-#: ../e-util/e-html-editor-actions.c:57
+#: ../e-util/e-html-editor-actions.c:58
 msgid "Failed to insert HTML file."
 msgstr "Huts egin du HTML fitxategia txertatzean."
 
-#: ../e-util/e-html-editor-actions.c:94
+#: ../e-util/e-html-editor-actions.c:95
 msgid "Failed to insert text file."
 msgstr "Huts egin du testu-fitxategia txertatzean."
 
-#: ../e-util/e-html-editor-actions.c:478
+#: ../e-util/e-html-editor-actions.c:612
 msgid "Insert HTML File"
 msgstr "Txertatu HTML fitxategia"
 
-#: ../e-util/e-html-editor-actions.c:484
+#: ../e-util/e-html-editor-actions.c:618
 msgid "HTML file"
 msgstr "HTML fitxategia"
 
-#: ../e-util/e-html-editor-actions.c:511
-#: ../e-util/e-html-editor-actions.c:1292
+#: ../e-util/e-html-editor-actions.c:645
+msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Txertatu irudia"
 
-#: ../e-util/e-html-editor-actions.c:571
+#: ../e-util/e-html-editor-actions.c:706
 msgid "Insert text file"
 msgstr "Txertatu testu-fitxategia"
 
-#: ../e-util/e-html-editor-actions.c:577
+#: ../e-util/e-html-editor-actions.c:712
 msgid "Text file"
 msgstr "Testu-fitxategia"
 
-#: ../e-util/e-html-editor-actions.c:961
+#: ../e-util/e-html-editor-actions.c:1096
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiatu hautatutako testua arbelean"
 
-#: ../e-util/e-html-editor-actions.c:968
+#: ../e-util/e-html-editor-actions.c:1103
 msgid "Cut selected text to the clipboard"
 msgstr "Ebaki hautatutako testua arbelera"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../e-util/e-html-editor-actions.c:975
+#: ../e-util/e-html-editor-actions.c:1110
 msgid "Paste text from the clipboard"
 msgstr "Itsatsi testua arbeletik"
 
-#: ../e-util/e-html-editor-actions.c:982
+#: ../e-util/e-html-editor-actions.c:1117
 msgid "Redo the last undone action"
 msgstr "Desegin den azken ekintza berregiten du"
 
-#: ../e-util/e-html-editor-actions.c:996
+#: ../e-util/e-html-editor-actions.c:1131
 msgid "Undo the last action"
 msgstr "Desegin azken ekintza"
 
-#: ../e-util/e-html-editor-actions.c:1017
+#: ../e-util/e-html-editor-actions.c:1152
 msgid "For_mat"
 msgstr "For_matua"
 
-#: ../e-util/e-html-editor-actions.c:1024
+#: ../e-util/e-html-editor-actions.c:1159
 msgid "_Paragraph Style"
 msgstr "_Paragrafo-estiloa"
 
-#: ../e-util/e-html-editor-actions.c:1038
-#: ../e-util/e-html-editor-image-dialog.c:591
+#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-image-dialog.c:635
 msgid "_Alignment"
 msgstr "_Lerrokatu"
 
-#: ../e-util/e-html-editor-actions.c:1045
+#: ../e-util/e-html-editor-actions.c:1180
 msgid "Current _Languages"
 msgstr "Uneko _hizkuntzak"
 
-#: ../e-util/e-html-editor-actions.c:1062
+#: ../e-util/e-html-editor-actions.c:1197
 msgid "_Increase Indent"
 msgstr "_Handiagotu koska"
 
-#: ../e-util/e-html-editor-actions.c:1064
+#: ../e-util/e-html-editor-actions.c:1199
 msgid "Increase Indent"
 msgstr "Handiagotu koska"
 
-#: ../e-util/e-html-editor-actions.c:1069
+#: ../e-util/e-html-editor-actions.c:1204
 msgid "_HTML File..."
 msgstr "_HTML fitxategia..."
 
-#: ../e-util/e-html-editor-actions.c:1076
+#: ../e-util/e-html-editor-actions.c:1211
 msgid "Te_xt File..."
 msgstr "Te_stu-fitxategia..."
 
-#: ../e-util/e-html-editor-actions.c:1083
+#: ../e-util/e-html-editor-actions.c:1218
 msgid "Paste _Quotation"
 msgstr "Itsatsi _aipua"
 
-#: ../e-util/e-html-editor-actions.c:1090
+#: ../e-util/e-html-editor-actions.c:1225
 msgid "_Find..."
 msgstr "_Bilatu..."
 
-#: ../e-util/e-html-editor-actions.c:1092
+#: ../e-util/e-html-editor-actions.c:1227
 msgid "Search for text"
 msgstr "Bilatu testua"
 
-#: ../e-util/e-html-editor-actions.c:1097
+#: ../e-util/e-html-editor-actions.c:1232
 msgid "Find A_gain"
 msgstr "Bilat_u berriro"
 
-#: ../e-util/e-html-editor-actions.c:1104
+#: ../e-util/e-html-editor-actions.c:1239
 msgid "Re_place..."
 msgstr "Orde_ztu..."
 
-#: ../e-util/e-html-editor-actions.c:1106
+#: ../e-util/e-html-editor-actions.c:1241
 msgid "Search for and replace text"
 msgstr "Bilatu eta ordeztu testua"
 
-#: ../e-util/e-html-editor-actions.c:1111
+#: ../e-util/e-html-editor-actions.c:1246
 msgid "Check _Spelling..."
 msgstr "Egiaztatu _ortografia..."
 
-#: ../e-util/e-html-editor-actions.c:1118
+#: ../e-util/e-html-editor-actions.c:1253
 msgid "_Decrease Indent"
 msgstr "_Txikiagotu koska"
 
-#: ../e-util/e-html-editor-actions.c:1120
+#: ../e-util/e-html-editor-actions.c:1255
 msgid "Decrease Indent"
 msgstr "Txikiagotu koska"
 
-#: ../e-util/e-html-editor-actions.c:1125
+#: ../e-util/e-html-editor-actions.c:1260
 msgid "_Wrap Lines"
 msgstr "_Itzulbiratu lerroak"
 
-#: ../e-util/e-html-editor-actions.c:1132
+#: ../e-util/e-html-editor-actions.c:1267
 msgid "Open Inspector"
 msgstr "Ireki ikuskatzailea"
 
 #. Center
-#: ../e-util/e-html-editor-actions.c:1142
+#: ../e-util/e-html-editor-actions.c:1277
 #: ../e-util/e-html-editor-paragraph-dialog.c:110
 msgid "_Center"
 msgstr "_Zentratuta"
 
-#: ../e-util/e-html-editor-actions.c:1144
+#: ../e-util/e-html-editor-actions.c:1279
 msgid "Center Alignment"
 msgstr "Zentroan lerrokatua"
 
 #. Left
-#: ../e-util/e-html-editor-actions.c:1149
+#: ../e-util/e-html-editor-actions.c:1284
 #: ../e-util/e-html-editor-paragraph-dialog.c:101
 msgid "_Left"
 msgstr "E_zkerrean"
 
-#: ../e-util/e-html-editor-actions.c:1151
+#: ../e-util/e-html-editor-actions.c:1286
 msgid "Left Alignment"
 msgstr "Ezkerrean lerrokatua"
 
 #. Right
-#: ../e-util/e-html-editor-actions.c:1156
+#: ../e-util/e-html-editor-actions.c:1291
 #: ../e-util/e-html-editor-paragraph-dialog.c:119
 msgid "_Right"
 msgstr "E_skuinean"
 
-#: ../e-util/e-html-editor-actions.c:1158
+#: ../e-util/e-html-editor-actions.c:1293
 msgid "Right Alignment"
 msgstr "Eskuinean lerrokatua"
 
-#: ../e-util/e-html-editor-actions.c:1166
+#: ../e-util/e-html-editor-actions.c:1301
 #: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../e-util/e-html-editor-actions.c:1168
+#: ../e-util/e-html-editor-actions.c:1303
 msgid "HTML editing mode"
 msgstr "HTML edizio modua"
 
-#: ../e-util/e-html-editor-actions.c:1173
+#: ../e-util/e-html-editor-actions.c:1308
 msgid "Plain _Text"
 msgstr "_Testu soila"
 
-#: ../e-util/e-html-editor-actions.c:1175
+#: ../e-util/e-html-editor-actions.c:1310
 msgid "Plain text editing mode"
 msgstr "Testu soilaren edizio modua"
 
-#: ../e-util/e-html-editor-actions.c:1183
+#: ../e-util/e-html-editor-actions.c:1318
 msgid "_Normal"
 msgstr "_Arrunta"
 
-#: ../e-util/e-html-editor-actions.c:1190
+#: ../e-util/e-html-editor-actions.c:1325
 msgid "Header _1"
 msgstr "_1. izenburua"
 
-#: ../e-util/e-html-editor-actions.c:1197
+#: ../e-util/e-html-editor-actions.c:1332
 msgid "Header _2"
 msgstr "_2. izenburua"
 
-#: ../e-util/e-html-editor-actions.c:1204
+#: ../e-util/e-html-editor-actions.c:1339
 msgid "Header _3"
 msgstr "_3. izenburua"
 
-#: ../e-util/e-html-editor-actions.c:1211
+#: ../e-util/e-html-editor-actions.c:1346
 msgid "Header _4"
 msgstr "_4. izenburua"
 
-#: ../e-util/e-html-editor-actions.c:1218
+#: ../e-util/e-html-editor-actions.c:1353
 msgid "Header _5"
 msgstr "_5. izenburua"
 
-#: ../e-util/e-html-editor-actions.c:1225
+#: ../e-util/e-html-editor-actions.c:1360
 msgid "Header _6"
 msgstr "_6. izenburua"
 
-#: ../e-util/e-html-editor-actions.c:1232
+#: ../e-util/e-html-editor-actions.c:1367
 msgid "_Preformatted"
 msgstr "_Aurreformatua"
 
-#: ../e-util/e-html-editor-actions.c:1239
+#: ../e-util/e-html-editor-actions.c:1374
 msgid "A_ddress"
 msgstr "_Helbidea"
 
-#: ../e-util/e-html-editor-actions.c:1246
+#: ../e-util/e-html-editor-actions.c:1381
 msgid "_Blockquote"
 msgstr "_Aipu-blokea"
 
-#: ../e-util/e-html-editor-actions.c:1253
+#: ../e-util/e-html-editor-actions.c:1388
 msgid "_Bulleted List"
 msgstr "_Buletdun zerrenda"
 
-#: ../e-util/e-html-editor-actions.c:1260
+#: ../e-util/e-html-editor-actions.c:1395
 msgid "_Roman Numeral List"
 msgstr "Zenbaki e_rromatarren zerrenda"
 
-#: ../e-util/e-html-editor-actions.c:1267
+#: ../e-util/e-html-editor-actions.c:1402
 msgid "Numbered _List"
 msgstr "Zenbakidun _zerrenda"
 
-#: ../e-util/e-html-editor-actions.c:1274
+#: ../e-util/e-html-editor-actions.c:1409
 msgid "_Alphabetical List"
 msgstr "_Zerrenda alfabetikoa"
 
-#: ../e-util/e-html-editor-actions.c:1290
-#: ../e-util/e-html-editor-actions.c:1327
+#: ../e-util/e-html-editor-actions.c:1425
+#: ../e-util/e-html-editor-actions.c:1463
 msgid "_Image..."
 msgstr "I_rudia..."
 
-#: ../e-util/e-html-editor-actions.c:1297
-#: ../e-util/e-html-editor-actions.c:1334
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1428
+msgid "Insert Image"
+msgstr "Txertatu irudia"
+
+#: ../e-util/e-html-editor-actions.c:1433
+#: ../e-util/e-html-editor-actions.c:1470
 msgid "_Link..."
 msgstr "_Esteka..."
 
-#: ../e-util/e-html-editor-actions.c:1299
+#: ../e-util/e-html-editor-actions.c:1435
 msgid "Insert Link"
 msgstr "Txertatu esteka"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1305
-#: ../e-util/e-html-editor-actions.c:1349
+#: ../e-util/e-html-editor-actions.c:1441
+#: ../e-util/e-html-editor-actions.c:1485
 msgid "_Rule..."
 msgstr "_Marra..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1308
+#: ../e-util/e-html-editor-actions.c:1444
 msgid "Insert Rule"
 msgstr "Txertatu marra"
 
-#: ../e-util/e-html-editor-actions.c:1313
-#: ../e-util/e-html-editor-actions.c:1356
+#: ../e-util/e-html-editor-actions.c:1449
+#: ../e-util/e-html-editor-actions.c:1492
 msgid "_Table..."
 msgstr "_Taula..."
 
-#: ../e-util/e-html-editor-actions.c:1315
+#: ../e-util/e-html-editor-actions.c:1451
 msgid "Insert Table"
 msgstr "Txertatu taula"
 
-#: ../e-util/e-html-editor-actions.c:1320
+#: ../e-util/e-html-editor-actions.c:1456
 msgid "_Cell..."
 msgstr "_Gelaxka..."
 
-#: ../e-util/e-html-editor-actions.c:1341
+#: ../e-util/e-html-editor-actions.c:1477
 msgid "Pa_ge..."
 msgstr "_Orria..."
 
-#: ../e-util/e-html-editor-actions.c:1365
+#: ../e-util/e-html-editor-actions.c:1501
 msgid "Font _Size"
 msgstr "Letra-_tamaina"
 
-#: ../e-util/e-html-editor-actions.c:1372
+#: ../e-util/e-html-editor-actions.c:1508
 msgid "_Font Style"
 msgstr "Letra-e_stiloa"
 
-#: ../e-util/e-html-editor-actions.c:1379
+#: ../e-util/e-html-editor-actions.c:1515
 msgid "Paste As _Text"
 msgstr "_Itsatsi testu gisa"
 
-#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-actions.c:1526
 #: ../e-util/e-html-editor-text-dialog.c:214
 msgid "_Bold"
 msgstr "_Lodia"
 
-#: ../e-util/e-html-editor-actions.c:1392
+#: ../e-util/e-html-editor-actions.c:1528
 msgid "Bold"
 msgstr "Lodia"
 
-#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-actions.c:1534
 #: ../e-util/e-html-editor-text-dialog.c:225
 msgid "_Italic"
 msgstr "_Etzana"
 
-#: ../e-util/e-html-editor-actions.c:1400
+#: ../e-util/e-html-editor-actions.c:1536
 msgid "Italic"
 msgstr "Etzana"
 
-#: ../e-util/e-html-editor-actions.c:1406
+#: ../e-util/e-html-editor-actions.c:1542
 msgid "_Plain Text"
 msgstr "_Testu soila"
 
-#: ../e-util/e-html-editor-actions.c:1414
+#: ../e-util/e-html-editor-actions.c:1550
 #: ../e-util/e-html-editor-text-dialog.c:246
 msgid "_Strikethrough"
 msgstr "_Marratua"
 
-#: ../e-util/e-html-editor-actions.c:1416
+#: ../e-util/e-html-editor-actions.c:1552
 msgid "Strikethrough"
 msgstr "Marratua"
 
-#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-actions.c:1558
 #: ../e-util/e-html-editor-text-dialog.c:236
 msgid "_Underline"
 msgstr "_Azpimarratua"
 
-#: ../e-util/e-html-editor-actions.c:1424
+#: ../e-util/e-html-editor-actions.c:1560
 msgid "Underline"
 msgstr "Azpimarratua"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1434
+#: ../e-util/e-html-editor-actions.c:1570
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1442
+#: ../e-util/e-html-editor-actions.c:1578
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1450
+#: ../e-util/e-html-editor-actions.c:1586
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1458
+#: ../e-util/e-html-editor-actions.c:1594
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1466
+#: ../e-util/e-html-editor-actions.c:1602
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1474
+#: ../e-util/e-html-editor-actions.c:1610
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../e-util/e-html-editor-actions.c:1482
+#: ../e-util/e-html-editor-actions.c:1618
 msgid "+4"
 msgstr "+4"
 
-#: ../e-util/e-html-editor-actions.c:1501
+#: ../e-util/e-html-editor-actions.c:1637
 msgid "Cell Contents"
 msgstr "Gelaxkaren edukia"
 
-#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-actions.c:1644
 msgid "Column"
 msgstr "Zutabea"
 
-#: ../e-util/e-html-editor-actions.c:1515
+#: ../e-util/e-html-editor-actions.c:1651
 msgid "Row"
 msgstr "Errenkada"
 
-#: ../e-util/e-html-editor-actions.c:1522
-#: ../e-util/e-html-editor-actions.c:1607
+#: ../e-util/e-html-editor-actions.c:1658
+#: ../e-util/e-html-editor-actions.c:1743
 msgid "Table"
 msgstr "Taula"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-actions.c:1668
 msgid "Table Delete"
 msgstr "Ezabatu taula"
 
-#: ../e-util/e-html-editor-actions.c:1539 ../e-util/e-text.c:2127
+#: ../e-util/e-html-editor-actions.c:1675 ../e-util/e-text.c:2127
 msgid "Input Methods"
 msgstr "Sarrerako metodoak"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../e-util/e-html-editor-actions.c:1547
+#: ../e-util/e-html-editor-actions.c:1683
 msgid "Table Insert"
 msgstr "Txertatu taula"
 
-#: ../e-util/e-html-editor-actions.c:1554
+#: ../e-util/e-html-editor-actions.c:1690
 msgid "Properties"
 msgstr "Propietateak"
 
-#: ../e-util/e-html-editor-actions.c:1572
+#: ../e-util/e-html-editor-actions.c:1708
 msgid "Column After"
 msgstr "Zutabea ondoren"
 
-#: ../e-util/e-html-editor-actions.c:1579
+#: ../e-util/e-html-editor-actions.c:1715
 msgid "Column Before"
 msgstr "Zutabea aurrean"
 
-#: ../e-util/e-html-editor-actions.c:1586
+#: ../e-util/e-html-editor-actions.c:1722
 msgid "Insert _Link"
 msgstr "Txertatu _esteka"
 
-#: ../e-util/e-html-editor-actions.c:1593
+#: ../e-util/e-html-editor-actions.c:1729
 msgid "Row Above"
 msgstr "Errenkada goian"
 
-#: ../e-util/e-html-editor-actions.c:1600
+#: ../e-util/e-html-editor-actions.c:1736
 msgid "Row Below"
 msgstr "Errenkada behean"
 
-#: ../e-util/e-html-editor-actions.c:1614
+#: ../e-util/e-html-editor-actions.c:1750
 msgid "Cell..."
 msgstr "Gelaxka..."
 
-#: ../e-util/e-html-editor-actions.c:1621
+#: ../e-util/e-html-editor-actions.c:1757
 msgid "Image..."
 msgstr "Irudia..."
 
-#: ../e-util/e-html-editor-actions.c:1628
+#: ../e-util/e-html-editor-actions.c:1764
 msgid "Link..."
 msgstr "Esteka..."
 
-#: ../e-util/e-html-editor-actions.c:1635
+#: ../e-util/e-html-editor-actions.c:1771
 msgid "Page..."
 msgstr "Orria..."
 
-#: ../e-util/e-html-editor-actions.c:1642
+#: ../e-util/e-html-editor-actions.c:1778
 msgid "Paragraph..."
 msgstr "Paragrafoa..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1650
+#: ../e-util/e-html-editor-actions.c:1786
 msgid "Rule..."
 msgstr "Marra..."
 
-#: ../e-util/e-html-editor-actions.c:1657
+#: ../e-util/e-html-editor-actions.c:1793
 msgid "Table..."
 msgstr "Taula..."
 
-#: ../e-util/e-html-editor-actions.c:1664
+#: ../e-util/e-html-editor-actions.c:1800
 msgid "Text..."
 msgstr "Testua..."
 
-#: ../e-util/e-html-editor-actions.c:1671
+#: ../e-util/e-html-editor-actions.c:1807
 msgid "Remove Link"
 msgstr "Kendu esteka"
 
-#: ../e-util/e-html-editor-actions.c:1688
+#: ../e-util/e-html-editor-actions.c:1824
 msgid "Add Word to Dictionary"
 msgstr "Gehitu hitza hiztegiari"
 
-#: ../e-util/e-html-editor-actions.c:1695
+#: ../e-util/e-html-editor-actions.c:1831
 msgid "Ignore Misspelled Word"
 msgstr "Ez ikusi egin oker idatzitako hitzei"
 
-#: ../e-util/e-html-editor-actions.c:1702
+#: ../e-util/e-html-editor-actions.c:1838
 msgid "Add Word To"
 msgstr "Gehitu hitza:"
 
-#: ../e-util/e-html-editor-actions.c:1711
+#: ../e-util/e-html-editor-actions.c:1847
 msgid "More Suggestions"
 msgstr "Iradokizun gehiago"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../e-util/e-html-editor-actions.c:1819
+#: ../e-util/e-html-editor-actions.c:1955
 #, c-format
 msgid "%s Dictionary"
 msgstr "'%s' hiztegia"
 
-#: ../e-util/e-html-editor-actions.c:1906
+#: ../e-util/e-html-editor-actions.c:2042
 msgid "_Emoticon"
 msgstr "_Aurpegiera"
 
-#: ../e-util/e-html-editor-actions.c:1907
+#: ../e-util/e-html-editor-actions.c:2043
 msgid "Insert Emoticon"
 msgstr "Txertatu aurpegiera"
 
-#: ../e-util/e-html-editor-actions.c:1975
+#: ../e-util/e-html-editor-actions.c:2111
 msgid "Re_place"
 msgstr "_Ordeztu"
 
-#: ../e-util/e-html-editor-actions.c:1978
+#: ../e-util/e-html-editor-actions.c:2114
 msgid "_Image"
 msgstr "_Irudia"
 
-#: ../e-util/e-html-editor-actions.c:1981
+#: ../e-util/e-html-editor-actions.c:2117
 msgid "_Link"
 msgstr "Este_ka"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:1985
+#: ../e-util/e-html-editor-actions.c:2121
 msgid "_Rule"
 msgstr "_Marra"
 
-#: ../e-util/e-html-editor-actions.c:1988
-#: ../e-util/e-html-editor-cell-dialog.c:658
+#: ../e-util/e-html-editor-actions.c:2124
+#: ../e-util/e-html-editor-cell-dialog.c:732
 msgid "_Table"
 msgstr "_Taula"
 
-#: ../e-util/e-html-editor.c:669
+#: ../e-util/e-html-editor.c:672
 msgid "Paragraph Style"
 msgstr "Paragrafo-estiloa"
 
-#: ../e-util/e-html-editor.c:683
+#: ../e-util/e-html-editor.c:686
 msgid "Editing Mode"
 msgstr "Edizio modua"
 
-#: ../e-util/e-html-editor.c:695
+#: ../e-util/e-html-editor.c:698
 msgid "Font Color"
 msgstr "Letra-kolorea"
 
-#: ../e-util/e-html-editor.c:713
+#: ../e-util/e-html-editor.c:716
 msgid "Font Size"
 msgstr "Letra-tamaina"
 
-#: ../e-util/e-html-editor-cell-dialog.c:618
+#: ../e-util/e-html-editor-cell-dialog.c:692
 msgid "<b>Scope</b>"
 msgstr "<b>Esparrua</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:632
+#: ../e-util/e-html-editor-cell-dialog.c:706
 msgid "C_ell"
 msgstr "_Gelaxka"
 
-#: ../e-util/e-html-editor-cell-dialog.c:645
+#: ../e-util/e-html-editor-cell-dialog.c:719
 msgid "_Row"
 msgstr "_Errenkada"
 
-#: ../e-util/e-html-editor-cell-dialog.c:671
+#: ../e-util/e-html-editor-cell-dialog.c:745
 msgid "Col_umn"
 msgstr "_Zutabea"
 
-#: ../e-util/e-html-editor-cell-dialog.c:681
+#: ../e-util/e-html-editor-cell-dialog.c:755
 msgid "<b>Alignment &amp; Behavior</b>"
 msgstr "<b>Lerrokadura eta portaera</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:694
-#: ../e-util/e-html-editor-hrule-dialog.c:384
-#: ../e-util/e-html-editor-table-dialog.c:819
+#: ../e-util/e-html-editor-cell-dialog.c:768
+#: ../e-util/e-html-editor-hrule-dialog.c:407
+#: ../e-util/e-html-editor-table-dialog.c:894
 msgid "Left"
 msgstr "Ezkerrean"
 
-#: ../e-util/e-html-editor-cell-dialog.c:695
-#: ../e-util/e-html-editor-hrule-dialog.c:386
-#: ../e-util/e-html-editor-table-dialog.c:820
+#: ../e-util/e-html-editor-cell-dialog.c:769
+#: ../e-util/e-html-editor-hrule-dialog.c:409
+#: ../e-util/e-html-editor-table-dialog.c:895
 msgid "Center"
 msgstr "Erdian"
 
-#: ../e-util/e-html-editor-cell-dialog.c:696
-#: ../e-util/e-html-editor-hrule-dialog.c:388
-#: ../e-util/e-html-editor-table-dialog.c:821
+#: ../e-util/e-html-editor-cell-dialog.c:770
+#: ../e-util/e-html-editor-hrule-dialog.c:411
+#: ../e-util/e-html-editor-table-dialog.c:896
 msgid "Right"
 msgstr "Eskuinean"
 
-#: ../e-util/e-html-editor-cell-dialog.c:704
+#: ../e-util/e-html-editor-cell-dialog.c:778
 msgid "_Horizontal:"
 msgstr "_Horizontala:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:712
-#: ../e-util/e-html-editor-image-dialog.c:581
+#: ../e-util/e-html-editor-cell-dialog.c:786
+#: ../e-util/e-html-editor-image-dialog.c:625
 msgid "Top"
 msgstr "Goian"
 
-#: ../e-util/e-html-editor-cell-dialog.c:713
-#: ../e-util/e-html-editor-image-dialog.c:582
+#: ../e-util/e-html-editor-cell-dialog.c:787
+#: ../e-util/e-html-editor-image-dialog.c:626
 msgid "Middle"
 msgstr "Erdialdean"
 
-#: ../e-util/e-html-editor-cell-dialog.c:714
-#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-cell-dialog.c:788
+#: ../e-util/e-html-editor-image-dialog.c:627
 msgid "Bottom"
 msgstr "Behean"
 
-#: ../e-util/e-html-editor-cell-dialog.c:722
+#: ../e-util/e-html-editor-cell-dialog.c:796
 msgid "_Vertical:"
 msgstr "_Bertikala:"
 
 #. Wrap Text
-#: ../e-util/e-html-editor-cell-dialog.c:728
+#: ../e-util/e-html-editor-cell-dialog.c:802
 msgid "_Wrap Text"
 msgstr "_Itzulbiratu testua"
 
 #. Header Style
-#: ../e-util/e-html-editor-cell-dialog.c:736
+#: ../e-util/e-html-editor-cell-dialog.c:810
 msgid "_Header Style"
 msgstr "_Izenburu-estiloa"
 
-#: ../e-util/e-html-editor-cell-dialog.c:750
-#: ../e-util/e-html-editor-image-dialog.c:521
-#: ../e-util/e-html-editor-table-dialog.c:731
+#: ../e-util/e-html-editor-cell-dialog.c:824
+#: ../e-util/e-html-editor-image-dialog.c:565
+#: ../e-util/e-html-editor-table-dialog.c:806
 msgid "<b>Layout</b>"
 msgstr "<b>Diseinua</b>"
 
 #. Width
-#: ../e-util/e-html-editor-cell-dialog.c:761
+#: ../e-util/e-html-editor-cell-dialog.c:835
 msgid "_Width"
 msgstr "_Zabalera"
 
-#: ../e-util/e-html-editor-cell-dialog.c:800
+#: ../e-util/e-html-editor-cell-dialog.c:874
 msgid "Row S_pan:"
 msgstr "Errenkada-_hedadura:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:814
+#: ../e-util/e-html-editor-cell-dialog.c:888
 msgid "Co_lumn Span:"
 msgstr "Zutabe-he_dadura:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:821
-#: ../e-util/e-html-editor-table-dialog.c:835
+#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-table-dialog.c:910
 msgid "<b>Background</b>"
 msgstr "<b>Atzeko planoa</b>"
 
-#: ../e-util/e-html-editor-cell-dialog.c:834
-#: ../e-util/e-html-editor-table-dialog.c:848
+#: ../e-util/e-html-editor-cell-dialog.c:908
+#: ../e-util/e-html-editor-table-dialog.c:923
 msgid "Transparent"
 msgstr "Gardena"
 
-#: ../e-util/e-html-editor-cell-dialog.c:842
+#: ../e-util/e-html-editor-cell-dialog.c:916
 msgid "C_olor:"
 msgstr "_Kolorea:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:850
-#: ../e-util/e-html-editor-image-dialog.c:483
-#: ../e-util/e-html-editor-table-dialog.c:864
+#: ../e-util/e-html-editor-cell-dialog.c:924
+#: ../e-util/e-html-editor-image-dialog.c:527
+#: ../e-util/e-html-editor-table-dialog.c:939
 msgid "Choose Background Image"
 msgstr "Aukeratu atzeko planoaren irudia"
 
-#: ../e-util/e-html-editor-cell-dialog.c:855
-#: ../e-util/e-html-editor-image-dialog.c:489
-#: ../e-util/e-html-editor-table-dialog.c:869
+#: ../e-util/e-html-editor-cell-dialog.c:929
+#: ../e-util/e-html-editor-image-dialog.c:533
+#: ../e-util/e-html-editor-table-dialog.c:944
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../e-util/e-html-editor-cell-dialog.c:868
+#: ../e-util/e-html-editor-cell-dialog.c:942
 msgid "_Image:"
 msgstr "_Irudia:"
 
-#: ../e-util/e-html-editor-cell-dialog.c:875
-#: ../e-util/e-html-editor-page-dialog.c:516
-#: ../e-util/e-html-editor-table-dialog.c:889
+#: ../e-util/e-html-editor-cell-dialog.c:949
+#: ../e-util/e-html-editor-page-dialog.c:579
+#: ../e-util/e-html-editor-table-dialog.c:964
 msgid "_Remove image"
 msgstr "_Kendu irudia"
 
-#: ../e-util/e-html-editor-cell-dialog.c:895
+#: ../e-util/e-html-editor-cell-dialog.c:969
 msgid "Cell Properties"
 msgstr "Gelaxkaren propietateak"
 
@@ -12405,7 +12562,7 @@ msgid "No match found"
 msgstr "Ez da bat datorrenik aurkitu"
 
 #: ../e-util/e-html-editor-find-dialog.c:160
-#: ../e-util/e-html-editor-replace-dialog.c:229
+#: ../e-util/e-html-editor-replace-dialog.c:247
 msgid "Search _backwards"
 msgstr "Bilatu _atzerantz"
 
@@ -12421,155 +12578,156 @@ msgstr "_Itzulbiratu bilaketa"
 msgid "Find"
 msgstr "Bilatu"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:319
+#: ../e-util/e-html-editor-hrule-dialog.c:342
 msgid "<b>Size</b>"
 msgstr "<b>Tamaina</b>"
 
 #. Width
-#: ../e-util/e-html-editor-hrule-dialog.c:339
-#: ../e-util/e-html-editor-image-dialog.c:539
-#: ../e-util/e-html-editor-table-dialog.c:742
+#: ../e-util/e-html-editor-hrule-dialog.c:362
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:817
 msgid "_Width:"
 msgstr "_Zabalera:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:364
+#: ../e-util/e-html-editor-hrule-dialog.c:387
 msgid "_Size:"
 msgstr "_Tamaina:"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:371
+#: ../e-util/e-html-editor-hrule-dialog.c:394
 msgid "<b>Style</b>"
 msgstr "<b>Estiloa</b>"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:396
-#: ../e-util/e-html-editor-table-dialog.c:828
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-table-dialog.c:903
 msgid "_Alignment:"
 msgstr "_Lerrokatu:"
 
 #. Shaded
-#: ../e-util/e-html-editor-hrule-dialog.c:402
+#: ../e-util/e-html-editor-hrule-dialog.c:425
 msgid "S_haded"
 msgstr "_Itzaldura"
 
-#: ../e-util/e-html-editor-hrule-dialog.c:419
+#: ../e-util/e-html-editor-hrule-dialog.c:442
 msgid "Rule properties"
 msgstr "Marraren propietateak"
 
-#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-image-dialog.c:515
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
-#: ../e-util/e-html-editor-table-dialog.c:685
+#: ../e-util/e-html-editor-table-dialog.c:760
 msgid "<b>General</b>"
 msgstr "<b>Orokorra</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:500
+#: ../e-util/e-html-editor-image-dialog.c:544
 msgid "_Source:"
 msgstr "_Iturburua:"
 
-#: ../e-util/e-html-editor-image-dialog.c:563
+#: ../e-util/e-html-editor-image-dialog.c:607
 msgid "_Height:"
 msgstr "_Altuera:"
 
-#: ../e-util/e-html-editor-image-dialog.c:604
+#: ../e-util/e-html-editor-image-dialog.c:648
 msgid "_X-Padding:"
 msgstr "_X betegarria:"
 
-#: ../e-util/e-html-editor-image-dialog.c:620
+#: ../e-util/e-html-editor-image-dialog.c:664
 msgid "_Y-Padding:"
 msgstr "_Y betegarria:"
 
-#: ../e-util/e-html-editor-image-dialog.c:636
-#: ../e-util/e-html-editor-table-dialog.c:809
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:884
 msgid "_Border:"
 msgstr "_Ertza:"
 
-#: ../e-util/e-html-editor-image-dialog.c:646
+#: ../e-util/e-html-editor-image-dialog.c:690
 msgid "<b>Link</b>"
 msgstr "<b>Esteka</b>"
 
-#: ../e-util/e-html-editor-image-dialog.c:664
-#: ../e-util/e-html-editor-link-dialog.c:334
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:352
 msgid "_URL:"
 msgstr "_URLa:"
 
-#: ../e-util/e-html-editor-image-dialog.c:669
-#: ../e-util/e-html-editor-link-dialog.c:339
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:357
 msgid "_Test URL..."
 msgstr "_Probatu URLa..."
 
-#: ../e-util/e-html-editor-image-dialog.c:686
+#: ../e-util/e-html-editor-image-dialog.c:730
 msgid "Image Properties"
 msgstr "Irudiaren propietateak"
 
-#: ../e-util/e-html-editor-link-dialog.c:363
+#: ../e-util/e-html-editor-link-dialog.c:381
 msgid "_Remove Link"
 msgstr "_Kendu esteka"
 
-#: ../e-util/e-html-editor-link-dialog.c:388
+#: ../e-util/e-html-editor-link-dialog.c:406
 msgid "Link Properties"
 msgstr "Estekaren propietateak"
 
-#: ../e-util/e-html-editor-page-dialog.c:69
+#: ../e-util/e-html-editor-page-dialog.c:71
 msgid "Perforated Paper"
 msgstr "Zulatutako papera"
 
-#: ../e-util/e-html-editor-page-dialog.c:78
+#: ../e-util/e-html-editor-page-dialog.c:80
 msgid "Blue Ink"
 msgstr "Tinta urdina"
 
-#: ../e-util/e-html-editor-page-dialog.c:87
+#: ../e-util/e-html-editor-page-dialog.c:89
 msgid "Paper"
 msgstr "Papera"
 
-#: ../e-util/e-html-editor-page-dialog.c:96
+#: ../e-util/e-html-editor-page-dialog.c:98
 msgid "Ribbon"
 msgstr "Zinta"
 
-#: ../e-util/e-html-editor-page-dialog.c:105
+#: ../e-util/e-html-editor-page-dialog.c:107
 msgid "Midnight"
 msgstr "Gauerdian"
 
-#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../e-util/e-html-editor-page-dialog.c:125 ../mail/filtertypes.xml.in.h:36
 #: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: ../e-util/e-html-editor-page-dialog.c:132
+#: ../e-util/e-html-editor-page-dialog.c:134
 msgid "Graph Paper"
 msgstr "Paper grafikoa"
 
-#: ../e-util/e-html-editor-page-dialog.c:415
+#: ../e-util/e-html-editor-page-dialog.c:478
 msgid "<b>Colors</b>"
 msgstr "<b>Koloreak</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:434
+#: ../e-util/e-html-editor-page-dialog.c:497
 msgid "_Text:"
 msgstr "_Testua:"
 
-#: ../e-util/e-html-editor-page-dialog.c:449
+#: ../e-util/e-html-editor-page-dialog.c:512
 msgid "_Link:"
 msgstr "_Esteka:"
 
-#: ../e-util/e-html-editor-page-dialog.c:464
+#: ../e-util/e-html-editor-page-dialog.c:527
 msgid "_Background:"
 msgstr "_Atzeko planoa:"
 
-#: ../e-util/e-html-editor-page-dialog.c:472
+#: ../e-util/e-html-editor-page-dialog.c:535
 msgid "<b>Background Image</b>"
 msgstr "<b>Atzeko planoko irudia</b>"
 
-#: ../e-util/e-html-editor-page-dialog.c:494
+#: ../e-util/e-html-editor-page-dialog.c:557
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "_Template:"
 msgstr "_Txantiloia:"
 
-#: ../e-util/e-html-editor-page-dialog.c:502
+#: ../e-util/e-html-editor-page-dialog.c:565
 #: ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: ../e-util/e-html-editor-page-dialog.c:509
+#: ../e-util/e-html-editor-page-dialog.c:572
 msgid "_Custom:"
 msgstr "_Pertsonalizatu:"
 
-#: ../e-util/e-html-editor-page-dialog.c:536
+#: ../e-util/e-html-editor-page-dialog.c:599
 msgid "Page Properties"
 msgstr "Orriaren propietateak"
 
@@ -12585,43 +12743,44 @@ msgstr "<b>Lerrokadura</b>"
 msgid "Paragraph Properties"
 msgstr "Paragrafoaren propietateak"
 
-#: ../e-util/e-html-editor-replace-dialog.c:148
+#: ../e-util/e-html-editor-replace-dialog.c:163
 #, c-format
-msgid "%d occurences replaced"
-msgstr "%d agerpen ordeztuta"
+msgid "%d occurence replaced"
+msgid_plural "%d occurences replaced"
+msgstr[0] "agerpen %d ordeztuta"
+msgstr[1] "%d agerpen ordeztuta"
 
-#: ../e-util/e-html-editor-replace-dialog.c:209
+#: ../e-util/e-html-editor-replace-dialog.c:227
 msgid "R_eplace:"
 msgstr "_Ordeztu:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:221
+#: ../e-util/e-html-editor-replace-dialog.c:239
 msgid "_With:"
 msgstr "_Honekin:"
 
-#: ../e-util/e-html-editor-replace-dialog.c:233
+#: ../e-util/e-html-editor-replace-dialog.c:251
 msgid "_Case sensitive"
 msgstr "_Maiuskula/minuskula"
 
-#: ../e-util/e-html-editor-replace-dialog.c:237
+#: ../e-util/e-html-editor-replace-dialog.c:255
 msgid "Wra_p search"
 msgstr "Bilaketa _jarraitua"
 
-#: ../e-util/e-html-editor-replace-dialog.c:247
+#: ../e-util/e-html-editor-replace-dialog.c:265
 msgid "_Skip"
 msgstr "_Saltatu"
 
-#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-html-editor-replace-dialog.c:273
 #: ../e-util/e-system.error.xml.h:3
 msgid "_Replace"
 msgstr "_Ordeztu"
 
-#: ../e-util/e-html-editor-replace-dialog.c:263
+#: ../e-util/e-html-editor-replace-dialog.c:281
 msgid "Replace _All"
 msgstr "Ordeztu _guztiak"
 
-#. Replace
-#: ../e-util/e-html-editor-replace-dialog.c:283
-#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#: ../e-util/e-html-editor-replace-dialog.c:301
+msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Ordeztu"
 
@@ -12630,71 +12789,76 @@ msgstr "Ordeztu"
 msgid "<b>Suggestions for '%s'</b>"
 msgstr "<b>'%s'(r)en iradokizunak</b>"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:501
+#: ../e-util/e-html-editor-spell-check-dialog.c:505
 msgid "<b>Suggestions</b>"
 msgstr "<b>Iradokizunak</b>"
 
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:540
+msgid "Replace"
+msgstr "Ordeztu"
+
 #. Replace All
-#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#: ../e-util/e-html-editor-spell-check-dialog.c:549
 msgid "Replace All"
 msgstr "Ordeztu denak"
 
 #. Ignore
-#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../e-util/e-html-editor-spell-check-dialog.c:558
 #: ../mail/mail.error.xml.h:109
 msgid "Ignore"
 msgstr "Ez ikusi egin"
 
 #. Skip
-#: ../e-util/e-html-editor-spell-check-dialog.c:563
+#: ../e-util/e-html-editor-spell-check-dialog.c:567
 msgid "Skip"
 msgstr "Saltatu"
 
 #. Back
-#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#: ../e-util/e-html-editor-spell-check-dialog.c:576
 msgid "Back"
 msgstr "Atzera"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:581
+#: ../e-util/e-html-editor-spell-check-dialog.c:585
 msgid "<b>Dictionary</b>"
 msgstr "<b>Hiztegia</b>"
 
 #. Add Word button
-#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#: ../e-util/e-html-editor-spell-check-dialog.c:605
 msgid "Add word"
 msgstr "Gehitu hitza"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:618
-#: ../mail/mail-config.ui.h:36
+#: ../e-util/e-html-editor-spell-check-dialog.c:622
+#: ../mail/mail-config.ui.h:37
 msgid "Spell Checking"
 msgstr "Ortografia-egiaztapena"
 
-#: ../e-util/e-html-editor-table-dialog.c:707
+#: ../e-util/e-html-editor-table-dialog.c:782
 msgid "_Rows:"
 msgstr "_Errenkadak:"
 
-#: ../e-util/e-html-editor-table-dialog.c:724
+#: ../e-util/e-html-editor-table-dialog.c:799
 msgid "C_olumns:"
 msgstr "_Zutabeak:"
 
-#: ../e-util/e-html-editor-table-dialog.c:775
+#: ../e-util/e-html-editor-table-dialog.c:850
 msgid "_Spacing:"
 msgstr "_Tartea:"
 
-#: ../e-util/e-html-editor-table-dialog.c:792
+#: ../e-util/e-html-editor-table-dialog.c:867
 msgid "_Padding:"
 msgstr "_Betegarria:"
 
-#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-table-dialog.c:931
 #: ../e-util/e-html-editor-text-dialog.c:261
 msgid "_Color:"
 msgstr "_Kolorea:"
 
-#: ../e-util/e-html-editor-table-dialog.c:882
+#: ../e-util/e-html-editor-table-dialog.c:957
 msgid "Image:"
 msgstr "Irudia:"
 
-#: ../e-util/e-html-editor-table-dialog.c:909
+#: ../e-util/e-html-editor-table-dialog.c:984
 msgid "Table Properties"
 msgstr "Taularen propietateak"
 
@@ -12706,30 +12870,14 @@ msgstr "Ta_maina:"
 msgid "Text Properties"
 msgstr "Testuaren propietateak"
 
-#: ../e-util/e-html-editor-view.c:3149
+#: ../e-util/e-html-editor-view.c:4952
 msgid "Changed property"
 msgstr "Propietatea aldatuta"
 
-#: ../e-util/e-html-editor-view.c:3150
+#: ../e-util/e-html-editor-view.c:4953
 msgid "Whether editor changed"
 msgstr "Editorea aldatu den ala ez"
 
-#: ../e-util/e-html-editor-view.c:6898
-msgid ""
-"Turning HTML mode off will cause the text to lose all formatting. Do you "
-"want to continue?"
-msgstr ""
-"HTML modua desaktibatzeak testuaren formatu osoa galtzea dakar. Jarraitu "
-"nahi duzu?"
-
-#: ../e-util/e-html-editor-view.c:6902
-msgid "_Don't lose formatting"
-msgstr "_Ez galdu formatua"
-
-#: ../e-util/e-html-editor-view.c:6903
-msgid "_Lose formatting"
-msgstr "_Galdu formatua"
-
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -12878,13 +13026,6 @@ msgstr ""
 "erabiliko da. Idazten duzun izena bistaratzeko\n"
 "bakarrik erabiliko da."
 
-#: ../e-util/e-mail-signature-script-dialog.c:415
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../mail/e-mail-config-identity-page.c:327
-#: ../mail/e-mail-config-summary-page.c:339
-msgid "_Name:"
-msgstr "_Izena:"
-
 #: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "_Script-a:"
@@ -12905,34 +13046,39 @@ msgstr ""
 "Saguan oinarritutako mapa elkarreragilea ordu-zona hautatzeko. Teklatuarekin "
 "beheko goitibeherako konbinazio-koadroa erabil daiteke."
 
-#: ../e-util/e-misc-utils.c:248
+#: ../e-util/e-misc-utils.c:249
 msgid "Could not open the link."
 msgstr "Ezin izan da esteka ireki."
 
-#: ../e-util/e-misc-utils.c:295
+#: ../e-util/e-misc-utils.c:331
 msgid "Could not display help for Evolution."
 msgstr "Ezin izan da Evolution-en laguntza bistaratu."
 
-#: ../e-util/e-misc-utils.c:2415
+#: ../e-util/e-misc-utils.c:2384
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "'%s' egutegia irekitzen"
 
-#: ../e-util/e-misc-utils.c:2418
+#: ../e-util/e-misc-utils.c:2387
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "'%s' zirkularrak irekitzen"
 
-#: ../e-util/e-misc-utils.c:2421
+#: ../e-util/e-misc-utils.c:2390
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "'%s' zereginak irekitzen"
 
-#: ../e-util/e-misc-utils.c:2424
+#: ../e-util/e-misc-utils.c:2393
 #, c-format
 msgid "Opening address book '%s'"
 msgstr "'%s' helbide-liburua irekitzen"
 
+#: ../e-util/e-misc-utils.c:3127
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Ez erakutsi mezu hau berriro."
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Erakutsi kontaktuak"
@@ -12951,7 +13097,7 @@ msgstr "_Bilatu:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1215
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
 #: ../modules/calendar/e-cal-shell-view-actions.c:1573
 #: ../modules/calendar/e-memo-shell-view-actions.c:709
 #: ../modules/calendar/e-task-shell-view-actions.c:881
@@ -13199,6 +13345,7 @@ msgid "Reached top of page, continued from bottom"
 msgstr "Orrialdearen gora iritsi da, jarraitu behetik"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:420
 #: ../modules/mail/e-mail-shell-view.c:1163
 #: ../smime/gui/certificate-manager.c:1669
@@ -13344,29 +13491,29 @@ msgstr "Itzuli jakinarazpena"
 msgid "Sta_tus Tracking"
 msgstr "_Egoeraren jarraipena"
 
-#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 msgid "Name:"
 msgstr "Izena:"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1305
+#: ../e-util/e-source-config.c:1311
 msgid "Refresh every"
 msgstr "Freskatzeko maiztasuna: "
 
-#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
 msgid "Use a secure connection"
 msgstr "Erabili konexio segurua"
 
-#: ../e-util/e-source-config.c:1431
+#: ../e-util/e-source-config.c:1437
 msgid "Unset _trust for SSL certificate"
 msgstr "Kendu SSL ziurtagiriaren _fidagarritasuna"
 
-#: ../e-util/e-source-config.c:1467
+#: ../e-util/e-source-config.c:1473
 msgid "User"
 msgstr "Erabiltzailea"
 
@@ -13394,26 +13541,26 @@ msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:379
+#: ../e-util/e-spell-entry.c:408
 msgid "(no suggestions)"
 msgstr "(iradokizunik ez)"
 
-#: ../e-util/e-spell-entry.c:403
+#: ../e-util/e-spell-entry.c:432
 msgid "More..."
 msgstr "Gehiago..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:488
+#: ../e-util/e-spell-entry.c:517
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Gehitu '%s' hiztegiari"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:537
+#: ../e-util/e-spell-entry.c:566
 msgid "Ignore All"
 msgstr "Ez ikusi egin denei"
 
-#: ../e-util/e-spell-entry.c:569
+#: ../e-util/e-spell-entry.c:598
 msgid "Spelling Suggestions"
 msgstr "Zuzenketa ortografikoaren iradokizunak"
 
@@ -13573,8 +13720,6 @@ msgid "Choose the order of information to appear in the message list."
 msgstr "Aukeratu informazioaren ordena mezuen zerrendan agertzeko."
 
 #: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:281
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:191
 msgid "_Apply"
 msgstr "_Aplikatu"
 
@@ -13780,7 +13925,7 @@ msgid "Flags"
 msgstr "Banderak"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:722
+#: ../mail/e-mail-config-identity-page.c:721
 msgid "Identity"
 msgstr "Identitatea"
 
@@ -13820,59 +13965,59 @@ msgstr "Gorde _irudia..."
 msgid "Save the image to a file"
 msgstr "Gorde irudia fitxategi batean"
 
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1337
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
 msgid "Select all text and images"
 msgstr "Hautatu testu eta irudi guztiak"
 
-#: ../e-util/e-web-view.c:1001
+#: ../e-util/e-web-view.c:1004
 #, c-format
 msgid "Click to call %s"
 msgstr "Egin klik %s(r)i deitzeko"
 
-#: ../e-util/e-web-view.c:1003
+#: ../e-util/e-web-view.c:1006
 msgid "Click to hide/unhide addresses"
 msgstr "Egin klik helbideak ezkutatzeko/bistaratzeko"
 
-#: ../e-util/e-web-view.c:1014
+#: ../e-util/e-web-view.c:1017
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Joan mezuaren '%s' atalera"
 
-#: ../e-util/e-web-view.c:1016
+#: ../e-util/e-web-view.c:1019
 msgid "Go to the beginning of the message"
 msgstr "Joan mezuaren hasierara"
 
-#: ../e-util/e-web-view.c:1020
+#: ../e-util/e-web-view.c:1023
 #, c-format
 msgid "Click to open %s"
 msgstr "Egin klik %s irekitzeko"
 
-#: ../e-util/e-web-view.c:2853
+#: ../e-util/e-web-view.c:2946
 msgid "Copying image to clipboard"
 msgstr "Irudia arbelean kopiatzen"
 
-#: ../e-util/e-web-view.c:3041
+#: ../e-util/e-web-view.c:3134
 msgid "Save Image"
 msgstr "Gorde irudia"
 
-#: ../e-util/e-web-view.c:3077
+#: ../e-util/e-web-view.c:3170
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Irudia '%s'(e)n gordetzen"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Desegin 'Txertatu testua'"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "Berregin 'Txertatu testua'"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "Desegin 'Ezabatu testua'"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "Berregin 'Ezabatu testua'"
 
@@ -13948,7 +14093,7 @@ msgstr "zuk zehaztutako ordua"
 msgid "a time relative to the current time"
 msgstr "uneko orduarekiko ordu erlatiboa"
 
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:85
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
 msgid "seconds"
 msgstr "segundo igarotakoan"
 
@@ -14024,7 +14169,7 @@ msgid "begin editing this cell"
 msgstr "hasi gelaxka hau editatzen"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:177
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "txandakatu gelaxka"
 
@@ -14125,11 +14270,6 @@ msgstr ""
 "Aukera honek OAuth 2.0 sarbidetzako tokena erabiliko du zerbitzariarekin "
 "konektatzeko."
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Autentifikazioaren emaitzaren kodea baliogabea (%d)"
-
 #: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -14181,37 +14321,42 @@ msgstr[1] "%d mezu gordetzen"
 msgid "Invalid folder URI '%s'"
 msgstr "Karpetaren '%s' URIa baliogabea"
 
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1174
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
 #: ../modules/mail/e-mail-shell-view-private.c:1074
 #: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "Sarrerako ontzia"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1167
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../mail/importers/kmail-libs.c:147
 #: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Zirriborroa"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1178
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../mail/importers/kmail-libs.c:143
 #: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "Irteerako ontzia"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1182
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../mail/importers/kmail-libs.c:145
 #: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Bidalitakoak"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1170
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../mail/importers/kmail-libs.c:149
 #: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
-#: ../plugins/templates/templates.c:1442
+#: ../plugins/templates/templates.c:1176 ../plugins/templates/templates.c:1478
+#: ../plugins/templates/templates.c:1488
 msgid "Templates"
 msgstr "Txantiloiak"
 
@@ -14220,17 +14365,7 @@ msgstr "Txantiloiak"
 msgid "User cancelled operation"
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa"
 
-#: ../libemail-engine/e-mail-session.c:1389
-#, c-format
-msgid "%s authentication failed"
-msgstr "'%s' autentifikazioak huts egin du"
-
-#: ../libemail-engine/e-mail-session.c:1439
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Ez da '%s' UIDa duen datuen iturbururik aurkitu"
-
-#: ../libemail-engine/e-mail-session.c:1502
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -14238,43 +14373,43 @@ msgid ""
 msgstr ""
 "Ez da helburuko helbiderik eman, mezua birbidaltzea bertan behera utzi da."
 
-#: ../libemail-engine/e-mail-session.c:1515
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "Ez da identitaterik aurkitu erabiltzeko, mezua birbidaltzea bertan behera "
 "utzi da."
 
-#: ../libemail-engine/e-mail-session.c:2509
+#: ../libemail-engine/e-mail-session.c:2360
 #, c-format
 msgid "Waiting for '%s'"
 msgstr "%s(r)en zain"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
+#: ../libemail-engine/e-mail-session-utils.c:540
 msgid "No mail transport service available"
 msgstr "Ez dago garraioaren zerbitzu erabilgarririk."
 
-#: ../libemail-engine/e-mail-session-utils.c:635
-#: ../libemail-engine/mail-ops.c:723
+#: ../libemail-engine/e-mail-session-utils.c:630
+#: ../libemail-engine/mail-ops.c:719
 #, c-format
 msgid "Posting message to '%s'"
 msgstr "Mezua '%s'(e)ra bidaltzen"
 
-#: ../libemail-engine/e-mail-session-utils.c:672
-#: ../libemail-engine/mail-ops.c:759
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du irteerako iragazkiak aplikatzean: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:702
-#: ../libemail-engine/e-mail-session-utils.c:737
-#: ../libemail-engine/mail-ops.c:783 ../libemail-engine/mail-ops.c:818
+#: ../libemail-engine/e-mail-session-utils.c:697
+#: ../libemail-engine/e-mail-session-utils.c:732
+#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
 #, c-format
 msgid "Storing sent message to '%s'"
 msgstr "Bidalitako mezua '%s'(e)n gordetzen"
 
-#: ../libemail-engine/e-mail-session-utils.c:726
-#: ../libemail-engine/mail-ops.c:807
+#: ../libemail-engine/e-mail-session-utils.c:721
+#: ../libemail-engine/mail-ops.c:803
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -14283,14 +14418,14 @@ msgstr ""
 "Huts egin du %s(r)i eranstean: %s\n"
 "Horren ordez, Bidalitakoen karpeta lokalean gehituko da."
 
-#: ../libemail-engine/e-mail-session-utils.c:756
-#: ../libemail-engine/mail-ops.c:835
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:831
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Huts egin du 'Bidalitakoen' karpeta lokalean eranstean: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:958
-#: ../libemail-engine/mail-ops.c:983 ../libemail-engine/mail-ops.c:1085
+#: ../libemail-engine/e-mail-session-utils.c:953
+#: ../libemail-engine/mail-ops.c:979 ../libemail-engine/mail-ops.c:1081
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
@@ -14331,7 +14466,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Mezuak '%s'(e)ndik hartzen"
 
-#: ../libemail-engine/mail-ops.c:753
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -14344,57 +14479,57 @@ msgstr ""
 "zure iragazkiak 'Editatu->Mezuen iragazkiak' menuan.\n"
 "Jatorrizko errorea: %s"
 
-#: ../libemail-engine/mail-ops.c:994
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: ../libemail-engine/mail-ops.c:1046
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
 msgstr[0] "Huts egin du mezua bat bidaltzean"
 msgstr[1] "Huts egin du %d / %d mezu bidaltzean"
 
-#: ../libemail-engine/mail-ops.c:1052
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Bertan behera utzita."
 
-#: ../libemail-engine/mail-ops.c:1054
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Osatuta."
 
-#: ../libemail-engine/mail-ops.c:1168
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Mezuak '%s'(e)ra eramaten"
 
-#: ../libemail-engine/mail-ops.c:1169
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Mezuak '%s'(e)n kopiatzen"
 
-#: ../libemail-engine/mail-ops.c:1288
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: ../libemail-engine/mail-ops.c:1416
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' kontua betiko ezabatzen eta biltegiratzen"
 
-#: ../libemail-engine/mail-ops.c:1417
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' kontua biltegiratzen"
 
-#: ../libemail-engine/mail-ops.c:1492
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
-#: ../libemail-engine/mail-ops.c:1584
+#: ../libemail-engine/mail-ops.c:1580
 #, c-format
 msgid "Processing folder changes in '%s'"
 msgstr "Karpetaren aldaketak '%s'(e)n prozesatzen"
@@ -14473,9 +14608,9 @@ msgid "De_fault"
 msgstr "Le_henetsi"
 
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1228
+#: ../modules/mail/em-composer-prefs.c:1263
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "Gaituta"
 
@@ -14491,16 +14626,12 @@ msgstr "Ez da helbide elektronikorik eman"
 msgid "Missing domain in email address"
 msgstr "Domeinua falta da helbide elektronikoan"
 
-#: ../mail/e-mail-backend.c:855
-msgid "Unknown background operation"
-msgstr "Atzeko planoko eragiketa ezezaguna"
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:903
 #: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Itxi leiho hau"
 
-#: ../mail/e-mail-browser.c:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Gairik ez)"
 
@@ -14522,7 +14653,7 @@ msgstr "Evolution-eko kontuaren morroia"
 msgid "_Revise Details"
 msgstr "_Berrikusi xehetasunak"
 
-#: ../mail/e-mail-config-auth-check.c:349
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr "_Begiratu zein mota onartzen diren"
 
@@ -14573,7 +14704,7 @@ msgid "Archi_ve Folder:"
 msgstr "_Artxibatu karpeta:"
 
 #: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1079
+#: ../modules/mail/em-mailer-prefs.c:1395
 msgid "Choose a folder to archive messages to."
 msgstr "Aukeratu karpeta mezuak hor artxibatzeko."
 
@@ -14648,48 +14779,49 @@ msgstr ""
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: ../mail/e-mail-config-identity-page.c:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:346
+#: ../mail/e-mail-config-summary-page.c:352
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
-"Idatzi kontu honentzat erabili nahi duzun izena.\n"
+"Goiko izena kontu hau identifikatzeko erabiliko da.\n"
 "Adibidez 'Lanekoa' edo 'Nirea'."
 
-#: ../mail/e-mail-config-identity-page.c:364
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: ../mail/e-mail-config-identity-page.c:373
+#: ../mail/e-mail-config-identity-page.c:372
 msgid "Full Nam_e:"
 msgstr "_Izen-abizenak:"
 
-#: ../mail/e-mail-config-identity-page.c:400
+#: ../mail/e-mail-config-identity-page.c:399
 msgid "Email _Address:"
 msgstr "_Helbide elektronikoa:"
 
-#: ../mail/e-mail-config-identity-page.c:447
+#: ../mail/e-mail-config-identity-page.c:446
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: ../mail/e-mail-config-identity-page.c:456
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr "Erant_zun honi:"
 
-#: ../mail/e-mail-config-identity-page.c:483
+#: ../mail/e-mail-config-identity-page.c:482
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: ../mail/e-mail-config-identity-page.c:538
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr "Gehitu _sinadura berria..."
 
-#: ../mail/e-mail-config-identity-page.c:556
-msgid "Try _setup account automatically, based on Email Address"
+#: ../mail/e-mail-config-identity-page.c:555
+msgid "_Look up mail server details based on the entered e-mail address"
 msgstr ""
-"_Saiatu kontua automatikoki konfiguratzen. helb. elektronikoan oinarrituz"
+"_Bilatu posta-zerbitzariaren xehetasunak sartutako helb. elektronikoaren "
+"arabera."
 
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
@@ -14720,7 +14852,7 @@ msgid "%s - %s"
 msgstr "%s - %s"
 
 #: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:28
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:114
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
@@ -14745,22 +14877,22 @@ msgid "Si_gning algorithm:"
 msgstr "_Sinaduraren algoritmoa:"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:71
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -14836,45 +14968,45 @@ msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr "Zure posta atzitzeko erabiliko diren ezarpenen laburpena da."
 
-#: ../mail/e-mail-config-summary-page.c:370
+#: ../mail/e-mail-config-summary-page.c:369
 msgid "Personal Details"
 msgstr "Xehetasun pertsonalak"
 
-#: ../mail/e-mail-config-summary-page.c:379
+#: ../mail/e-mail-config-summary-page.c:378
 msgid "Full Name:"
 msgstr "Izen-abizenak:"
 
-#: ../mail/e-mail-config-summary-page.c:393
+#: ../mail/e-mail-config-summary-page.c:392
 msgid "Email Address:"
 msgstr "Helbide elektronikoa:"
 
-#: ../mail/e-mail-config-summary-page.c:407
+#: ../mail/e-mail-config-summary-page.c:406
 msgid "Receiving"
 msgstr "Mezuak jaso"
 
-#: ../mail/e-mail-config-summary-page.c:419
+#: ../mail/e-mail-config-summary-page.c:418
 msgid "Sending"
 msgstr "Mezuak bidali"
 
-#: ../mail/e-mail-config-summary-page.c:431
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr "Zerbitzari mota:"
 
-#: ../mail/e-mail-config-summary-page.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
+#: ../mail/e-mail-config-summary-page.c:451
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../mail/e-mail-config-summary-page.c:473
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../mail/e-mail-config-summary-page.c:472
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../mail/e-mail-config-summary-page.c:494
+#: ../mail/e-mail-config-summary-page.c:493
 msgid "Security:"
 msgstr "Segurtasuna:"
 
-#: ../mail/e-mail-config-summary-page.c:785
+#: ../mail/e-mail-config-summary-page.c:784
 msgid "Account Summary"
 msgstr "Kontuaren laburpena"
 
@@ -14897,27 +15029,27 @@ msgstr "Ongi etorri"
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: ../mail/e-mail-display.c:97
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr "_Gehitu helbide-liburuan..."
 
-#: ../mail/e-mail-display.c:104
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr "_Helbidera"
 
-#: ../mail/e-mail-display.c:111
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr "_Helbidetik"
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr "Bidali _erantzuna honi..."
 
-#: ../mail/e-mail-display.c:120
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr "Bidali erantzun bat helbide honetara"
 
-#: ../mail/e-mail-display.c:127
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr "Sortu _bilaketa-karpeta"
 
@@ -14939,42 +15071,42 @@ msgstr "_Karpetaren izena:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../mail/e-mail-free-form-exp.c:226
+#: ../mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: ../mail/e-mail-free-form-exp.c:227
+#: ../mail/e-mail-free-form-exp.c:237
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: ../mail/e-mail-free-form-exp.c:228
+#: ../mail/e-mail-free-form-exp.c:238
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: ../mail/e-mail-free-form-exp.c:229
+#: ../mail/e-mail-free-form-exp.c:239
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Markatuta"
 
-#: ../mail/e-mail-free-form-exp.c:230
+#: ../mail/e-mail-free-form-exp.c:240
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Ikusita"
 
-#: ../mail/e-mail-free-form-exp.c:231
+#: ../mail/e-mail-free-form-exp.c:241
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: ../mail/e-mail-free-form-exp.c:479
+#: ../mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "ez"
 
-#: ../mail/e-mail-free-form-exp.c:480
+#: ../mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "faltsua"
@@ -15012,7 +15144,7 @@ msgid "_Later"
 msgstr "_Geroago"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1124
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Add Label"
 msgstr "Gehitu etiketa"
 
@@ -15060,663 +15192,683 @@ msgstr "Goiburuaren izena"
 msgid "Header Value"
 msgstr "Goiburuaren balioa"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:118
 msgid "Headers"
 msgstr "Goiburua"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:349 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:349 ../mail/filtertypes.xml.in.h:63
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetara"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:353 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Lekuz aldatu"
 
-#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:353 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "K_opiatu"
 
-#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
-#: ../mail/e-mail-reader.c:1520
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "_Ez galdetu berriro."
 
-#: ../mail/e-mail-reader.c:1526
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Beti ezikusi egin posta-zerrenden 'Erantzun honi'"
 
-#: ../mail/e-mail-reader.c:1728
+#: ../mail/e-mail-reader.c:1731
 msgid "Failed to retrieve message:"
 msgstr "Huts egin du mezuak eskuratzean:"
 
-#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
+#: ../mail/e-mail-reader.c:1776 ../mail/e-mail-reader.c:3017
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "'%s' mezua eskuratzen"
 
-#: ../mail/e-mail-reader.c:1961
+#: ../mail/e-mail-reader.c:1964
 msgid "A_dd Sender to Address Book"
 msgstr "Ge_hitu bidaltzailea helbide-liburuan"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1966
 msgid "Add sender to address book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: ../mail/e-mail-reader.c:1968
+#: ../mail/e-mail-reader.c:1971
 msgid "_Archive..."
 msgstr "_Artxiboa..."
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1973
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Eraman hautatutako mezuak kontuaren 'Artxiboa' karpetara"
 
-#: ../mail/e-mail-reader.c:1975
+#: ../mail/e-mail-reader.c:1978
 msgid "Check for _Junk"
 msgstr "Begiratu mezu _baztergarririk dagoen"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:1980
 msgid "Filter the selected messages for junk status"
 msgstr "Iragazi hautatutako mezuak, baztergarri-egoeraren arabera"
 
-#: ../mail/e-mail-reader.c:1982
+#: ../mail/e-mail-reader.c:1985
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:1987
 msgid "Copy selected messages to another folder"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ../mail/e-mail-reader.c:1989
+#: ../mail/e-mail-reader.c:1992
 msgid "_Delete Message"
 msgstr "_Ezabatu mezua"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:1994
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko gisa"
 
-#: ../mail/e-mail-reader.c:1996
+#: ../mail/e-mail-reader.c:1999
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Sortu iragazkiaren araua _posta-zerrendarentzako..."
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2001
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sortu araua posta-zerrenda honetako mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:2003
+#: ../mail/e-mail-reader.c:2006
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Sortu iragazkiaren araua _hartzailearentzako..."
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2008
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sortu araua hartzaile hauek dituzten mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:2010
+#: ../mail/e-mail-reader.c:2013
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Sortu iragazkiaren araua _bidaltzailearentzako..."
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2015
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sortu araua bidaltzaile hau duten mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:2017
+#: ../mail/e-mail-reader.c:2020
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Sortu iragazkiaren araua _gaiarentzako..."
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2022
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sortu araua gai hau duten mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:2024
+#: ../mail/e-mail-reader.c:2027
 msgid "A_pply Filters"
 msgstr "_Aplikatu iragazkiak"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2029
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplikatu iragazki-arauak hautatutako mezuei"
 
-#: ../mail/e-mail-reader.c:2031
+#: ../mail/e-mail-reader.c:2034
 msgid "_Find in Message..."
 msgstr "_Bilatu mezuan..."
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2036
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ../mail/e-mail-reader.c:2038
+#: ../mail/e-mail-reader.c:2041
 msgid "_Clear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2043
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Kendu jarraipenaren bandera hautatutako mezuetatik"
 
-#: ../mail/e-mail-reader.c:2045
+#: ../mail/e-mail-reader.c:2048
 msgid "_Flag Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2050
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Ezarri jarraipenaren bandera osatutakoei hautatutako mezuetan"
 
-#: ../mail/e-mail-reader.c:2052
+#: ../mail/e-mail-reader.c:2055
 msgid "Follow _Up..."
 msgstr "Jarrait_u..."
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2057
 msgid "Flag the selected messages for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ../mail/e-mail-reader.c:2059
+#: ../mail/e-mail-reader.c:2062
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2064 ../mail/e-mail-reader.c:2071
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ../mail/e-mail-reader.c:2066
+#: ../mail/e-mail-reader.c:2069
 msgid "Forward As _Attached"
 msgstr "Birbidali _eranskin gisa"
 
-#: ../mail/e-mail-reader.c:2073
+#: ../mail/e-mail-reader.c:2076
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2078 ../mail/e-mail-reader.c:2085
 msgid "Forward the selected message in the body of a new message"
 msgstr "Birbidali hautatutako mezua beste mezu baten testuaren barnean"
 
-#: ../mail/e-mail-reader.c:2080
+#: ../mail/e-mail-reader.c:2083
 msgid "Forward As _Inline"
 msgstr "Birbidali _barnean gisa"
 
-#: ../mail/e-mail-reader.c:2087
+#: ../mail/e-mail-reader.c:2090
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2092 ../mail/e-mail-reader.c:2099
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ../mail/e-mail-reader.c:2094
+#: ../mail/e-mail-reader.c:2097
 msgid "Forward As _Quoted"
 msgstr "Birbidali _aipamen gisa"
 
-#: ../mail/e-mail-reader.c:2101
+#: ../mail/e-mail-reader.c:2104
 msgid "_Load Images"
 msgstr "Kargatu iru_diak"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2106
 msgid "Force images in HTML mail to be loaded"
 msgstr "Kargarazi HTML mezuetako irudiak"
 
-#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+#: ../mail/e-mail-reader.c:2111 ../mail/e-mail-reader.c:2489
 msgid "_Ignore Subthread"
 msgstr "_Ez ikusi egin azpi-hariari"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2113
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Markatu azpi-hariko mezu berriak irakurrita gisa automatikoki"
 
-#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#: ../mail/e-mail-reader.c:2118 ../mail/e-mail-reader.c:2493
 msgid "_Ignore Thread"
 msgstr "_Ez ikusi egin hariari"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2120
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Markatu hariko mezu berriak irakurrita gisa automatikoki"
 
-#: ../mail/e-mail-reader.c:2122
+#: ../mail/e-mail-reader.c:2125
 msgid "_Important"
 msgstr "_Garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2127
 msgid "Mark the selected messages as important"
 msgstr "Markatu hautatutako mezuak garrantzitsu gisa"
 
-#: ../mail/e-mail-reader.c:2129
+#: ../mail/e-mail-reader.c:2132
 msgid "_Junk"
 msgstr "_Baztergarria"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2134
 msgid "Mark the selected messages as junk"
 msgstr "Markatu hautatutako mezuak baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2136
+#: ../mail/e-mail-reader.c:2139
 msgid "_Not Junk"
 msgstr "E_z-baztergarria"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2141
 msgid "Mark the selected messages as not being junk"
 msgstr "Markatu hautatutako mezuak ez-baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2143
+#: ../mail/e-mail-reader.c:2146
 msgid "_Read"
 msgstr "_Irakurri"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2148
 msgid "Mark the selected messages as having been read"
 msgstr "Markatu hautatutako mezuak irakurritako gisa"
 
-#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#: ../mail/e-mail-reader.c:2153 ../mail/e-mail-reader.c:2513
 msgid "Do not _Ignore Subthread"
 msgstr "Ez _baztertu azpi-haria"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2155
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Ez markatu automatikoki azpi-hariko mezu berriak irakurrita gisa"
 
-#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+#: ../mail/e-mail-reader.c:2160 ../mail/e-mail-reader.c:2517
 msgid "Do not _Ignore Thread"
 msgstr "_Kontutan hartu haria"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2162
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Ez markatu hariko mezu berriak irakurrita gisa automatikoki"
 
-#: ../mail/e-mail-reader.c:2164
+#: ../mail/e-mail-reader.c:2167
 msgid "Uni_mportant"
 msgstr "Ez-garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2169
 msgid "Mark the selected messages as unimportant"
 msgstr "Markatu hautatutako mezuak ez-garrantzitsu gisa"
 
-#: ../mail/e-mail-reader.c:2171
+#: ../mail/e-mail-reader.c:2174
 msgid "_Unread"
 msgstr "_Irakurri gabea"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2176
 msgid "Mark the selected messages as not having been read"
 msgstr "Markatu hautatutako mezuak irakurri gabeko gisa"
 
-#: ../mail/e-mail-reader.c:2178
+#: ../mail/e-mail-reader.c:2181
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2183
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ireki hautatutako mezuak prestatzeko leihoan editatzeko"
 
-#: ../mail/e-mail-reader.c:2185
+#: ../mail/e-mail-reader.c:2188
 msgid "Compose _New Message"
 msgstr "Prestatu mezu _berria"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2190
 msgid "Open a window for composing a mail message"
 msgstr "Ireki posta-mezua idazteko leihoa"
 
-#: ../mail/e-mail-reader.c:2192
+#: ../mail/e-mail-reader.c:2195
 msgid "_Open in New Window"
 msgstr "Ireki leiho _berrian"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2197
 msgid "Open the selected messages in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ../mail/e-mail-reader.c:2199
+#: ../mail/e-mail-reader.c:2202
 msgid "_Move to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2204
 msgid "Move selected messages to another folder"
 msgstr "Eraman hautatutako mezuak beste karpeta batera"
 
-#: ../mail/e-mail-reader.c:2206
+#: ../mail/e-mail-reader.c:2209
 msgid "_Next Message"
 msgstr "_Hurrengo mezua"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2211
 msgid "Display the next message"
 msgstr "Bistaratu hurrengo mezua"
 
-#: ../mail/e-mail-reader.c:2213
+#: ../mail/e-mail-reader.c:2216
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu _garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2218
 msgid "Display the next important message"
 msgstr "Bistaratu hurrengo mezu garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2220
+#: ../mail/e-mail-reader.c:2223
 msgid "Next _Thread"
 msgstr "_Hurrengo haria"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2225
 msgid "Display the next thread"
 msgstr "Bistaratu hurrengo haria"
 
-#: ../mail/e-mail-reader.c:2227
+#: ../mail/e-mail-reader.c:2230
 msgid "Next _Unread Message"
 msgstr "Hurrengo _irakurri gabeko mezua"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2232
 msgid "Display the next unread message"
 msgstr "Bistaratu irakurri gabeko hurrengo mezua"
 
-#: ../mail/e-mail-reader.c:2234
+#: ../mail/e-mail-reader.c:2237
 msgid "_Previous Message"
 msgstr "_Aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2239
 msgid "Display the previous message"
 msgstr "Bistaratu aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2241
+#: ../mail/e-mail-reader.c:2244
 msgid "Pr_evious Important Message"
 msgstr "Aurreko _mezu garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2243
+#: ../mail/e-mail-reader.c:2246
 msgid "Display the previous important message"
 msgstr "Bistaratu aurreko mezu garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2248
+#: ../mail/e-mail-reader.c:2251
 msgid "Previous T_hread"
 msgstr "Aurreko _haria"
 
-#: ../mail/e-mail-reader.c:2250
+#: ../mail/e-mail-reader.c:2253
 msgid "Display the previous thread"
 msgstr "Bistaratu aurreko haria"
 
-#: ../mail/e-mail-reader.c:2255
+#: ../mail/e-mail-reader.c:2258
 msgid "P_revious Unread Message"
 msgstr "Irakurri _gabeko aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2260
 msgid "Display the previous unread message"
 msgstr "Bistaratu irakurri gabeko aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2267
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2274
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ../mail/e-mail-reader.c:2276
+#: ../mail/e-mail-reader.c:2279
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ../mail/e-mail-reader.c:2278
+#: ../mail/e-mail-reader.c:2281
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ../mail/e-mail-reader.c:2283
+#: ../mail/e-mail-reader.c:2286
 msgid "Remo_ve Attachments"
 msgstr "_Kendu eranskinak"
 
-#: ../mail/e-mail-reader.c:2285
+#: ../mail/e-mail-reader.c:2288
 msgid "Remove attachments"
 msgstr "Kendu eranskinak"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2293
 msgid "Remove Du_plicate Messages"
 msgstr "Kendu _bikoiztutako mezuak"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2295
 msgid "Checks selected messages for duplicates"
 msgstr "Markatu hautatutako mezuak bikoiztuta gisa"
 
-#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../mail/e-mail-reader.c:2300 ../mail/mail.error.xml.h:27
 #: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2302
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Prestatu hautatutako mezuaren hartzaile guztientzako erantzuna"
 
-#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2307 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2309
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2314
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2316
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Prestatu hautatutako mezuaren bidaltzailearentzako erantzuna"
 
-#: ../mail/e-mail-reader.c:2318
+#: ../mail/e-mail-reader.c:2321
 msgid "_Save as mbox..."
 msgstr "_Gorde mbox gisa..."
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2323
 msgid "Save selected messages as an mbox file"
 msgstr "Gorde hautatutako mezuak mbox gisa"
 
-#: ../mail/e-mail-reader.c:2325
+#: ../mail/e-mail-reader.c:2328
 msgid "_Message Source"
 msgstr "_Mezuaren iturburua"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2330
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ../mail/e-mail-reader.c:2339
+#: ../mail/e-mail-reader.c:2342
 msgid "_Undelete Message"
 msgstr "_Berreskuratu mezua"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2344
 msgid "Undelete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2349
 msgid "_Normal Size"
 msgstr "_Tamaina normala"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2351
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ../mail/e-mail-reader.c:2353
+#: ../mail/e-mail-reader.c:2356
 msgid "_Zoom In"
 msgstr "_Handiagotu"
 
-#: ../mail/e-mail-reader.c:2355
+#: ../mail/e-mail-reader.c:2358
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2365
 msgid "Decrease the text size"
 msgstr "Txikitu testuaren tamaina"
 
-#: ../mail/e-mail-reader.c:2369
+#: ../mail/e-mail-reader.c:2372
 msgid "Cre_ate"
 msgstr "_Sortu"
 
-#: ../mail/e-mail-reader.c:2376
+#: ../mail/e-mail-reader.c:2379
 msgid "Ch_aracter Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../mail/e-mail-reader.c:2383
+#: ../mail/e-mail-reader.c:2386
 msgid "F_orward As"
 msgstr "_Birbidali honela"
 
-#: ../mail/e-mail-reader.c:2390
+#: ../mail/e-mail-reader.c:2393
 msgid "_Group Reply"
 msgstr "Erantzun _taldeari"
 
-#: ../mail/e-mail-reader.c:2397
+#: ../mail/e-mail-reader.c:2400
 msgid "_Go To"
 msgstr "_Joan hona"
 
-#: ../mail/e-mail-reader.c:2404
+#: ../mail/e-mail-reader.c:2407
 msgid "Mar_k As"
 msgstr "Mar_katu honela"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2414
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2421
 msgid "_Zoom"
 msgstr "_Zooma"
 
-#: ../mail/e-mail-reader.c:2428
+#: ../mail/e-mail-reader.c:2431
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Sortu _posta-zerrendaren bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2433
 msgid "Create a search folder for this mailing list"
 msgstr "Sortu bilaketa-karpeta posta-zerrenda honentzat"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2438
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Sortu _hartzailearen bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2437
+#: ../mail/e-mail-reader.c:2440
 msgid "Create a search folder for these recipients"
 msgstr "Sortu bilaketa-karpeta hartzaile hauentzat"
 
-#: ../mail/e-mail-reader.c:2442
+#: ../mail/e-mail-reader.c:2445
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Sortu _bidaltzailearen bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2444
+#: ../mail/e-mail-reader.c:2447
 msgid "Create a search folder for this sender"
 msgstr "Sortu bilaketa-karpeta bidaltzaile honentzat"
 
-#: ../mail/e-mail-reader.c:2449
+#: ../mail/e-mail-reader.c:2452
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Sortu _gaiaren bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2454
 msgid "Create a search folder for this subject"
 msgstr "Sortu bilaketa-karpeta gai honentzat"
 
-#: ../mail/e-mail-reader.c:2478
+#: ../mail/e-mail-reader.c:2481
 msgid "Mark for Follo_w Up..."
 msgstr "Markatu jarraitasunerako..."
 
-#: ../mail/e-mail-reader.c:2494
+#: ../mail/e-mail-reader.c:2497
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: ../mail/e-mail-reader.c:2498
+#: ../mail/e-mail-reader.c:2501
 msgid "Mark as _Junk"
 msgstr "Markatu _baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2502
+#: ../mail/e-mail-reader.c:2505
 msgid "Mark as _Not Junk"
 msgstr "Markatu _ez baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2506
+#: ../mail/e-mail-reader.c:2509
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: ../mail/e-mail-reader.c:2518
+#: ../mail/e-mail-reader.c:2521
 msgid "Mark as Uni_mportant"
 msgstr "Markatu _ez-garrantzitsu gisa"
 
-#: ../mail/e-mail-reader.c:2522
+#: ../mail/e-mail-reader.c:2525
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ../mail/e-mail-reader.c:2566
+#: ../mail/e-mail-reader.c:2569
 msgid "_Caret Mode"
 msgstr "Kurtsore _modua"
 
-#: ../mail/e-mail-reader.c:2568
+#: ../mail/e-mail-reader.c:2571
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Erakutsi kurtsore keinukaria bistaratutako mezuen gorputzean"
 
-#: ../mail/e-mail-reader.c:2574
+#: ../mail/e-mail-reader.c:2577
 msgid "All Message _Headers"
 msgstr "Mezu guztien _goiburuak"
 
-#: ../mail/e-mail-reader.c:2576
+#: ../mail/e-mail-reader.c:2579
 msgid "Show messages with all email headers"
 msgstr "Erakutsi mezuak posta-goiburu guztiekin"
 
-#: ../mail/e-mail-reader.c:3019
+#: ../mail/e-mail-reader.c:3023
 msgid "Retrieving message"
 msgstr "Mezua eskuratzen"
 
-#: ../mail/e-mail-reader.c:4027
+#: ../mail/e-mail-reader.c:4045
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: ../mail/e-mail-reader.c:4028
+#: ../mail/e-mail-reader.c:4046
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: ../mail/e-mail-reader.c:4047
+#: ../mail/e-mail-reader.c:4065
 msgid "Group Reply"
 msgstr "Erantzun taldeari"
 
-#: ../mail/e-mail-reader.c:4048
+#: ../mail/e-mail-reader.c:4066
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Erantzun posta-zerrendari, edo hartzaile guztiei"
 
-#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
+#: ../mail/e-mail-reader.c:4132 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../mail/e-mail-reader.c:4126
+#: ../mail/e-mail-reader.c:4144
 #: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../mail/e-mail-reader.c:4130
+#: ../mail/e-mail-reader.c:4148
 #: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4157 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Erantzun"
 
+#: ../mail/e-mail-reader.c:5203
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "Baimendu '%s'(e)ngo edozeinen urruneko edukia"
+
+#: ../mail/e-mail-reader.c:5205
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "Baimendu '%s'(r)en urruneko edukia"
+
+#: ../mail/e-mail-reader.c:5222
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "Baimendu '%s'(e)ngo urruneko edukia"
+
+#: ../mail/e-mail-reader.c:5278
+msgid "Load remote content"
+msgstr "Kargatu urruneko edukia"
+
 #: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Ez abisatu berriro"
 
 #: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../shell/e-shell.c:867 ../shell/e-shell.c:888
 #: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../mail/e-mail-reader-utils.c:1033
+#: ../mail/e-mail-reader-utils.c:1043
 msgid "Marking thread to be ignored"
 msgstr "Markatu haria ez ikusi egiteko"
 
-#: ../mail/e-mail-reader-utils.c:1037
+#: ../mail/e-mail-reader-utils.c:1047
 msgid "Unmarking thread from being ignored"
 msgstr "Kendu hariaren 'ez ikusi egin' marka"
 
-#: ../mail/e-mail-reader-utils.c:1041
+#: ../mail/e-mail-reader-utils.c:1051
 msgid "Marking subthread to be ignored"
 msgstr "Markatu azpi-haria ez ikusi egiteko"
 
-#: ../mail/e-mail-reader-utils.c:1045
+#: ../mail/e-mail-reader-utils.c:1055
 msgid "Unmarking subthread from being ignored"
 msgstr "Kendu azpi-hariaren 'ez ikusi egin' marka"
 
-#: ../mail/e-mail-reader-utils.c:1280
+#: ../mail/e-mail-reader-utils.c:1294
 msgid "Printing"
 msgstr "Inprimatzen"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1515
+#: ../mail/e-mail-reader-utils.c:1529
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -15730,7 +15882,7 @@ msgstr[1] ""
 "'%s' karpetak bikoiztutako %u mezu ditu. Ziur zaude horiek ezabatzea nahi "
 "dituzula?"
 
-#: ../mail/e-mail-reader-utils.c:2345
+#: ../mail/e-mail-reader-utils.c:2359
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gorde mezua"
@@ -15741,13 +15893,13 @@ msgstr[1] "Gorde mezuak"
 #. * 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:2366
+#: ../mail/e-mail-reader-utils.c:2380
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mezua"
 msgstr[1] "Mezuak"
 
-#: ../mail/e-mail-reader-utils.c:2739
+#: ../mail/e-mail-reader-utils.c:2753
 msgid "Parsing message"
 msgstr "Mezua analizatzen"
 
@@ -15759,11 +15911,21 @@ msgstr "Mezuak ez dauka edukirik."
 msgid "Flag to Follow Up"
 msgstr "Markatu jarraipena egiteko"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "'%s' autentifikazioak huts egin du"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Ez da '%s' UIDa duen datuen iturbururik aurkitu"
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1507
+#: ../mail/em-composer-utils.c:1542
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -15771,24 +15933,24 @@ msgstr ""
 "Jatorrizko mezua: ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} ${24Hour}:"
 "${Minute} ${TimeZone}, egilea: ${Sender}"
 
-#: ../mail/em-composer-utils.c:1513
+#: ../mail/em-composer-utils.c:1548
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Birbidalitako mezua --------"
 
-#: ../mail/em-composer-utils.c:1518
+#: ../mail/em-composer-utils.c:1553
 msgid "-----Original Message-----"
 msgstr "-------- Jatorrizko mezua --------"
 
-#: ../mail/em-composer-utils.c:2668
+#: ../mail/em-composer-utils.c:2731
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3076
+#: ../mail/em-composer-utils.c:3170
 msgid "Posting destination"
 msgstr "Bidalketa-helburua"
 
-#: ../mail/em-composer-utils.c:3081
+#: ../mail/em-composer-utils.c:3175
 msgid "Choose folders to post the message to."
 msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
 
@@ -15869,12 +16031,12 @@ msgstr "%s karpeta lekuz aldatzen"
 msgid "Copying folder %s"
 msgstr "%s karpeta kopiatzen"
 
-#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s karpetara eramaten"
 
-#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s karpetan kopiatzen"
@@ -15914,7 +16076,7 @@ msgid "Subscribe To _All"
 msgstr "Harpidetu _'Denak'-era"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
@@ -15951,7 +16113,7 @@ msgid "Su_bscribe"
 msgstr "_Harpidetu"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Kendu harpidetza hautatutako karpetatik"
 
@@ -15976,8 +16138,8 @@ msgid "Refresh the folder list"
 msgstr "Freskatu karpeten zerrenda"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "_Freskatu"
 
@@ -15986,7 +16148,7 @@ msgid "Stop the current operation"
 msgstr "Gelditu uneko eragiketa"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Gelditu"
 
@@ -16001,11 +16163,11 @@ msgid_plural "Are you sure you want to open %d messages at once?"
 msgstr[0] "Ziur zaude mezu %d mezua aldi berean irekitzea nahi duzula?"
 msgstr[1] "Ziur zaude %d mezuak aldi berean irekitzea nahi dituzula?"
 
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:176
 msgid "Message Filters"
 msgstr "Posta-iragazkiak"
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:922
 #, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
@@ -16192,7 +16354,7 @@ msgstr "Garrantzitsua"
 msgid "Read"
 msgstr "Irakurrita"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:125
 #: ../mail/vfoldertypes.xml.in.h:42
 msgid "Junk"
 msgstr "Baztergarriak"
@@ -16214,129 +16376,124 @@ msgstr "ez da Banderaduna"
 
 #: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
 #: ../mail/vfoldertypes.xml.in.h:46
-msgid "Completed On"
-msgstr "Eginda: "
+msgid "is Completed"
+msgstr "osatuta dago"
 
 #: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
 #: ../mail/vfoldertypes.xml.in.h:47
-msgid "is set"
-msgstr "ezarri da"
-
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
-msgid "is not set"
-msgstr "ez da ezarri"
+msgid "is not Completed"
+msgstr "ez dago osatuta"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Message Header"
 msgstr "Mezuaren goiburua"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:51
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:52
 msgid "Pipe to Program"
 msgstr "Kanalizatu programara"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:53
 msgid "returns"
 msgstr "hau ematen du"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:54
 msgid "does not return"
 msgstr "ez du hau ematen"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:55
 msgid "returns greater than"
 msgstr "hau baino handiagoa ematen du"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns less than"
 msgstr "hau baino txikiagoa ematen du"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:57
 msgid "Junk Test"
 msgstr "Mezu baztergarrien proba"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:58
 msgid "Message is Junk"
 msgstr "Mezua baztergarria da"
 
-#: ../mail/filtertypes.xml.in.h:60
+#: ../mail/filtertypes.xml.in.h:59
 msgid "Message is not Junk"
 msgstr "Mezua ez da baztergarria"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
 msgid "Message Location"
 msgstr "Mezuaren kokalekua"
 
-#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
-#: ../mail/vfoldertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Match All"
 msgstr "Guztiekin bat etorri"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:65
 msgid "Stop Processing"
 msgstr "Utzi prozesatzeari"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:66
 msgid "Set Label"
 msgstr "Ezarri etiketa"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:67
 msgid "Assign Color"
 msgstr "Esleitu kolorea"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Unset Color"
 msgstr "Kendu kolorea"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Assign Score"
 msgstr "Esleitu puntuazioa"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Adjust Score"
 msgstr "Doitu puntuazioa"
 
-#: ../mail/filtertypes.xml.in.h:72
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
 #: ../mail/vfoldertypes.xml.in.h:38
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Unset Status"
 msgstr "Egoera ezarri gabe"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Beep"
 msgstr "Soinu-seinalea"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:75
 msgid "Play Sound"
 msgstr "Jo soinua"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Run Program"
 msgstr "Exekutatu programa"
 
-#: ../mail/filtertypes.xml.in.h:78
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Forward to"
 msgstr "Birbidali: "
 
@@ -16353,54 +16510,81 @@ msgid "Import mail from Elm."
 msgstr "Inportatu posta Elm-etik."
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Helburuko karpeta:"
 
 #: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
 #: ../plugins/dbx-import/dbx-importer.c:252
 #: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
 #: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
 #: ../plugins/dbx-import/dbx-importer.c:253
 #: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Hautatu inportazioetarako karpeta"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Gaia"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Nork"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../mail/importers/evolution-mbox-importer.c:568
 #: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkeley postontzia (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Berkeley postontzien formatuen karpeten inportatzailea"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "Helbide %d"
+msgstr[1] "%d helbide"
+
+#: ../mail/importers/kmail-importer.c:354
+msgid "Evolution KMail importer"
+msgstr "Evolution-en KMail inportatzailea"
+
+#: ../mail/importers/kmail-importer.c:355
+msgid "Import mail and contacts from KMail."
+msgstr "Inportatu posta KMail-etik."
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1082
+msgid "Trash"
+msgstr "Zakarrontzia"
+
+#: ../mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Postontzia inportatzen"
 
+#: ../mail/importers/mail-importer.c:61
+msgid "Importing mail and contacts from KMail"
+msgstr "Inportatu posta KMail-etik."
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "'%s' inportatzen"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:570
 #, c-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
@@ -16492,115 +16676,119 @@ msgid "For_mat messages in HTML"
 msgstr "Eman _HTML formatua mezuei"
 
 #: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
-msgstr "Automatikoki txertatu _aurpegieren irudiak"
+msgid "Automatically insert _emoticons"
+msgstr "Automatikoki txertatu _aurpegierak"
 
 #: ../mail/mail-config.ui.h:10
+msgid "Use Unicode characters for smile_ys"
+msgstr "Erabili Unicode karaktereak _aurpegieretan"
+
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Eskatu beti _irakurragiriak"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodetu fitxategi-izenak _Outlook/Gmail moduan"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
 msgid "Send messages through Outbo_x folder"
 msgstr "Bidali mezuak '_Irteerako ontzia' karpetaren bidez"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:14
 msgid "Number of characters for word w_rapping:"
 msgstr "Karaktere kopurua _itzulbiratzeko:"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:15
 msgid "Ch_aracter encoding:"
 msgstr "_Karaktere-kodeketa:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:16
 msgid "Replies and Forwards"
 msgstr "Erantzunak eta birbidalketak"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:17
 msgid "_Reply style:"
 msgstr "_Erantzuteko estiloa:"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:18
 msgid "_Forward style:"
 msgstr "_Birbidaltzeko estiloa:"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:19
 msgid "Start _typing at the bottom on replying"
 msgstr "Hasi _idazten behean erantzutean"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:20
 msgid "_Keep signature above the original message on replying"
 msgstr "_Mantendu sinadura jatorrizko mezuaren gainean erantzutean"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:21
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Ez ikusi egin posta-zerrenden 'Erantzun honi:'"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:22
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "'Erantzun taldeari' soilik posta-zerrendara doa, posible bada"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:23
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "_Sinatu digitalki mezuak jatorrizkoa sinatuta dagoenean (PGP edo S/MIME)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Barnean (Outlook estiloa)"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ez jarri komatxorik"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Barnean"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgid "Sig_natures"
 msgstr "_Sinadurak"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:31
 msgid "Signatures"
 msgstr "Sinadurak"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "_Languages"
 msgstr "_Hizkuntzak"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Languages Table"
 msgstr "Hizkuntzen taula"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Hiztegia instalatuta daukaten hizkuntzak bakarrik azaltzen dira zerrendan."
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid "Check spelling while I _type"
 msgstr "_Egiaztatu ortografia idatzi ahala"
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -16609,74 +16797,74 @@ msgstr ""
 "laguntzeko, berrespena galdetu da aktibatutako ekintza hauek landu aurretik:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Sending a message with an _empty subject line"
 msgstr "Mezuak _gairik gabe bidali aurretik"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a _private reply to a mailing list message"
 msgstr "_Erantzun pribatuak posta-zerrendako mezuei bidali aurretik"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Erantzuna hartzaile _kopuru handi bati bidali aurretik"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr ""
 "_Posta-zerrendak erantzun pribatua zerrendara itzultzeko baimendu aurretik"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "_Hartzaileen baliozko helbide elektronikorik gabeko mezua bidali aurretik"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Galdetu bidaltzeko _laster-tekla erabiltzean (Ktrl+Sartu)"
 
-#: ../mail/mail-config.ui.h:52
+#: ../mail/mail-config.ui.h:53
 msgid "Confirmations"
 msgstr "Berrespenak"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Use for Folders"
 msgstr "Erabili karpetentzako"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:58
 msgid "A_dd"
 msgstr "_Gehitu"
 
-#: ../mail/mail-config.ui.h:59
+#: ../mail/mail-config.ui.h:60
 msgid "Re_move"
 msgstr "_Kendu"
 
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:61
+#: ../mail/mail-config.ui.h:62
 msgid "Use for Recipients"
 msgstr "Erabili hartzaileentzako"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
+#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:863
 msgid "Account"
 msgstr "Kontua"
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:65
 msgid "Send account overrides"
 msgstr "Bidalketako kontua gainjartzea"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -16688,208 +16876,224 @@ msgstr ""
 "Hartzaileen zerrendak helbide edo izen partzialak eduki ditzake. Izen eta "
 "helbideen zatiak bereiztuta konparatzen dira,."
 
-#: ../mail/mail-config.ui.h:66
+#: ../mail/mail-config.ui.h:67
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 "_'Karpetaren gainjartzeak' lehentasuna du 'Hartzailearen gainjartzea'ren "
 "gainetik"
 
-#: ../mail/mail-config.ui.h:67
+#: ../mail/mail-config.ui.h:68
 msgid "Send Account"
 msgstr "Bidalketa kontua"
 
-#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:76
 msgid "Start up"
 msgstr "Abioan"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new _messages on start"
 msgstr "Begiratu _mezu berririk dagoen abioan"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Begiratu mezu berririk dagoen kontu _aktibo guztietan"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:79
 msgid "Message Display"
 msgstr "Mezu-bistaratzea"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "_Use the same fonts as other applications"
 msgstr "_Erabili beste aplikazioetako letra-tipo berak"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "S_tandard Font:"
 msgstr "_Letra-tipo estandarra:"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML fixed width font"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML variable width font"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "Fix_ed Width Font:"
 msgstr "_Zabalera-finkodun letra-tipoa:"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "_Mark messages as read after"
 msgstr "Markatu _mezuak irakurritako gisa honen ondoren"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Highlight _quotations with"
 msgstr "_Aipamenak nabarmentzeko erabili"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 #: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Pick a color"
 msgstr "Aukeratu kolorea"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "color"
 msgstr "kolorea"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:90
 msgid "Default character e_ncoding:"
 msgstr "Karaktere-kodeketa _lehenetsia:"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplikatu _ikuspegiaren ezarpen berdinak karpeta guztiei"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:92
 msgid "F_all back to threading messages by subject"
 msgstr "_Itzuli mezuen harira gaiaren arabera"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "Delete Mail"
 msgstr "Ezabatu mezua"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Empty _trash folders"
 msgstr "Hustu _zakarrontziko karpetak"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Confirm _when expunging a folder"
 msgstr "Berretsi ka_rpeta betiko borratu aurretik"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "Archive Mail"
 msgstr "Artxibatu mezuak"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "On This Computer A_rchive folder:"
 msgstr "'Ordenagailu honetan'-eko _Artxiboa karpeta:"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "Archive folder to use for On This Computer messages"
 msgstr "Artxiboaren karpeta 'Ordenagailu honetan'-eko mezuentzat erabiltzeko"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "_Show animated images"
 msgstr "_Erakutsi irudi-animazioak"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "Galdetu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: ../mail/mail-config.ui.h:101
-msgid "Loading Images"
-msgstr "Irudiak kargatzea"
-
 #: ../mail/mail-config.ui.h:102
-msgid "_Never load images from the Internet"
-msgstr "_Inoiz ez kargatu irudirik Internetetik"
+msgid "Loading Remote Content"
+msgstr "Urruneko edukia kargatzen"
 
 #: ../mail/mail-config.ui.h:103
-msgid "_Load images only in messages from contacts"
-msgstr "_Kargatu irudiak mezuan kontaktuetatik"
+msgid "_Never load remote content from the Internet"
+msgstr "_Inoiz ez kargatu urruneko edukirik Internetetik"
 
 #: ../mail/mail-config.ui.h:104
-msgid "_Always load images from the Internet"
-msgstr "_Beti kargatu irudiak Internetetik"
+msgid "_Load remote content only in messages from contacts"
+msgstr "_Kargatu urruneko edukia soilik mezuan kontaktuetatik"
 
 #: ../mail/mail-config.ui.h:105
+msgid "_Always load remote content from the Internet"
+msgstr "_Beti kargatu urruneko edukia Internetetik"
+
+#: ../mail/mail-config.ui.h:106
+msgid "Add"
+msgstr "Gehitu"
+
+#: ../mail/mail-config.ui.h:107
+msgid "Remove"
+msgstr "Kendu"
+
+#: ../mail/mail-config.ui.h:108
+msgid "Allow for sites:"
+msgstr "Baimendu guneetatik:"
+
+#: ../mail/mail-config.ui.h:109
+msgid "Allow for senders:"
+msgstr "Baimendu bidaltzaileetarik:"
+
+#: ../mail/mail-config.ui.h:110
 msgid "HTML Messages"
 msgstr "HTML mezuak"
 
-#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:111 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiketak"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:112
 msgid "Sender Photograph"
 msgstr "Bidaltzailearen argazkia"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:113
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Erakutsi bidaltzailearen argazkia mezuaren aurrebistan"
 
-#: ../mail/mail-config.ui.h:109
+#: ../mail/mail-config.ui.h:114
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Bilatu gra_vatarcom webgunean bidaltzailearen argazkia"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "Displayed Message Headers"
 msgstr "Bistaratutako mezuen goiburuak"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "Mail Headers Table"
 msgstr "Posta-goiburuen taula"
 
-#: ../mail/mail-config.ui.h:112
+#: ../mail/mail-config.ui.h:117
 #: ../modules/addressbook/autocompletion-config.c:117
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Data/Orduaren formatua"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:119
 msgid "Check incoming _messages for junk"
 msgstr "Begiratu _sarreran mezurik baztertzeko dagoen"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:120
 msgid "_Delete junk messages"
 msgstr "_Ezabatu mezu baztergarriak"
 
-#: ../mail/mail-config.ui.h:116
-msgid "Just Test Options"
-msgstr "Probako aukerak soilik"
+#: ../mail/mail-config.ui.h:121
+msgid "Junk Test Options"
+msgstr "Baztergarrien probako aukerak"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:122
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr ""
 "_Ez markatu mezuak baztergarri gisa bidaltzailea nire helbide-liburuan badago"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:123
 msgid "_Lookup in local address book only"
 msgstr "_Begiratu lokaleko helbide-liburuetan soilik"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:124
 msgid "Check cu_stom headers for junk"
 msgstr "_Begiratu baztergarrien aurkako goiburu pertsonalizatuak"
 
-#: ../mail/mail-config.ui.h:121
+#: ../mail/mail-config.ui.h:126
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Enkriptaziorik gabe"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:127
 msgid "TLS encryption"
 msgstr "TLS enkriptazioa"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:128
 msgid "SSL encryption"
 msgstr "SSL enkriptazioa"
 
@@ -17171,7 +17375,7 @@ msgstr ""
 "dituzula?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
@@ -17381,7 +17585,6 @@ msgid "Do _Not Disable"
 msgstr "_Ez desgaitu"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "_Desgaitu"
 
@@ -17768,6 +17971,18 @@ msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr ""
 "Huts egin du azpi-hariari  'ez ikusi egin' marka kentzean '{0}' karpetan"
 
+#: ../mail/mail.error.xml.h:181
+msgid "Remote content download had been blocked for this message."
+msgstr "Urruneko edukiaren deskarga mezu honentzako blokeatu egin da."
+
+#: ../mail/mail.error.xml.h:182
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"Urruneko edukia eskuz deskarga dezakezu, edo ezarri bidaltzaile "
+"honen edo erabilitako guneen urruneko edukia deskargatzea gogoratzeko."
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Bertan behera uzten..."
@@ -17780,7 +17995,7 @@ msgstr "Mezuak bidali eta jaso"
 msgid "Cancel _All"
 msgstr "_Utzi dena"
 
-#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1248
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
@@ -17793,17 +18008,17 @@ msgstr "Zain..."
 msgid "Checking for new mail at '%s'"
 msgstr "'%s'(e)n mezu berririk dagoen begiratzen"
 
-#: ../mail/mail-send-recv.c:1421
+#: ../mail/mail-send-recv.c:1434
 #, c-format
 msgid "Deleting junk and expunging trash at '%s'"
 msgstr "'%s'(e)ko baztergarriak eta zakarrontzia betirako ezabatzen"
 
-#: ../mail/mail-send-recv.c:1423
+#: ../mail/mail-send-recv.c:1436
 #, c-format
 msgid "Deleting junk at '%s'"
 msgstr "'%s'(e)ko baztergarriak ezabatzen"
 
-#: ../mail/mail-send-recv.c:1425
+#: ../mail/mail-send-recv.c:1438
 #, c-format
 msgid "Expunging trash at '%s'"
 msgstr "'%s' zakarrontzia betirako ezabatzen"
@@ -17860,7 +18075,7 @@ msgstr "Handia"
 msgid "Highest"
 msgstr "Handiena"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:5971
+#: ../mail/message-list.c:459 ../mail/message-list.c:6043
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -17886,20 +18101,20 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:2960
+#: ../mail/message-list.c:2967
 msgid "Select all visible messages"
 msgstr "Hautatu ikusgai dauden mezu guztiak"
 
-#: ../mail/message-list.c:3610 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Mezuak"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4918
+#: ../mail/message-list.c:4985
 msgid "Follow-up"
 msgstr "Jarraipena"
 
-#: ../mail/message-list.c:5908
+#: ../mail/message-list.c:5980
 msgid ""
 "No message satisfies your search criteria. Change search criteria by "
 "selecting a new Show message filter from the drop down list above or by "
@@ -17911,7 +18126,7 @@ msgstr ""
 "dagoen goitibeherako zerrendan, edo bilaketa berri bat exekutatuz hura "
 "garbituz (Bilatu->Garbitu menua erabiliz) edo gaineko kontsulta aldatuz."
 
-#: ../mail/message-list.c:5916
+#: ../mail/message-list.c:5988
 msgid "There are no messages in this folder."
 msgstr "Ez dago mezurik karpeta honetan."
 
@@ -17947,43 +18162,43 @@ msgstr "Gaia - moztuta"
 msgid "Any header"
 msgstr "Edozein goiburu"
 
-#: ../mail/searchtypes.xml.in.h:55
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr "Gaiak edo Helbideak hau dauka"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2109
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Recipients contain"
 msgstr "hartzaileak hau dauka"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2102
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Message contains"
 msgstr "mezuak hau dauka"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2123
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Subject contains"
 msgstr "gaiak hau dauka"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2116
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Sender contains"
 msgstr "bidaltzaileak hau dauka"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2088
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2115
 msgid "Body contains"
 msgstr "gorputzak hau dauka"
 
-#: ../mail/searchtypes.xml.in.h:61
-#: ../modules/mail/e-mail-shell-view-actions.c:2095
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
 msgid "Free form expression"
 msgstr "Formaren adierazpen askea"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:123
-#: ../modules/mail/em-mailer-prefs.c:1234
+#: ../modules/mail/em-mailer-prefs.c:1550
 msgid "_Table column:"
 msgstr "_Taulako zutabea:"
 
@@ -18035,7 +18250,7 @@ msgid "_Contact"
 msgstr "_Kontaktua"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1081
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
@@ -18045,7 +18260,7 @@ msgid "Contact _List"
 msgstr "Kontaktuen _zerrenda"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1088
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
@@ -18055,7 +18270,7 @@ msgid "Address _Book"
 msgstr "_Helbide-liburua"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:1004
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Sortu helbide-liburu berria"
 
@@ -18068,240 +18283,240 @@ msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:578
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Gorde vCard gisa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "_Kopiatu kontaktu guztiak hemen..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopiatu hautatutako helbide-liburuko kontaktuak beste batean"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "E_zabatu helbide-liburua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Ezabatu hautatutako helbide-liburua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "E_raman kontaktu guztiak hona..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "Eraman hautatutako helbide-liburuko kontaktuak beste batera"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "Helbide-liburu _berria"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "Helbide-_liburuaren propietateak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "Erakutsi hautatutako helbide-liburuaren propietateak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
 #: ../modules/calendar/e-cal-shell-view-actions.c:1254
 #: ../modules/calendar/e-memo-shell-view-actions.c:578
 #: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "_Freskatu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "Freskatu hautatutako helbide-liburua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "Helbide-liburuen _mapa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1025
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr "Erakutsi hautatutako helbide-liburuetako mapa kontaktuekin"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
 #: ../modules/calendar/e-cal-shell-view-actions.c:1261
 #: ../modules/calendar/e-memo-shell-view-actions.c:585
 #: ../modules/calendar/e-task-shell-view-actions.c:710
-#: ../modules/mail/e-mail-shell-view-actions.c:1710
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1032
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Aldatu hautatutako helbide-liburuaren izena"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1039
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Gelditu kargatzea"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Kopiatu kontaktua hemen..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1046
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Kopiatu hautatutako kontaktuak beste helbide-liburu batean"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "_Ezabatu kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Bilatu kontaktuan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1060
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "Bilatu testua bistaratutako kontaktuan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "Birbidali _kontaktua..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Bidali hautatutako kontaktuak beste norbaiti"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "E_raman kontaktua hona..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Eraman hautatutako kontaktuak beste helbide-liburu batera"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "Kontaktu _berria..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1086
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Kontaktuen _zerrenda berria..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "_Ireki kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1100
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Bidali mezua hautatutako kontaktuei"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
 #: ../modules/calendar/e-cal-shell-view-actions.c:1417
 #: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Ekintzak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
 #: ../modules/calendar/e-memo-shell-view-actions.c:622
 #: ../modules/calendar/e-task-shell-view-actions.c:775
-#: ../modules/mail/e-mail-shell-view-actions.c:1875
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Aurrebista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "Helbide-liburuen mapa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "Kontaktuen _aurrebista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "Erakutsi kontaktu-aurrebistaren leihoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Erakutsi _mapak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1179
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "Erakutsi mapak kontaktu-aurrebistaren leihoan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
 #: ../modules/calendar/e-memo-shell-view-actions.c:692
 #: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:2032
 msgid "_Classic View"
 msgstr "_Ikuspegi klasikoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "Erakutsi kontaktuaren aurrebista kontaktuen zerrendaren azpian"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 #: ../modules/calendar/e-memo-shell-view-actions.c:699
 #: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2039
 msgid "_Vertical View"
 msgstr "Ikuspegi _bertikala"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr "Erakutsi kontaktuen aurrebista kontaktuen zerrendaren alboan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1222
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
 #: ../modules/calendar/e-cal-shell-view-actions.c:1594
 #: ../modules/calendar/e-memo-shell-view-actions.c:716
 #: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Sailkatu gabeak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
 #: ../modules/calendar/e-cal-shell-view-actions.c:1604
 #: ../modules/calendar/e-memo-shell-view-actions.c:726
 #: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2081
+#: ../modules/mail/e-mail-shell-view-actions.c:2108
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1265
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Inprimatu erakutsitako kontaktu guztiak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1272
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "Aurreikusi inprimatuko diren kontaktuak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1279
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1294
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "_Gorde helbide-liburua vCard gisa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1296
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Gorde hautatutako helbide-liburuko kontaktuak vCard gisa"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1302
-#: ../modules/addressbook/e-book-shell-view-actions.c:1312
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Gorde vCard gisa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1304
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "Gorde hautatutako kontaktuak vCard gisa"
 
@@ -18363,7 +18578,7 @@ msgid "Select name of the Evolution backup file to restore"
 msgstr "Hautatu Evolution-en babeskopiaren izena leheneratzeko"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
+msgid "Re_start Evolution after restore"
 msgstr "_Berrabiatu Evolution leheneratu ondoren"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:307
@@ -18404,7 +18619,7 @@ msgstr "Interfaze grafikoarekin"
 
 #. FIXME Will the versioned setting always work?
 #: ../modules/backup-restore/evolution-backup-tool.c:281
-#: ../modules/backup-restore/evolution-backup-tool.c:475
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "Evolution ixten"
 
@@ -18423,65 +18638,65 @@ msgid "Back up complete"
 msgstr "Babeskopia osatuta"
 
 #: ../modules/backup-restore/evolution-backup-tool.c:330
-#: ../modules/backup-restore/evolution-backup-tool.c:665
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "Evolution berrabiatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:481
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Egin uneko Evolution-en datuen babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:488
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Fitxategiak babeskopiatik erauzten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Evolution-en ezarpenak kargatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Aldi baterako babeseko fitxategiak ezabatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:650
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Erregistroaren zerbitzua birkargatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:853
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 msgid "Evolution Back Up"
 msgstr "Evolution-en babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:854
+#: ../modules/backup-restore/evolution-backup-tool.c:868
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Babeskopia %s karpetan gordetzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:858
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 msgid "Evolution Restore"
 msgstr "Evolution leheneratzea"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:859
+#: ../modules/backup-restore/evolution-backup-tool.c:873
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s karpetatik leheneratzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:928
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Backing up Evolution Data"
 msgstr "Evolution-en datuen babeskopia egiten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:929
+#: ../modules/backup-restore/evolution-backup-tool.c:943
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Itxaron Evolution-ek zure datuen babeskopia egiten duen bitartean."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:931
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Restoring Evolution Data"
 msgstr "Evolution-eko datuak berreskuratzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:932
+#: ../modules/backup-restore/evolution-backup-tool.c:946
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Itxaron Evolution-ek zure datuak berreskuratzen dituen bitartean."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:954
+#: ../modules/backup-restore/evolution-backup-tool.c:968
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Honek nahikoa iraun dezake zure kontuko datu kopuruaren arabera."
 
@@ -18506,8 +18721,8 @@ msgstr ""
 "behar duzu. Ziurtatu zaitez gorde gabeko datuak gordetzeaz jarraitu aurretik."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Itxi eta egin Evolution-en babeskopia"
+msgid "Close and _Back up Evolution"
+msgstr "Itxi eta _egin Evolution-en babeskopia"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -18529,8 +18744,8 @@ msgstr ""
 "leheneratuko ditu."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Itxi eta leheneratu Evolution"
+msgid "Close and _Restore Evolution"
+msgstr "Itxi eta _leheneratu Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
@@ -18540,28 +18755,28 @@ msgstr "Ez dituzu nahikoa baimen"
 msgid "The selected folder is not writable."
 msgstr "Hautatutako karpetan ezin da idatzi."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Huts egin du Bogofilter (%s) abiaraztean: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Huts egin du mezuaren edukia Bogofilter-era igortzean: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter kraskatu egin da edo huts egin du mezua prozesatzean"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Bogofilter-en aukerak"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Bihurtu mezuaren testua _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:539
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
@@ -18570,67 +18785,67 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "Baztergarriak iragazteko Bogofilter erabiltzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
 msgid "Standard LDAP Port"
 msgstr "LDAParen ataka estandarra"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP SSL gainean (zaharkitua)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft-en Katalogo Globala"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Microsoft-en Katalogo Globala SSL gainean"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr "LDAParekin konektatzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Zerbitzariaren datuak"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Ataka:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (gomendatua)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr "Enkriptatzea:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
 #: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Anonimoa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr "Helbide elektronikoa erabiliz"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizlea (DN) erabiliz"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr "Metodoa:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -18641,36 +18856,36 @@ msgstr ""
 "dela LDAP zerbitzarian."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr "LDAP erabiltzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr "Bilaketa-oinarria:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Find Possible Search Bases"
 msgstr "Bilatu bilaketa-oinarri posibleak"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr "Maila bat"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr "Azpizuhaitza"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr "Bilaketa-esparrua: "
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 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 "
@@ -18683,28 +18898,28 @@ msgstr ""
 "\"Maila bat\" bilaketa-esparruak oinarritik maila bat beherago arteko "
 "sarrerak bakarrik hartuko ditu."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr "Bilaketa-iragazkia:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Deskargatzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr "Muga:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr "kontaktuak"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Browse until limit is reached"
 msgstr "Arakatu muga gainditu arte"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "URLa:"
@@ -18713,61 +18928,38 @@ msgstr "URLa:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Saihestu IfMatch (Apache < 2.2.8 bertsioan behar da)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:413
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP-ren errorea: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
-msgid "Could not parse response"
-msgstr "Ezin izan da erantzuna analizatu: "
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
-msgid "Empty response"
-msgstr "Erantzuna hutsik"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:458
-msgid "Unexpected reply from server"
-msgstr "Ustekabeko erantzuna zerbitzaritik"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1065
-msgid "Could not locate user's calendars"
-msgstr "Ezin izan da erabiltzaileren egutegirik kokatu"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
-msgid "Path"
-msgstr "Bide-izena"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:198
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:213
 msgid "Choose a Calendar"
 msgstr "Aukeratu egutegia"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:217
 msgid "Choose a Memo List"
 msgstr "Aukeratu zirkularren zerrenda"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../modules/cal-config-google/e-google-chooser-button.c:221
 msgid "Choose a Task List"
 msgstr "Aukeratu zereginen zerrenda"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Bilatu egutegiak"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr "Bilatu zirkularren zerrendak"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr "Bilatu zereginen zerrendak"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "Helb. el.:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr "Zerbitzariak bileren gonbidapenak kudeatzen ditu"
 
@@ -18779,36 +18971,27 @@ msgstr "Aukeratu zein helbide-liburu erabiliko diren."
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Erabili urtebetetze eta urteurrenen egutegian"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:125
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "Erabiltzailearen egutegi lehenetsia"
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Idatzi Google-eko '%s' erabiltzailearen pasahitza."
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "Erabiltzaileak pasahitza ematea baztertu du"
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Erabili existitzen den iCalendar (ics) fitxategi bat"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "iCalendar fitxategia"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Aukeratu iCalendar fitxategia"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Fitxategia:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr "Baimendu Evolution-ek fitxategia eguneratzea"
 
@@ -18818,29 +19001,29 @@ msgstr "Baimendu Evolution-ek fitxategia eguneratzea"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr "Fahrenheit (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr "Celsius (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Unitateak:"
 
@@ -19156,10 +19339,6 @@ msgstr "Hautatu egutegiak oroigarrien jakinarazpenerako"
 msgid "Default Free/Busy Server"
 msgstr "Libre/lanpetuta' zerbitzari lehenetsia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
-msgid "Template:"
-msgstr "Txantiloia"
-
 #: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
@@ -20295,273 +20474,273 @@ msgstr ""
 msgid "%s has canceled the following shared memo:"
 msgstr "%s(e)k partekatutako zirkular hau bertan behera utzi du:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:676
 msgid "All day:"
 msgstr "Egun osoa:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "Hasiera-data:"
 
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1494
+#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:1517
 msgid "Start time:"
 msgstr "Hasiera:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:691
 msgid "End day:"
 msgstr "Amaiera-data:"
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1495
+#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "End time:"
 msgstr "Amaiera-ordua:"
 
-#: ../modules/itip-formatter/itip-view.c:1020
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Ope_n Calendar"
 msgstr "_Ireki egutegia"
 
-#: ../modules/itip-formatter/itip-view.c:1023
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Decline all"
 msgstr "_Ukatu denak"
 
-#: ../modules/itip-formatter/itip-view.c:1026
+#: ../modules/itip-formatter/itip-view.c:1047
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../modules/itip-formatter/itip-view.c:1029
+#: ../modules/itip-formatter/itip-view.c:1050
 msgid "_Tentative all"
 msgstr "_Behin-behinekoak denak"
 
-#: ../modules/itip-formatter/itip-view.c:1032
+#: ../modules/itip-formatter/itip-view.c:1053
 msgid "_Tentative"
 msgstr "_Behin-behinekoa"
 
-#: ../modules/itip-formatter/itip-view.c:1035
+#: ../modules/itip-formatter/itip-view.c:1056
 msgid "Acce_pt all"
 msgstr "Onartu _denak"
 
-#: ../modules/itip-formatter/itip-view.c:1038
+#: ../modules/itip-formatter/itip-view.c:1059
 msgid "Acce_pt"
 msgstr "_Onartu"
 
-#: ../modules/itip-formatter/itip-view.c:1041
+#: ../modules/itip-formatter/itip-view.c:1062
 msgid "Send _Information"
 msgstr "_Bidali informazioa"
 
-#: ../modules/itip-formatter/itip-view.c:1044
+#: ../modules/itip-formatter/itip-view.c:1065
 msgid "_Update Attendee Status"
 msgstr "_Eguneratu partaidearen egoera"
 
-#: ../modules/itip-formatter/itip-view.c:1047
+#: ../modules/itip-formatter/itip-view.c:1068
 #: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "_Eguneratu"
 
-#: ../modules/itip-formatter/itip-view.c:1497
-#: ../modules/itip-formatter/itip-view.c:1545
-#: ../modules/itip-formatter/itip-view.c:1616
+#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1568
+#: ../modules/itip-formatter/itip-view.c:1639
 msgid "Comment:"
 msgstr "Iruzkina"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1533
+#: ../modules/itip-formatter/itip-view.c:1556
 msgid "Send reply to sender"
 msgstr "Erantzun bidaltzaileari"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1548
+#: ../modules/itip-formatter/itip-view.c:1571
 msgid "Send _updates to attendees"
 msgstr "Bidali _eguneraketak partaideei"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1551
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Apply to all instances"
 msgstr "_Aplikatu instantzia guztiak"
 
-#: ../modules/itip-formatter/itip-view.c:1552
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Show time as _free"
 msgstr "Erakutsi ordua _libre gisa"
 
-#: ../modules/itip-formatter/itip-view.c:1553
+#: ../modules/itip-formatter/itip-view.c:1576
 msgid "_Preserve my reminder"
 msgstr "_Mantendu nire oroigarria"
 
-#: ../modules/itip-formatter/itip-view.c:1554
+#: ../modules/itip-formatter/itip-view.c:1577
 msgid "_Inherit reminder"
 msgstr "_Heredatu oroigarria"
 
-#: ../modules/itip-formatter/itip-view.c:1884
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Tasks:"
 msgstr "_Zereginak:"
 
-#: ../modules/itip-formatter/itip-view.c:1887
+#: ../modules/itip-formatter/itip-view.c:1914
 msgid "_Memos:"
 msgstr "_Zirkularrak:"
 
-#: ../modules/itip-formatter/itip-view.c:3115
+#: ../modules/itip-formatter/itip-view.c:3220
 msgid "Sa_ve"
 msgstr "_Gorde"
 
-#: ../modules/itip-formatter/itip-view.c:3575
-#: ../modules/itip-formatter/itip-view.c:5022
+#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:5131
 msgid "Attendee status updated"
 msgstr "Partaide-egoera eguneratu da"
 
-#: ../modules/itip-formatter/itip-view.c:3754
+#: ../modules/itip-formatter/itip-view.c:3862
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "'%s' egutegiko hitzordu bat bilera honekin gatazka du."
 
-#: ../modules/itip-formatter/itip-view.c:3783
+#: ../modules/itip-formatter/itip-view.c:3891
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hitzordua '%s' egutegian aurkitu da"
 
-#: ../modules/itip-formatter/itip-view.c:3896
+#: ../modules/itip-formatter/itip-view.c:4004
 msgid "Unable to find any calendars"
 msgstr "Ezin da egutegirik aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:3904
+#: ../modules/itip-formatter/itip-view.c:4012
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ezin da bilera hau egutegietan aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:3909
+#: ../modules/itip-formatter/itip-view.c:4017
 msgid "Unable to find this task in any task list"
 msgstr "Ezin da zeregin hau zereginen zerrendetan aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4022
 msgid "Unable to find this memo in any memo list"
 msgstr "Ezin da zirkular hau zirkularren zerrendetan aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:4258
+#: ../modules/itip-formatter/itip-view.c:4367
 msgid "Opening the calendar. Please wait..."
 msgstr "Egutegia irekitzen. Itxaron..."
 
-#: ../modules/itip-formatter/itip-view.c:4263
+#: ../modules/itip-formatter/itip-view.c:4372
 msgid "Searching for an existing version of this appointment"
 msgstr "Hitzorduaren existitzen den bertsioa bilatzen"
 
-#: ../modules/itip-formatter/itip-view.c:4658
+#: ../modules/itip-formatter/itip-view.c:4767
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ezin da bidali elementua '%s' egutegira. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4673
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Bidali '%s' egutegira onartuta bezala"
 
-#: ../modules/itip-formatter/itip-view.c:4678
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Bidali '%s' egutegira saialdi gisa"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4793
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Bidali '%s' egutegira baztertua bezala"
 
-#: ../modules/itip-formatter/itip-view.c:4690
+#: ../modules/itip-formatter/itip-view.c:4799
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' egutegira bertan behera utzita bezala bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:4711
-#: ../modules/itip-formatter/itip-view.c:5168
-#: ../modules/itip-formatter/itip-view.c:5274
+#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:5278
+#: ../modules/itip-formatter/itip-view.c:5384
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Aldaketak egutegian gordetzen. Itxaron..."
 
-#: ../modules/itip-formatter/itip-view.c:4752
+#: ../modules/itip-formatter/itip-view.c:4861
 msgid "Unable to parse item"
 msgstr "Ezin da elementua analizatu"
 
-#: ../modules/itip-formatter/itip-view.c:4945
+#: ../modules/itip-formatter/itip-view.c:5054
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Antolatzaileak %s delegatua kendu du"
 
-#: ../modules/itip-formatter/itip-view.c:4962
+#: ../modules/itip-formatter/itip-view.c:5071
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Bertan behera uztearen mezua delegatuari bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:4966
+#: ../modules/itip-formatter/itip-view.c:5075
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ezin izan da bertan behera uztearen oharra delegatuari bidali"
 
-#: ../modules/itip-formatter/itip-view.c:5014
+#: ../modules/itip-formatter/itip-view.c:5123
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ezin da partaideak eguneratu. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5057
+#: ../modules/itip-formatter/itip-view.c:5167
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Bilera baliogabea da eta ezin da eguneratu"
 
-#: ../modules/itip-formatter/itip-view.c:5133
+#: ../modules/itip-formatter/itip-view.c:5243
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Partaide-egoera ezin da eguneratu egoera baliogabea delako"
 
-#: ../modules/itip-formatter/itip-view.c:5205
-#: ../modules/itip-formatter/itip-view.c:5244
+#: ../modules/itip-formatter/itip-view.c:5315
+#: ../modules/itip-formatter/itip-view.c:5354
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: ../modules/itip-formatter/itip-view.c:5307
+#: ../modules/itip-formatter/itip-view.c:5417
 msgid "Meeting information sent"
 msgstr "Bileraren informazioa bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:5312
+#: ../modules/itip-formatter/itip-view.c:5422
 msgid "Task information sent"
 msgstr "Zereginaren informazioa bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5427
 msgid "Memo information sent"
 msgstr "Zirkularraren informazioa bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:5328
+#: ../modules/itip-formatter/itip-view.c:5438
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ezin da bileraren informazioa bidali. Bilera ez da existitzen"
 
-#: ../modules/itip-formatter/itip-view.c:5333
+#: ../modules/itip-formatter/itip-view.c:5443
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ezin da zereginaren informazioa bidali. Zeregina ez da existitzen"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5448
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ezin da zirkularraren informazioa bidali. Zirkularra ez da existitzen"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5403
+#: ../modules/itip-formatter/itip-view.c:5513
 msgid "calendar.ics"
 msgstr "egutegia.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5408
+#: ../modules/itip-formatter/itip-view.c:5518
 msgid "Save Calendar"
 msgstr "Gorde egutegia"
 
-#: ../modules/itip-formatter/itip-view.c:5457
-#: ../modules/itip-formatter/itip-view.c:5470
+#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5580
 msgid "The calendar attached is not valid"
 msgstr "Erantsitako egutegia ez da baliozkoa"
 
-#: ../modules/itip-formatter/itip-view.c:5458
-#: ../modules/itip-formatter/itip-view.c:5471
+#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5581
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr "Mezuak egutegi bat duela dio, baina egutegia ez da baliozko iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5513
-#: ../modules/itip-formatter/itip-view.c:5543
-#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5623
+#: ../modules/itip-formatter/itip-view.c:5653
+#: ../modules/itip-formatter/itip-view.c:5754
 msgid "The item in the calendar is not valid"
 msgstr "Egutegiko elementua ez da baliozkoa"
 
-#: ../modules/itip-formatter/itip-view.c:5514
-#: ../modules/itip-formatter/itip-view.c:5544
-#: ../modules/itip-formatter/itip-view.c:5645
+#: ../modules/itip-formatter/itip-view.c:5624
+#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5755
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -20569,11 +20748,11 @@ msgstr ""
 "Mezuak egutegi bat du, baina egutegiak ez du gertaerarik, zereginik edo "
 "libre/lanpetuta informaziorik"
 
-#: ../modules/itip-formatter/itip-view.c:5559
+#: ../modules/itip-formatter/itip-view.c:5669
 msgid "The calendar attached contains multiple items"
 msgstr "Erantsitako egutegiak hainbat elementu ditu"
 
-#: ../modules/itip-formatter/itip-view.c:5560
+#: ../modules/itip-formatter/itip-view.c:5670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -20581,24 +20760,24 @@ msgstr ""
 "Fitxategia gorde eta egutegia inportatu behar da elementu guzti horiek "
 "prozesatzeko"
 
-#: ../modules/itip-formatter/itip-view.c:6062
+#: ../modules/itip-formatter/itip-view.c:6172
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../modules/itip-formatter/itip-view.c:6078
+#: ../modules/itip-formatter/itip-view.c:6188
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: ../modules/itip-formatter/itip-view.c:6238
+#: ../modules/itip-formatter/itip-view.c:6348
 msgid "This meeting recurs"
 msgstr "Bilera hau errepikatu egiten da"
 
-#: ../modules/itip-formatter/itip-view.c:6241
+#: ../modules/itip-formatter/itip-view.c:6351
 msgid "This task recurs"
 msgstr "Zeregin hau errepikatu egiten da"
 
-#: ../modules/itip-formatter/itip-view.c:6244
+#: ../modules/itip-formatter/itip-view.c:6354
 msgid "This memo recurs"
 msgstr "Zirkular hau errepikatu egiten da"
 
@@ -20786,358 +20965,375 @@ msgid_plural "%d attached messages"
 msgstr[0] "Erantsitako mezu %d"
 msgstr[1] "Erantsitako %d mezu"
 
-#: ../modules/mail/e-mail-shell-backend.c:348
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: ../modules/mail/e-mail-shell-backend.c:350
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:358
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Posta-_kontua"
 
-#: ../modules/mail/e-mail-shell-backend.c:360
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Sortu posta-kontu berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:365
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mezuen _karpeta"
 
-#: ../modules/mail/e-mail-shell-backend.c:367
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Sortu posta-karpeta berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:682
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "Posta-kontuak"
 
-#: ../modules/mail/e-mail-shell-backend.c:691
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "Posta-hobespenak"
 
-#: ../modules/mail/e-mail-shell-backend.c:700
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Mezuak prestatzeko hobespenak"
 
-#: ../modules/mail/e-mail-shell-backend.c:710
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Sareko hobespenak"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:1002
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:752
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Markatu _mezuak irakurritako gisa..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+msgid "Go to Folder"
+msgstr "Joan karpetara"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "_Select"
+msgstr "_Hautatu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr "_Desgaitu kontua"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1614
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr "Desgaitu kontu hau"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1621
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1628
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Editatu kontu honen propietateak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1635
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Freskatu kontu honen karpeten zerrenda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "_Deskargatu mezuak lineaz kanpo erabiltzeko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1642
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Deskargatu kontu eta karpeten mezuak lineaz kanpo erabiltzeko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1647
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "_Garbitu irteerako ontzia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "K_opiatu karpeta hemen..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1656
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Kopiatu hautatutako karpeta beste karpeta batean"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1663
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Betiko kendu karpeta honetatik"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "_Ezabatu betiko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Betiko kendu karpeta honetatik ezabatutako mezu guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "_Markatu mezu guztiak irakurritako gisa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
-#: ../modules/mail/e-mail-shell-view-actions.c:1777
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Markatu karpetako mezu guztiak irakurrita gisa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Eraman karpeta hona..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Eraman hautatutako karpeta beste karpeta batera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Berria..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr "Sortu karpeta berria posta gordetzeko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Freskatu karpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Aldatu karpetaren izena"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1717
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Hautatu mezuen _haria"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Hautatu hautatutako mezuaren hari berean dauden mezu guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Hautatu mezuen a_zpiharia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr "Hautatu hautatutako mezuaren erantzun guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Betiko kendu ezabatutako mezu guztiak kontu guztietatik"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+msgid "Go to _Folder"
+msgstr "Joan _karpetara"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+msgid "Opens a dialog to select a folder to go to"
+msgstr "Joatea nahi den karpeta hautatzeko elkarrizketa-koadroa irekitzen du"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "Etiketa _berria"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "_Bat ere ez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Kudeatu harpidetzak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1770
-#: ../modules/mail/e-mail-shell-view-actions.c:1854
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Harpidetza egin edo kendu urruneko zerbitzarietako karpetetan"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1782
-#: ../modules/mail/e-mail-shell-view-actions.c:1803
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Bidali / _Jaso"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1784
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Bidali ilaran gordetako elementuak eta hartu elementu berriak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1789
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "_Jaso denak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1791
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Jaso elementu berriak kontu guztietatik"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1796
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "_Bidali denak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1798
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Bidali kontu guztietan ilaran dauden elementuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1826
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Bertan behera utzi uneko posta-eragiketa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1831
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Tolestu hari _guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Tolestu mezuen hari guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1838
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "_Zabaldu hari guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1840
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Zabaldu mezuen hari guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1845
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "Posta-_iragazkiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1847
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr "Sortu edo editatu mezu berriak iragazteko arauak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1852
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Harpidetzak..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "Kar_peta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1868
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Etiketa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr "Sortu bilaketa-karpeta bilaketatik..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1892
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Bilaketa-_karpetak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1894
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Sortu edo editatu bilaketa-karpetaren definizioak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1933
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1961
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr "Erakutsi mezuaren _aurrebista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1963
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr "Erakutsi mezuen aurrebistaren panela"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1969
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr "Erakutsi _ezabatutako mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show deleted messages with a line through them"
 msgstr "Erakutsi ezabatutako mezuak marratuta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1977
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr "_Elkartu harien arabera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1979
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr "Harian sartutako mezu-zerrenda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1985
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr "'_Sailkatu gabeak' karpeta gaituta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1987
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr ""
 "'Sailkatu gabeak' bilaketa-karpeta gaituta dagoen edo ez txandakatzen du"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2007
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Show message preview below the message list"
 msgstr "Erakutsi mezuaren aurrebista mezuen zerrendaren azpian"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Show message preview alongside the message list"
 msgstr "Erakutsi mezuaren aurrebista mezuen zerrendaren alboan"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2022
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr "Mezu guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2029
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr "Mezu garrantzitsuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2036
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr "Azken 5 egunetako mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr "Baztergarriak ez diren mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr "Mezuak eranskinekin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr "Etiketarik ez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2064
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr "Irakurri mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2071
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr "Irakurri gabeko mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2130
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr "Gaiak edo Helbideak hau dauka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2140
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr "Kontu guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2147
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 msgid "Current Account"
 msgstr "Uneko kontua"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2154
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr "Uneko karpeta"
 
@@ -21207,39 +21403,35 @@ msgid_plural "%d total"
 msgstr[0] "%d guztira"
 msgstr[1] "%d guztira"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1082
-msgid "Trash"
-msgstr "Zakarrontzia"
-
 #: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ../modules/mail/em-composer-prefs.c:394
+#: ../modules/mail/em-composer-prefs.c:413
 msgid "Select Folder to Add"
 msgstr "Hautatu karpeta gehitzeko"
 
-#: ../modules/mail/em-composer-prefs.c:854
+#: ../modules/mail/em-composer-prefs.c:883
 msgid "Folder"
 msgstr "Karpeta"
 
-#: ../modules/mail/em-composer-prefs.c:890
+#: ../modules/mail/em-composer-prefs.c:919
 msgid "Recipient"
 msgstr "Hartzailea"
 
-#: ../modules/mail/em-composer-prefs.c:1157
+#: ../modules/mail/em-composer-prefs.c:1192
 msgid "Keep in Outbox"
 msgstr "Mantendu 'Irteerako ontzia'n"
 
-#: ../modules/mail/em-composer-prefs.c:1158
+#: ../modules/mail/em-composer-prefs.c:1193
 msgid "Send immediately"
 msgstr "Bidali berehala"
 
-#: ../modules/mail/em-composer-prefs.c:1159
+#: ../modules/mail/em-composer-prefs.c:1194
 msgid "Send after 5 minutes"
 msgstr "Bidali 5 minutu barru"
 
-#: ../modules/mail/em-composer-prefs.c:1232
+#: ../modules/mail/em-composer-prefs.c:1267
 msgid "Language(s)"
 msgstr "Hizkuntza(k)"
 
@@ -21263,20 +21455,20 @@ msgstr "Hilean behin"
 msgid "Immediately, on folder leave"
 msgstr "Berehala, karpeta uztean"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:418
 msgid "Header"
 msgstr "Goiburua"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:422
 msgid "Contains Value"
 msgstr "Balioa du"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1236
+#: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Date header:"
 msgstr "_Dataren goiburua:"
 
-#: ../modules/mail/em-mailer-prefs.c:1237
+#: ../modules/mail/em-mailer-prefs.c:1553
 msgid "Show _original header value"
 msgstr "Erakutsi _jatorrizko goiburuaren balioa"
 
@@ -21438,43 +21630,43 @@ msgstr "Testu soileko modua"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ikusi mezuak testu soil gisa, nahiz eta HTML edukiak izan."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Huts egin du SpamAssassin (%s) abiaraztean: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Huts egin du mezuaren edukia SpamAssassin-era igortzean: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Huts egin du '%s' SpamAssassin-en idaztean: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Huts egin du irteera SpamAssassin-etik irakurtzean: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin kraskatu egin da edo huts egin du mezua prozesatzean"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "SpamAssassin-en aukerak"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "_Sartu urruneko probak"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr ""
 "SpamAssassin fidagarritasun handiagoa edukitzea eragingo du, baita motelagoa "
 "izatea ere."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
@@ -21522,11 +21714,11 @@ msgstr "Eman _formatua honela..."
 msgid "_Other languages"
 msgstr "_Beste hizkuntzak"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Testuaren nabarmentzea"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "Mezu zatien sintaxia nabarmentzea"
 
@@ -21715,30 +21907,26 @@ msgid "_Prolog"
 msgstr "_Prolog"
 
 #: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_PostScript"
-
-#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_VHDL"
 
@@ -21975,8 +22163,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Automatikoki abiarazi mezu berri bat editatzen denean"
 
-#: ../plugins/external-editor/external-editor.c:467
 #: ../plugins/external-editor/external-editor.c:469
+#: ../plugins/external-editor/external-editor.c:471
 msgid "Compose in External Editor"
 msgstr "Prestatu kanpoko editorean"
 
@@ -22213,8 +22401,8 @@ msgstr ""
 "\n"
 "Goiburua: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:394
+#: ../plugins/mail-notification/mail-notification.c:430
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -22223,54 +22411,54 @@ msgstr[1] "%d mezu berri jaso dituzu."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:405
 #, c-format
 msgid "From: %s"
 msgstr "Nork: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:419
 #, c-format
 msgid "Subject: %s"
 msgstr "Gaia: %s"
 
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:436
 msgid "New email in Evolution"
 msgstr "Mezu berria Evolution-en"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:471
 #, c-format
 msgid "Show %s"
 msgstr "Erakutsi %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:673
 msgid "_Play sound when a new message arrives"
 msgstr "_Erreproduzitu soinua mezu berriak iristean"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:705
 msgid "_Beep"
 msgstr "_Soinu-seinalea"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:718
 msgid "Use sound _theme"
 msgstr "Erabili soinuaren _gaia"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:737
 msgid "Play _file:"
 msgstr "Erreproduzitu _fitxategia:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:746
 msgid "Select sound file"
 msgstr "Hautatu soinu-fitxategia"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Notify new messages for _Inbox only"
 msgstr "Jakinarazi _sarrerako ontziko mezu berriak soilik"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:812
 msgid "Show _notification when a new message arrives"
 msgstr "Erakutsi _jakinarazpena mezu berria iristean"
 
@@ -22288,7 +22476,25 @@ msgstr "Jakinaraziko zaitu mezu berriak iristean."
 msgid "Created from a mail by %s"
 msgstr "Mezu batetik honek sortua: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "_Utzi"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "_Editatu"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Berria"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -22297,7 +22503,7 @@ msgstr ""
 "Hautatutako egutegiak badu '%s' gertaera jadanik. Gertaera zaharra editatzea "
 "nahi duzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -22306,7 +22512,7 @@ msgstr ""
 "Hautatutako zereginen-zerrendak badu '%s' zeregina jadanik. Zeregin zaharra "
 "editatzea nahi duzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -22315,7 +22521,7 @@ msgstr ""
 "Hautatutako zirkularren zerrendak badu '%s' zirkularra jadanik. Zirkular "
 "zaharra editatzea nahi duzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -22328,7 +22534,7 @@ msgstr[1] ""
 "%d mezu hautatu dituzu gertaeretan bihurtzeko. Guzti hauek gehitzea nahi "
 "dituzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -22341,7 +22547,7 @@ msgstr[1] ""
 "%d mezu hautatu dituzu zereginetan bihurtzeko. Guzti hauek gehitzea nahi "
 "dituzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -22355,29 +22561,29 @@ msgstr[1] ""
 "%d mezu hautatu dituzu zirkularretan bihurtzeko. Guzti hauek gehitzea nahi "
 "dituzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Falta diren mezuak bihurtzen jarraitzea nahi duzu?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[Laburpenik ez]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "Zerbitzariak objektu baliogabea itzuli du"
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Errorea gertatu da prozesatzean: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
+#: ../plugins/mail-to-task/mail-to-task.c:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ezin da egutegia ireki. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:858
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -22385,7 +22591,7 @@ msgstr ""
 "Hautatutako egutegia irakurtzeko soilik denez, leku horretan ezin da "
 "gertaerarik sortu. Hautatu beste egutegi bat."
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -22393,7 +22599,7 @@ msgstr ""
 "Hautatutako zereginen zerrenda irakurtzeko soilik denez, leku horretan ezin "
 "da zereginik sortu. Hautatu beste zereginen zerrenda bat."
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -22401,35 +22607,35 @@ msgstr ""
 "Hautatutako zirkularren zerrenda irakurtzeko soilik denez, leku horretan "
 "ezin da zirkularrik sortu. Hautatu beste zirkularren zerrenda bat."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1266
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create an _Appointment"
 msgstr "Sortu _hitzordu berria"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "Sortu gertaera berri bat hautatutako mezutik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1273
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr "Sortu _zirkularra"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr "Sortu zirkular berri bat hautatutako mezutik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
 msgstr "Sortu z_eregina"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr "Sortu zeregin berri bat hautatutako mezutik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1290
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr "Sortu _bilera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1292
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr "Sortu bilera berri bat hautatutako mezutik"
 
@@ -22512,23 +22718,18 @@ msgstr "%s(e)n ongi argitaratu da"
 msgid "Mount of %s failed:"
 msgstr "Huts egin du %s muntatzean:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "_Gaitu"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
 msgid "Are you sure you want to remove this location?"
 msgstr "Ziur zaude kokaleku hau kendu nahi duzula?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1144
+#: ../plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Ezin izan da argitalpenaren haria sortu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1154
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "_Argitaratu egutegiaren informazioa"
 
@@ -22769,38 +22970,42 @@ msgid ""
 "$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
 "an email you are replying to."
 msgstr ""
-"Zirriborroetan oinarritutako txantiloiaren plugina. $ORIG[subject], $ORIG"
-"[from], $ORIG[to] edo $ORIG[body] bezalako aldagaiak erabil ditzakezu, "
+"Zirriborroetan oinarritutako txantiloiaren plugina. $ORIG[subject], "
+"$ORIG[from], $ORIG[to] edo $ORIG[body] bezalako aldagaiak erabil ditzakezu, "
 "erantzuten ari zaren mezuko balioekin ordeztuko dira."
 
-#: ../plugins/templates/templates.c:1199
+#: ../plugins/templates/templates.c:1245
 msgid "No Title"
 msgstr "Titulurik ez"
 
-#: ../plugins/templates/templates.c:1308
+#: ../plugins/templates/templates.c:1354
 msgid "Save as _Template"
 msgstr "Gorde _txantiloi gisa"
 
-#: ../plugins/templates/templates.c:1310
+#: ../plugins/templates/templates.c:1356
 msgid "Save as Template"
 msgstr "Gorde txantiloi gisa"
 
-#: ../shell/e-shell.c:320
+#: ../shell/e-shell.c:337
 msgid "Preparing to go offline..."
 msgstr "Prestatzen lineaz kanpo jartzeko..."
 
-#: ../shell/e-shell.c:373
+#: ../shell/e-shell.c:390
 msgid "Preparing to go online..."
 msgstr "Prestatzen linean jartzeko.."
 
-#: ../shell/e-shell.c:480
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit"
 msgstr "Irteteko prestatzen"
 
-#: ../shell/e-shell.c:486
+#: ../shell/e-shell.c:507
 msgid "Preparing to quit..."
 msgstr "Prestatzen irtetzeko..."
 
+#: ../shell/e-shell.c:915
+msgid "Credentials are required to connect to the destination host."
+msgstr "Kredentzialak behar dira helburuko ostalariarekin konektatzeko."
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Bilaketak"
@@ -22994,135 +23199,143 @@ msgstr "Jarri Evolution linean"
 msgid "Lay_out"
 msgstr "_Diseinua"
 
-#: ../shell/e-shell-window-actions.c:1106
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "_Berria"
+
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr "_Konmutadorearen itxura"
 
-#: ../shell/e-shell-window-actions.c:1127
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "_Leihoa"
 
-#: ../shell/e-shell-window-actions.c:1156
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "Erakutsi albo-_barra"
 
-#: ../shell/e-shell-window-actions.c:1158
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "Erakutsi alboko barra"
 
-#: ../shell/e-shell-window-actions.c:1164
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "Erakutsi _botoiak"
 
-#: ../shell/e-shell-window-actions.c:1166
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "Erakutsi aldatzailearen botoiak"
 
-#: ../shell/e-shell-window-actions.c:1172
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "Erakutsi _egoera-barra"
 
-#: ../shell/e-shell-window-actions.c:1174
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "Erakutsi egoera-barra"
 
-#: ../shell/e-shell-window-actions.c:1180
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "Erakutsi _tresna-barra"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "Erakutsi tresna-barra"
 
-#: ../shell/e-shell-window-actions.c:1204
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "_Ikonoak soilik"
 
-#: ../shell/e-shell-window-actions.c:1206
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr "Bistaratu leihoko botoiak ikonoekin bakarrik"
 
-#: ../shell/e-shell-window-actions.c:1211
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "_Testua soilik"
 
-#: ../shell/e-shell-window-actions.c:1213
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr "Bistaratu leihoko botoiak testuarekin soilik"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "Ikonoak _eta testua"
 
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr "Bistaratu leihoko botoiak ikonoekin eta testuarekin"
 
-#: ../shell/e-shell-window-actions.c:1225
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "Tresna-_barraren estiloa"
 
-#: ../shell/e-shell-window-actions.c:1227
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
 
-#: ../shell/e-shell-window-actions.c:1235
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr "Ezabatu uneko ikuspegia"
 
-#: ../shell/e-shell-window-actions.c:1242
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr "Gorde ikuspegi pertsonalizatua..."
 
-#: ../shell/e-shell-window-actions.c:1244
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr "Gorde uneko ikuspegi pertsonalizatua"
 
-#: ../shell/e-shell-window-actions.c:1251
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr "_Uneko ikuspegia"
 
-#: ../shell/e-shell-window-actions.c:1261
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr "Ikuspegi pertsonalizatua"
 
-#: ../shell/e-shell-window-actions.c:1263
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr "Uneko ikuspegia ikuspegi pertsonalizatua da"
 
-#: ../shell/e-shell-window-actions.c:1271
+#: ../shell/e-shell-window-actions.c:1272
 msgid "Page Set_up..."
 msgstr "Orriaren _konfigurazioa..."
 
-#: ../shell/e-shell-window-actions.c:1273
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr "Aldatu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ../shell/e-shell-window-actions.c:1634
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "Aldatu hona: %s"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "Hautatu ikuspegia: %s"
 
-#: ../shell/e-shell-window-actions.c:1774
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
 msgid "Delete view: %s"
 msgstr "Ezabatu ikuspegia: %s"
 
-#: ../shell/e-shell-window-actions.c:1868
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr "Exekutatu bilaketaren parametro hauek"
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:505
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "Berria"
 
@@ -23235,11 +23448,11 @@ msgstr ""
 "Ezin da Evolution abiarazi. Baliteke Evolution-en beste instantzia bat "
 "erantzun gabe aritzea. Sistemaren errorea: %s"
 
-#: ../shell/main.c:454 ../shell/main.c:459
+#: ../shell/main.c:457 ../shell/main.c:462
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM  eta posta-bezeroa"
 
-#: ../shell/main.c:517
+#: ../shell/main.c:520
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -23248,7 +23461,7 @@ msgstr ""
 "%s: --online eta --offline ezin dira aldi berean erabili.\n"
 "  Exekutatu %s --help informazio gehiago lortzeko.\n"
 
-#: ../shell/main.c:523
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -23316,6 +23529,38 @@ msgstr "_Itxi berehala"
 msgid "Keep _Waiting"
 msgstr "_Itxaron..."
 
+#: ../shell/shell.error.xml.h:15
+msgid "Failed to get values from '{0}'"
+msgstr "Huts egin du '{0}'(e)tik balioak eskuratzean"
+
+#: ../shell/shell.error.xml.h:16
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Huts egin du '{0}'(r)en autentifikazioa deitzean"
+
+#: ../shell/shell.error.xml.h:17
+msgid "Failed to connect to '{0}'"
+msgstr "Huts egin du '{0}'(e)kin konektatzean"
+
+#: ../shell/shell.error.xml.h:18
+msgid "_Reconnect"
+msgstr "_Konektatu berriro"
+
+#: ../shell/shell.error.xml.h:19
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Huts egin du '{0}'(r)en kredentzialak eskatzean"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Huts egin du '{0}'(r)en fidagarritasunaren eskaera amaitzean"
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr "'{0}'(r)en SSL ziurtagiria ez da fidagarria."
+
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr "Arrazoia: {1}"
+
 #: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
@@ -23714,8 +23959,8 @@ msgstr ""
 "prozedurak eta ziurtagiria aztertu beharko zenituzke (erabilgarri badaude)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "Ziurtagiria"
+msgid "C_ertificate:"
+msgstr "_Ziurtagiria:"
 
 #: ../smime/gui/smime-ui.ui.h:26
 msgid "Email Certificate Trust Settings"
@@ -23758,32 +24003,32 @@ msgstr "PKCS12 fitxategiaren pasahitza"
 msgid "Enter password for PKCS12 file:"
 msgstr "Idatzi PKCS12 fitxategiaren pasahitza:"
 
-#: ../smime/lib/e-pkcs12.c:329
+#: ../smime/lib/e-pkcs12.c:328
 #, c-format
 msgid "Unable to create export context, err_code: %i"
 msgstr "Ezin da esportatzeko testuingurua sortu. Errore-kodea: %i"
 
-#: ../smime/lib/e-pkcs12.c:336
+#: ../smime/lib/e-pkcs12.c:335
 #, c-format
 msgid "Unable to setup password integrity, err_code: %i"
 msgstr "Ezin da pasahitzaren osotasuna konfiguratu. Errore-kodea: %i"
 
-#: ../smime/lib/e-pkcs12.c:346
+#: ../smime/lib/e-pkcs12.c:345
 #, c-format
 msgid "Unable to create safe bag, err_code: %i"
 msgstr "Ezin da zorro segurua sortu. Errore-kodea: %i"
 
-#: ../smime/lib/e-pkcs12.c:364
+#: ../smime/lib/e-pkcs12.c:363
 #, c-format
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr "Ezin zaio gakoa/ziurtagiria biltegiari gehitu. Errore-kodea: %i"
 
-#: ../smime/lib/e-pkcs12.c:382
+#: ../smime/lib/e-pkcs12.c:381
 #, c-format
 msgid "Unable to write store to disk, err_code: %i"
 msgstr "Ezin da biltegia diskoan idatzi. Errore-kodea: %i"
 
-#: ../smime/lib/e-pkcs12.c:409
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr "Inportatutako ziurtagiria"
 
@@ -23859,6 +24104,61 @@ msgstr "E_pearekin"
 msgid "With _Status"
 msgstr "Eg_oerarekin"
 
+#~ msgid "Completed On"
+#~ msgstr "Eginda: "
+
+#~ msgid "is set"
+#~ msgstr "ezarri da"
+
+#~ msgid "is not set"
+#~ msgstr "ez da ezarri"
+
+#~ msgid "Loading Images"
+#~ msgstr "Irudiak kargatzea"
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP-ren errorea: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Ezin izan da erantzuna analizatu: "
+
+#~ msgid "Empty response"
+#~ msgstr "Erantzuna hutsik"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Ustekabeko erantzuna zerbitzaritik"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Ezin izan da erabiltzaileren egutegirik kokatu"
+
+#~ msgid "Path"
+#~ msgstr "Bide-izena"
+
+#~ msgid "Template:"
+#~ msgstr "Txantiloia"
+
+#~ msgid "E_nable"
+#~ msgstr "_Gaitu"
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Autentifikazioaren emaitzaren kodea baliogabea (%d)"
+
+#~ msgid "Unknown background operation"
+#~ msgstr "Atzeko planoko eragiketa ezezaguna"
+
+#~ msgid "Try _setup account automatically, based on Email Address"
+#~ msgstr ""
+#~ "_Saiatu kontua automatikoki konfiguratzen. helb. elektronikoan oinarrituz"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Idatzi Google-eko '%s' erabiltzailearen pasahitza."
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "Erabiltzaileak pasahitza ematea baztertu du"
+
+#~ msgid "_PostScript"
+#~ msgstr "_PostScript"
+
 #~ msgid "Selection a file"
 #~ msgstr "Hautatu fitxategia"
 


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