[evolution] Updated Basque language

[Iñaki Larrañaga Murgoitio <dooteo src gnome org>]

commit 4d368a29464fc0ab39cf6b36f472d31565a07b7a
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date:   Tue Dec 30 16:56:21 2014 +0100

    Updated Basque language

 po/eu.po |10271 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 6336 insertions(+), 3935 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 3c0bb9c..036d048 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,17 +1,18 @@
-# translation of eu.po to Basque
+# Basque translation of evolution.
 # Copyright (C) 2001, 2004, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
-#
-#: ../shell/main.c:554
 # 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.
+#
+#: ../shell/main.c:503
 msgid ""
 msgstr ""
-"Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-22 17:03+0100\n"
-"PO-Revision-Date: 2014-03-22 17:39+0100\n"
+"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: 2014-12-30 16:44+0100\n"
+"PO-Revision-Date: 2014-12-30 16:55+0100\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
 "Language-Team: Basque <librezale librezale org>\n"
 "Language: eu\n"
@@ -122,24 +123,28 @@ msgid "Unable to perform search."
 msgstr "Ezin da bilaketa landu."
 
 #: ../addressbook/addressbook.error.xml.h:20
+msgid "Failed to refresh address book '{0}'"
+msgstr "Huts egin du '{0}' helbide-liburua freskatzean"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Kontaktuan aldaketak egin dituzu. Aldaketa hauek gordetzea nahi duzu?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Ez"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Ezin da kontaktua mugitu."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -148,37 +153,37 @@ msgstr ""
 "dirudi, baina ezin da iturburutik ezabatu. Kopia bat gordetzea nahi duzu "
 "horren ordez?"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Hautatutako irudia handiegia da. Tamainaz aldatzea eta gordetzea nahi duzu?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Aldatu tamaina"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Erabili bere horretan"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Ez gorde"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Ezin da {0} gorde."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Errorea {0} {1}(e)n gordetzean: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "{0} helbidea  badago lehendik"
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -186,30 +191,30 @@ msgstr ""
 "Kontaktu honen helbide elektronikoa lehendik ere badago. Helbide berdineko "
 "txartel berri bat gehitu nahi duzu?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../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
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Gehitu"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Helbide batzuk lehendik ere badaude kontaktuen zerrenda honetan."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -217,19 +222,19 @@ msgstr ""
 "Zerrenda honetako zati diren helbide batzuk gehitzen saiatzen ari zara. Hala "
 "ere gehitu nahi duzu?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Saltatu bikoiztutakoak"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Gehitu bikoiztutakoekin"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "'{}' zerrenda lehendik ere badago kontaktuen zerrenda honetan."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -237,21 +242,21 @@ msgstr ""
 "'{0}' izeneko kontaktuen zerrenda lehendik ere badago kontaktuen zerrenda "
 "honetan. Hala ere gehitu nahi duzu?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Huts egin du kontaktua ezabatzean"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Ez duzu nahikoa baimen kontaktuak helbide-liburu honetatik ezabatzeko."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Ezin da kontaktu berria gehitu"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -259,12 +264,12 @@ msgstr ""
 "'{0}' irakurtzeko soilik den helbide-liburua da eta ezin da eraldatu. "
 "Hautatu beste helbide-liburu bat albo-barratik Kontaktuen ikuspegian."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Ezin da kontaktu bat gorde, helbide-liburua oraindik irekita dago"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
 msgid ""
 "Cannot save a contact to the address book '{0}', because it is still "
 "opening. Either wait till it's opened, or select a different address book."
@@ -273,9 +278,9 @@ msgstr ""
 "Itxaron hura ireki arte edo hautatu beste helbide-liburu bat."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -308,81 +313,80 @@ msgid "Full _Name..."
 msgstr "_Izen-abizenak..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "Mezuak HT_ML formatuan jaso nahi ditu"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "Helb. el."
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "Mezuak HT_ML formatuan jaso nahi ditu"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Telefonoa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "SIP Address"
+msgstr "SIP helbidea"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Berehalako mezularitza"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Kontaktua"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "_Gune nagusia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../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:1891
+#: ../modules/itip-formatter/itip-view.c:1881
 msgid "_Calendar:"
 msgstr "_Egutegia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "_Libre/Lanpetuta:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Bideo-berriketa"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Gune nagusia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "Egutegia:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Libre/Lanpetuta:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Bideo-berriketa:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_Blog-a:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "Blog-a:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "Web helbideak"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "Web helbideak"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -431,8 +435,8 @@ msgid "_Anniversary:"
 msgstr "_Urteurrena:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "Urteurrena"
 
@@ -442,8 +446,8 @@ msgstr "Urteurrena"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
-#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
@@ -480,28 +484,25 @@ msgid "_Address:"
 msgstr "Helbi_dea:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Etxekoa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Lanekoa"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "Bestelakoa"
 
@@ -514,167 +515,188 @@ msgid "Notes"
 msgstr "Oharrak"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell-window-actions.c:1085
 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
+msgid "Options"
+msgstr "Aukerak"
+
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../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-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:362
-#: ../addressbook/gui/widgets/eab-contact-merging.c:621
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
 #: ../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:204 ../e-util/e-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../e-util/e-attachment-view.c:370 ../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-filter-datespec.c:291
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../composer/e-composer-actions.c:267 ../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-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-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
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../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/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../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:949
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../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/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/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../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
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
-#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Utzi"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1278
-#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
-#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:395
+#: ../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/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
+#: ../smime/gui/certificate-manager.c:730
 msgid "_Save"
 msgstr "_Gorde"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "Show Telephone"
+msgstr "Erakutsi telefonoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+msgid "Show SIP Address"
+msgstr "Erakutsi SIP helbidea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
-msgid "Yahoo"
-msgstr "Yahoo"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+msgid "Show Instant Messaging"
+msgstr "Erakutsi berehalako mezularitza"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
+msgid "Show Web Addresses"
+msgstr "Erakutsi web helbideak"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
+msgid "Show Job section"
+msgstr "Erakutsi Lana atala"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+msgid "Show Miscellaneous"
+msgstr "Erakutsi hainbat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+msgid "Show Home Mailing Address"
+msgstr "Erakutsi etxeko posta-helbidea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show Work Mailing Address"
+msgstr "Erakutsi laneko posta-helbidea"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
-msgid "Twitter"
-msgstr "Twitter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Other Mailing Address"
+msgstr "Erakutsi bestelako posta-helbidea"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Notes"
+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
+msgid "_Undo"
+msgstr "_Desegin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Desegin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:980
+msgid "_Redo"
+msgstr "_Berregin"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Berregin"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Errorea kontaktua gehitzean"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Errorea kontaktua aldatzean"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Errorea kontaktua kentzean"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Kontaktu-editorea - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
 msgstr "Hautatu irudi bat kontaktu honentzat"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
-#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#: ../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-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "_Ireki"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "Irudirik _ez"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -682,28 +704,28 @@ msgstr ""
 "Kontaktu-data ez da baliozkoa:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' baliogabeko formatua du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' ezin da etorkizuneko data izan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' baliogabeko formatua du"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' hutsik dago"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Kontaktua ez da baliozkoa."
 
@@ -715,23 +737,24 @@ msgstr "Kontaktua ez da baliozkoa."
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
 #: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../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-filter-datespec.c:292
-#: ../e-util/e-passwords.c:469 ../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-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../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-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
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_Ados"
 
@@ -743,15 +766,15 @@ msgstr "Gehitu kontaktua azkar"
 msgid "_Edit Full"
 msgstr "_Editatu osoa"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Izen-abizenak"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "_Helb. el"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Hautatu helbide-liburua"
 
@@ -859,14 +882,13 @@ 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/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
-#: ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
-#: ../mail/mail-config.ui.h:52
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
+#: ../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
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:807
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../plugins/templates/templates.c:463
@@ -905,41 +927,254 @@ msgstr "_Behea"
 msgid "Contact List Members"
 msgstr "Kontaktu-zerrendako kideak"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Kideak"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1253
+msgid "Name contains"
+msgstr "_Izenak hau dauka:"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+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/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
+msgid "Any field contains"
+msgstr "Edozein eremuk hau dauka:"
+
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "evolution-en helbide-liburua"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Kopiatu _helbide elektronikoa"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "Kopiatu helbide elektronikoak arbelean."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "_Bidali mezu berria honi..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:314
+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
+#, c-format
+msgid "Click to mail %s"
+msgstr "Egin klik %s bidaltzeko"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Ireki mapa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Zerrendako kideak:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Goitizena"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Enpresa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Saila"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Bulegoa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Lanbidea"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Kokalekua"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Zuzendaria"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Laguntzailea"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "Bideo-berriketa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Egutegia"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Libre/Lanpetuta"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Telefonoa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Faxa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Helbidea"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Etxeko orria"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Web egunkaria"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Telefono mugikorra"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Ezkontidea"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Pertsonala"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Oharra"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Zerrendako kideak"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Lanpostua"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Etxeko orria"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blog-a"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "Batu kontaktua"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "_Batu"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "Kontaktu errepikatua aurkitu da"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -947,7 +1182,7 @@ msgstr ""
 "Kontaktu honen izena edo helbide elektronikoa lehendik ere\n"
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -955,41 +1190,134 @@ msgstr ""
 "Kontaktu honen izena edo helbide elektronikoa lehendik ere\n"
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "Aldatutako kontaktua:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "Kontaktu berria:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "Gatazka sortu duen kontaktua:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old Contact:"
 msgstr "Kontaktu zaharra:"
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "_Izenak hau dauka:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Ezin izan da helbide-liburua ireki. Baliteke helbide-liburua lineaz kanpo "
+"lan egiteko markatuta ez egotea, edo lineaz kanpo erabiltzeko oraindik "
+"deskargatuta ez izatea. Kargatu behin helbide-liburua linean konektatuta "
+"zaudenean bere edukia deskargatzeko."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "Helb. el. honela hasten da:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Ezin izan da helbide-liburu hori ireki.  Egiaztatu %s bide-izena ondo "
+"dagoela eta atzitzeko baimenak ezarrita dituzula."
 
-#: ../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:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "Edozein eremuk hau dauka:"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Evolution-en bertsio honek ez dauka konpilatuta LDAP euskarria. LDAP erabili "
+"nahi baduzu LDAP gaituta duen Evolution-en paketea instalatu behar duzu."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Ezin izan da helbide-liburu hori ireki. Horrek esan nahi du okerreko URIa "
+"idatzi duzula, edo zerbitzaria ezin dela atzitu."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Errorearen xehetasunak:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Kontsulta honetan txartel gehiago datoz bat, konfigurazioaren\n"
+"arabera zerbitzariak itzul ditzakeenak edo Evolution-ek bistara\n"
+"ditzakeenak baino. Zehaztu gehiago bilaketa, edo gehitu emaitzen\n"
+"gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
+"hobespenetan."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Kontsulta egiteko denborak zerbitzariaren muga edo helbide-liburuan\n"
+"konfiguratuta dagoen muga gainditu du.  Zehaztu gehiago bilaketa,\n"
+"edo gehitu denbora-muga, helbide-liburu honen\n"
+"direktorio-zerbitzariaren hobespenetan."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Helbide-liburuaren moduluak ezin izan du kontsulta analizatu. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Helbide-liburuaren moduluak kontsulta ezetsi du. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Kontsulta ez da behar bezala egin. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Hautatu helbide-liburua"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "zerrenda"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Eraman kontaktua hona"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Kopiatu kontaktua hemen"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Eraman kontaktuak hona"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Kopiatu kontaktuak hemen"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1027,7 +1355,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:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:1053
 msgid "Delete selected contacts"
 msgstr "Ezabatu hautatutako kontaktuak"
 
@@ -1062,16 +1390,17 @@ 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:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
-#: ../e-util/evolution-source-viewer.c:803
-#: ../mail/e-mail-account-manager.c:737
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1561
-#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../e-util/e-categories-editor.c:282 ../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/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
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "E_zabatu"
 
@@ -1111,11 +1440,6 @@ msgstr "Izena"
 msgid "Family Name"
 msgstr "Deitura"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Nickname"
-msgstr "Goitizena"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "2. helb. el."
@@ -1168,11 +1492,6 @@ msgstr "Etxeko faxa"
 msgid "ISDN Phone"
 msgstr "ISDN telefonoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
-msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Beste telefono bat"
@@ -1207,20 +1526,10 @@ msgstr "Telex-a"
 msgid "TTYTDD"
 msgstr "Teletipoa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Company"
-msgstr "Enpresa"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Unitatea"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-msgid "Office"
-msgstr "Bulegoa"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titulua"
@@ -1231,16 +1540,6 @@ msgstr "Titulua"
 msgid "Role"
 msgstr "Funtzioa"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-msgid "Manager"
-msgstr "Zuzendaria"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
-msgid "Assistant"
-msgstr "Laguntzailea"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Web gunea"
@@ -1257,34 +1556,57 @@ msgstr "Egunkaria"
 msgid "Categories"
 msgstr "Kategoriak"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-msgid "Spouse"
-msgstr "Ezkontidea"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Ireki"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-msgid "Note"
-msgstr "Oharra"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Kontaktuen zerrenda: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Kontaktua: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "evolution-en txarteltxoa"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Kontaktu berria"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Kontaktuen zerrenda berria"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "uneko %s helbide-liburuaren karpetak txartel %d du"
+msgstr[1] "uneko %s helbide-liburuaren karpetak %d txartel ditu"
+
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "Kontaktuen mapa"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "_Handiagotu"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2360
 msgid "Zoom _Out"
 msgstr "_Txikiagotu"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:1021
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:1972
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Bilatu"
 
@@ -1346,283 +1668,12 @@ msgstr ""
 "\n"
 "Ez dago ikuspegi honetan erakusteko elementurik."
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "Laneko helb. el."
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "Etxeko helb. el."
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "Beste helb. el."
-
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "evolution-en helbide-liburua"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Kontaktu berria"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Kontaktuen zerrenda berria"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "uneko %s helbide-liburuaren karpetak txartel %d du"
-msgstr[1] "uneko %s helbide-liburuaren karpetak %d txartel ditu"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Ireki"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Kontaktuen zerrenda: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Kontaktua: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "evolution-en txarteltxoa"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "Kopiatu _helbide elektronikoa"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
-msgid "Copy the email address to the clipboard"
-msgstr "Kopiatu helbide elektronikoak arbelean."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
-msgid "_Send New Message To..."
-msgstr "_Bidali mezu berria honi..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
-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-gtkhtml.c:969 ../e-util/e-web-view.c:992
-#, c-format
-msgid "Click to mail %s"
-msgstr "Egin klik %s bidaltzeko"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "Ireki mapa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
-msgid "List Members:"
-msgstr "Zerrendako kideak:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-msgid "Department"
-msgstr "Saila"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-msgid "Profession"
-msgstr "Lanbidea"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Position"
-msgstr "Kokalekua"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
-msgid "Video Chat"
-msgstr "Bideo-berriketa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
-#: ../e-util/e-send-options.c:545
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Egutegia"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Libre/Lanpetuta"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
-msgid "Phone"
-msgstr "Telefonoa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
-msgid "Fax"
-msgstr "Faxa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
-msgid "Address"
-msgstr "Helbidea"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Home Page"
-msgstr "Etxeko orria"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-msgid "Web Log"
-msgstr "Web egunkaria"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-msgid "Personal"
-msgstr "Pertsonala"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
-msgid "List Members"
-msgstr "Zerrendako kideak"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
-msgid "Job Title"
-msgstr "Lanpostua"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
-msgid "Home page"
-msgstr "Etxeko orria"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
-msgid "Blog"
-msgstr "Blog-a"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Ezin izan da helbide-liburua ireki. Baliteke helbide-liburua lineaz kanpo "
-"lan egiteko markatuta ez egotea, edo lineaz kanpo erabiltzeko oraindik "
-"deskargatuta ez izatea. Kargatu behin helbide-liburua linean konektatuta "
-"zaudenean bere edukia deskargatzeko."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Ezin izan da helbide-liburu hori ireki.  Egiaztatu %s bide-izena ondo "
-"dagoela eta atzitzeko baimenak ezarrita dituzula."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Evolution-en bertsio honek ez dauka konpilatuta LDAP euskarria. LDAP erabili "
-"nahi baduzu LDAP gaituta duen Evolution-en paketea instalatu behar duzu."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Ezin izan da helbide-liburu hori ireki. Horrek esan nahi du okerreko URIa "
-"idatzi duzula, edo zerbitzaria ezin dela atzitu."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Errorearen xehetasunak:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Kontsulta honetan txartel gehiago datoz bat, konfigurazioaren\n"
-"arabera zerbitzariak itzul ditzakeenak edo Evolution-ek bistara\n"
-"ditzakeenak baino. Zehaztu gehiago bilaketa, edo gehitu emaitzen\n"
-"gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
-"hobespenetan."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Kontsulta egiteko denborak zerbitzariaren muga edo helbide-liburuan\n"
-"konfiguratuta dagoen muga gainditu du.  Zehaztu gehiago bilaketa,\n"
-"edo gehitu denbora-muga, helbide-liburu honen\n"
-"direktorio-zerbitzariaren hobespenetan."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "Helbide-liburuaren moduluak ezin izan du kontsulta analizatu. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "Helbide-liburuaren moduluak kontsulta ezetsi du. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Kontsulta ez da behar bezala egin. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "Hautatu helbide-liburua"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "zerrenda"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Eraman kontaktua hona"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Kopiatu kontaktua hemen"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Eraman kontaktuak hona"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "Kopiatu kontaktuak hemen"
-
 #: ../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:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:440
+#: ../calendar/importers/icalendar-importer.c:935
+#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Inportatzen..."
 
@@ -1668,45 +1719,45 @@ msgstr "Evolution-en vCard inportatzailea"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "%d. orria"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Zehaztu irteerako fitxategia irteera estandarraren ordez"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "IRTEERA-FITXATEGIA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Zerrendatu helbide-liburuen karpeta lokalak"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Erakutsi txartelak vcard edo csv fitxategi gisa"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr "Komando-lerroko argumentuen errorea, idatzi --help erabilera ikusteko."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Csv edo vcard formatuak bakarrik onartzen ditu."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Kudeatu gabeko errorea"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Ezin da fitxategia ireki"
@@ -1716,6 +1767,124 @@ msgstr "Ezin da fitxategia ireki"
 msgid "Failed to open client '%s': %s"
 msgstr "Huts egin du '%s' bezeroa irekitzean: %s"
 
+#: ../addressbook/util/eab-book-util.c:36
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Laneko helb. el."
+
+#: ../addressbook/util/eab-book-util.c:37
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Etxeko helb. el."
+
+#: ../addressbook/util/eab-book-util.c:38
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Beste helb. el."
+
+#: ../addressbook/util/eab-book-util.c:44
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "Laneko SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "Etxeko SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Beste SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Helb. el."
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "BM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Telefonoa"
+
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
@@ -1756,19 +1925,19 @@ msgstr "_Utzi geroko"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 #: ../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/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../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-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
 #: ../plugins/attachment-reminder/attachment-reminder.c:562
-#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../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:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "E_ditatu"
@@ -1777,16 +1946,16 @@ msgstr "E_ditatu"
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "_Itxi"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../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:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../modules/itip-formatter/itip-view.c:1493
+#: ../modules/itip-formatter/itip-view.c:1604
 msgid "Location:"
 msgstr "Kokalekua:"
 
@@ -1801,71 +1970,71 @@ msgstr "Alarma-_errepikatzearen denbora:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "egun"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "ordu"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minutu"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Ez dago laburpen erabilgarririk."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Ez dago kokaleku-informazio erabilgarririk."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Evolution-en oroigarriak"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
 msgstr[0] "oroigarri %d duzu"
 msgstr[1] "%d oroigarri dituzu"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Kontuz"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../mail/mail-dialogs.ui.h:21
 #: ../mail/mail.error.xml.h:139
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Ez"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../mail/mail.error.xml.h:138
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Bai"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1882,7 +2051,7 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
@@ -1891,7 +2060,7 @@ msgid "invalid time"
 msgstr "baliogabeko ordua"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1900,7 +2069,7 @@ msgstr[0] "ordu %d"
 msgstr[1] "%d ordu"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1911,7 +2080,7 @@ msgstr[1] "%d minutu"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -2328,64 +2497,188 @@ msgstr "Zirkularren zerrenda ez dago markatuta lineaz kanpo erabiltzeko."
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+msgid "Failed to open calendar '{0}'"
+msgstr "Huts egin du '{0}' egutegia irekitzean"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+msgid "Failed to open memo list '{0}'"
+msgstr "Huts egin du '{0}' zirkularren zerrenda irekitzean"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+msgid "Failed to open task list '{0}'"
+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"
+
+#. 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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+msgstr "Errorea '{0}' zirkularren zerrendaren ikuspegia sortzean"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Huts egin du gertaera bat '{0}' egutegian kopiatzean"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendan kopiatzean"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendan kopiatzean"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Huts egin du gertaera '{0}' egutegira eramatean"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Huts egin du zeregina '{0}' zereginen zerrendara eramatean"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Huts egin du zirkularra '{0}' zirkularren zerrendan eramatean"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Gertaera '{0}' egutegian kopiatzen"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "Zeregina '{0}' zereginen zerrendan kopiatzen"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Zirkularra '{0}' zirkularren zerrendan kopiatzen"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Gertaera '{0}' egutegira eramaten"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "Zeregina '{0}' zereginen zerrendara eramaten"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Zirkularra '{0}' zirkularren zerrendara eramaten"
 
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+msgid "Failed to refresh calendar '{0}'"
+msgstr "Huts egin du '{0}' egutegia freskatzean"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+msgid "Failed to refresh task list '{0}'"
+msgstr "Huts egin du '{0}' zereginen zerrenda freskatzean"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Huts egin du '{0}' zirkularren zerrenda freskatzean"
+
+#: ../calendar/calendar.error.xml.h:158
+msgid "Failed to make an occurrence movable"
+msgstr "Huts egin du agerraldi bat aldagarri"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2395,18 +2688,20 @@ msgid "Summary"
 msgstr "Laburpena"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "hau daukana"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "hau ez daukana"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Azalpena"
@@ -2421,35 +2716,37 @@ msgid "Classification"
 msgstr "Sailkapena"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "da"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "ez da"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Publikoa"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Pribatua"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../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
 msgid "Confidential"
 msgstr "Konfidentziala"
 
@@ -2473,24 +2770,27 @@ msgid "Location"
 msgstr "Kokalekua"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 msgid "Category"
 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/em-filter-i18n.h:6
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "Attachments"
 msgstr "Eranskinak"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Exist"
 msgstr "Bai"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.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
 msgid "Do Not Exist"
 msgstr "Ez"
 
@@ -2532,22 +2832,22 @@ msgid "Edit Reminder"
 msgstr "Editatu oroigarria"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../calendar/gui/e-alarm-list.c:424
 msgid "Pop up an alert"
 msgstr "Bistaratu pantailan abisu bat"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
+#: ../calendar/gui/e-alarm-list.c:420
 msgid "Play a sound"
 msgstr "Jo soinua"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
+#: ../calendar/gui/e-alarm-list.c:432
 msgid "Run a program"
 msgstr "Exekutatu programa"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "Bidali mezua"
 
@@ -2601,10 +2901,6 @@ msgstr "_Errepikatu oroigarria"
 msgid "extra times every"
 msgstr "bider, maiztasun honekin:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "Aukerak"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "_Mezu pertsonalizatua"
@@ -2643,7 +2939,7 @@ msgstr "Ekintza/Abiarazlea"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 #: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Oroigarriak"
 
@@ -2695,273 +2991,278 @@ msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 msgid "Could not save attachments"
 msgstr "Ezin izan dira eranskinak gorde"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Bilera - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Esleitutako zeregina - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Zirkularra - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Laburpenik ez"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Mantendu jatorrizko elementua?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "Ezin da zerbitzariarekin sinkronizatu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../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:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:374 ../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
 #: ../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:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "It_xi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Itxi uneko leihoa"
 
 #. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
-#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
+#: ../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
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Kopiatu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
-#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
+#: ../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
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Kopiatu hautapena"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:937
+#: ../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
 msgid "Cu_t"
 msgstr "_Ebaki"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../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
 msgid "Cut the selection"
 msgstr "Ebaki hautapena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
-#: ../shell/e-shell-window-actions.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Ezabatu hautapena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Ikusi laguntza"
 
 #. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
-#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:965
+#: ../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
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../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
 msgid "Paste the clipboard"
 msgstr "Arbelaren edukia itsasten du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
-#: ../modules/addressbook/e-book-shell-view-actions.c:1160
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../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
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
-#: ../modules/addressbook/e-book-shell-view-actions.c:1167
-#: ../modules/calendar/e-cal-shell-view-actions.c:1801
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../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
 msgid "Pre_view..."
 msgstr "_Aurrebista..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Gorde uneko aldaketak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Gorde eta itxi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "Gorde uneko aldaketak eta itxi editorea"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../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
 msgid "Select _All"
 msgstr "Hautatu _denak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
+#: ../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
 msgid "Select all text"
 msgstr "Hautatu testu osoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "_Sailkapena"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../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
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Fitxategia"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1031
 msgid "_Insert"
 msgstr "_Txertatu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:418
 msgid "_Options"
 msgstr "Au_kerak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../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
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "_Ikusi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:367
 msgid "_Attachment..."
 msgstr "_Eranskina..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:369 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Kategoriak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "Kategoriak erakusten edo ezkutatzen ditu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "Ordu-_zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "Ordu-zona eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "_Publikoa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Klasifikatu publiko gisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "_Pribatua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Klasifikatu pribatu gisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "_Konfidentziala"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Klasifikatu konfidentzial gisa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "A_raua eremua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "Araua eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "RSVP eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "_Egoera eremua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "Egoera eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "_Mota eremua"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Partaide-mota eremua erakusten edo ezkutatzen du"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:636
 msgid "Attach"
 msgstr "Erantsi"
 
@@ -2973,7 +3274,7 @@ msgstr ""
 "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
 #: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "eranskina"
 
@@ -2986,21 +3287,25 @@ msgstr "Ezin da uneko bertsioa erabili!"
 msgid "Validation error: %s"
 msgstr "Balidazio-errorea: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Ezin izan da helburua ireki"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "Helburua irakurtzekoa soilik da"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "Ezin da objektua sortu"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Gertaerak '%s' egutegian kopiatzen"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "Ezin izan da iturburua ireki"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Zirkularrak '%s' zirkularren zerrendan kopiatzen"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Zereginak '%s' zereginen zerrendan kopiatzen"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -3010,71 +3315,6 @@ msgstr "_Ezabatu elementu hau beste postontzi guztietatik?"
 msgid "_Retract comment"
 msgstr "_Uzkurtu iruzkina"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Gertaera ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Zeregina ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr ""
-"Zirkularra ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Elementua ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "Gertaera ezin izan da ezabatu, baimena ukatu delako"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "Zeregina ezin izan da ezabatu, baimena ukatu delako"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Zirkularra ezin izan da ezabatu, baimena ukatu delako"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "Elementua ezin izan da ezabatu, baimena ukatu delako"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Gertaera ezin izan da ezabatu, errore bat gertatu delako: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Zeregina ezin izan da ezabatu, errore bat gertatu delako: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Zirkularra ezin izan da ezabatu, errore bat gertatu delako: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Elementua ezin izan da ezabatu, errore bat gertatu delako: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
@@ -3136,7 +3376,7 @@ msgstr "_Libre/Lanpetuta"
 msgid "Query free / busy information for the attendees"
 msgstr "Kontsultatu libre/lanpetuta informazioa partaideentzako"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Hitzordua"
 
@@ -3164,7 +3404,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Gertaera ezin da bere osotasunean editatu, ez baitzara antolatzailea"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "Gertaerak oroigarriak ditu."
 
@@ -3173,78 +3413,78 @@ msgstr "Gertaerak oroigarriak ditu."
 msgid "Or_ganizer:"
 msgstr "_Antolatzailea:"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "Hasiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "Amaiera-datarik gabeko gertaera"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: ../calendar/gui/dialogs/event-page.c:1931
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr "_Delegatuak"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1940
 msgid "Atte_ndees"
 msgstr "_Partaideak"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
 msgstr[0] "Hitzordua baino egun %d lehenago"
 msgstr[1] "Hitzordua baino %d egun lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
 msgstr[0] "Hitzordua baino ordu %d lehenago"
 msgstr[1] "Hitzordua baino %d ordu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:3463
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
 msgstr[0] "Hitzordua baino minutu %d lehenago"
 msgstr[1] "Hitzordua baino %d minutu lehenago"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
+#: ../calendar/gui/dialogs/event-page.c:3491
+msgid "Custom"
 msgstr "Pertsonalizatu"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Bat ere ez"
@@ -3287,6 +3527,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
 msgid "_Description:"
 msgstr "_Azalpena:"
 
@@ -3309,7 +3551,7 @@ msgstr "Gertaeraren azalpena:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "_Partaideak..."
 
@@ -3317,10 +3559,6 @@ msgstr "_Partaideak..."
 msgid "_Reminder"
 msgstr "_Oroigarria"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "Oroigarri pertsonalizatua:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "Urtarrila"
@@ -3374,11 +3612,11 @@ msgid "Select Date"
 msgstr "Hautatu data"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "Hautatu _Gaur"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Zirkularra"
 
@@ -3403,8 +3641,9 @@ 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-part-headers.c:48 ../mail/em-filter-i18n.h:52
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
+#: ../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
 msgid "To"
 msgstr "Nori"
 
@@ -3705,8 +3944,8 @@ msgstr "Jakinarazi partaide berriak _soilik"
 msgid "_Send Options"
 msgstr "_Bidaltzeko aukerak"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Zeregina"
 
@@ -3740,76 +3979,76 @@ msgstr ""
 "Zeregina ezin da editatu, hautatutako zereginen zerrendak esleitutako "
 "zereginak ez dituelako onartzen"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "Osatze-data gaizki dago"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
 msgid "High"
 msgstr "Handia"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Normala"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-cal-component-preview.c:342
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "Txikia"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Definitu gabe"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ez da hasi"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "Egiten ari da"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -3817,11 +4056,11 @@ msgstr "Eginda"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:319
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "Bertan behera utzita"
 
@@ -3857,56 +4096,56 @@ msgstr "_Sailkapena:"
 msgid "_Web Page:"
 msgstr "_Web orria:"
 
-#: ../calendar/gui/ea-cal-view.c:281
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Hitzordu berria"
 
-#: ../calendar/gui/ea-cal-view.c:282
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Egun osoko gertaera berria"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Joan gaurko egunera"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Joan data jakin batera"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Oroigarriak ditu."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Errepikapenak ditu."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "Bilera bat da."
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Egutegi-gertaera: laburpena %s da."
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Egutegi-gertaera: ez du laburpenik."
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "Egutegi-gertaeren ikuspegia"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Hartu fokua"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3915,89 +4154,33 @@ msgstr[1] "%d gertaera ditu."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Ez du gertaerarik."
 
-#: ../calendar/gui/ea-day-view.c:126
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Lan-asteko ikuspegia: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:133
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Eguneko ikuspegia: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:167
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "Lan-asteko egutegi-ikuspegia"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "Egun baten edo gehiagoren egutegi-ikuspegia"
 
 #: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "taula uneko orduaren barrutia ikusteko eta hautatzeko"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "Gnome egutegia"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%A, %Y %b %d"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%a, %b %d"
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%a, %Y %b %d"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%Y %b %d"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%b %d"
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Joan botoia"
@@ -4007,7 +4190,7 @@ msgid "Click here, you can find more events."
 msgstr "Egin klik gertaera gehiago bilatzeko."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4015,84 +4198,84 @@ msgstr[0] "egun %d"
 msgstr[1] "%d egun"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "aste %d"
 msgstr[1] "%d aste"
 
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s hitzordua hasi aurretik"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s hitzordua hasi ondoren"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s hitzorduaren hasieran"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s hitzordua amaitu aurretik"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s hitzordua amaitu ondoren"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s hitzorduaren amaieran"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 msgid "%s at %s"
 msgstr "%s - %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Hileko ikuspegia: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:124
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Asteko ikuspegia: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "Hileko egutegi-ikuspegia"
 
-#: ../calendar/gui/ea-week-view.c:160
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "Aste baten edo gehiagoren egutegi-ikuspegia"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Izengabea"
@@ -4101,52 +4284,55 @@ msgstr "Izengabea"
 msgid "Categories:"
 msgstr "Kategoriak:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Laburpena:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "Hasiera-data:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "Amaiera-eguna:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Mugaeguna:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1496
+#: ../modules/itip-formatter/itip-view.c:1613
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Lehentasuna:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "Web orria:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1608
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "Gertaera bat '%s' egutegian kopiatzen"
+msgid "Creating view for calendar '%s'"
+msgstr "'%s' egutegiaren ikuspegia sortzen"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1612
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "Gertaera bat '%s' egutegira eramaten"
+msgid "Creating view for task list '%s'"
+msgstr "'%s' zereginen zerrendaren ikuspegia sortzen"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, c-format
+msgid "Creating view for memo list '%s'"
+msgstr "'%s' zirkularren zerrendaren ikuspegia sortzen"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4161,7 +4347,7 @@ msgstr "Hasiera-data"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Mota"
 
@@ -4169,7 +4355,7 @@ msgstr "Mota"
 msgid "Completion date"
 msgstr "Osatze-data"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "Eginda"
 
@@ -4191,11 +4377,12 @@ msgstr "Lehentasuna"
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4011
+#: ../calendar/gui/e-cal-model.c:3088
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "Egoera"
 
@@ -4212,37 +4399,51 @@ msgstr "Sortuta"
 msgid "Last modified"
 msgstr "Azken aldaketa"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Ebaki hautatutako gertaerak arbelera"
 
-#: ../calendar/gui/e-calendar-view.c:454
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Kopiatu hautatutako gertaerak arbelean"
 
-#: ../calendar/gui/e-calendar-view.c:460
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Itsatsi gertaerak arbeletik"
 
-#: ../calendar/gui/e-calendar-view.c:466
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Ezabatu hautatutako gertaerak"
 
-#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
-msgid "Deleting selected objects"
-msgstr "Hautatutako objektuak ezabatzen"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr "Itsatsitako testuak ez dauka baliozko iCalendar daturik"
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "Objektuak eguneratzen"
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+msgid "Default calendar not found"
+msgstr "Ez da egutegi lehenetsia aurkitu"
+
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+msgid "Default memo list not found"
+msgstr "Ez da zirkularren zerrenda lehenetsia aurkitu"
+
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+msgid "Default task list not found"
+msgstr "Ez da zereginen zerrenda lehenetsia aurkitu"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr "Ez da osagai egokirik aurkitu"
+
+#: ../calendar/gui/e-calendar-view.c:988
+msgid "Pasting iCalendar data"
+msgstr "iCalendar datuak itsasten"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2094 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "_Antolatzailea: %s <%s>"
@@ -4250,25 +4451,65 @@ msgstr "_Antolatzailea: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:2098 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Antolatzailea: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2114
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Kokalekua: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "Ordua: %s. %s"
 
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
+msgid "%d %b %Y"
+msgstr "%Y %b %d"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%b %d"
+
+#: ../calendar/gui/e-calendar-view.c:2255
+msgid "%A %d %b %Y"
+msgstr "%A, %Y %b %d"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a, %b %d"
+
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
+msgid "%a %d %b %Y"
+msgstr "%a, %Y %b %d"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4278,77 +4519,99 @@ msgstr "Hasiera-data"
 msgid "End Date"
 msgstr "Amaiera-eguna"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../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:3510
-#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/itip-formatter/itip-view.c:3500
+#: ../modules/itip-formatter/itip-view.c:6087
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: ../calendar/gui/e-cal-model.c:1667
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr "Ez da '%s' UIDko iturburua aurkitu"
+
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+msgid "Creating an event"
+msgstr "Gertaera sortzen"
+
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+msgid "Creating a memo"
+msgstr "Zirkularra sortzen"
+
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+msgid "Creating a task"
+msgstr "Zeregina sortzen"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "Errepikatua"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "Esleitua"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
 #: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Bai"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ez"
 
-#: ../calendar/gui/e-cal-model.c:3952
+#: ../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:6085
+#: ../modules/itip-formatter/itip-view.c:6075
 msgid "Accepted"
 msgstr "Onartua"
 
-#: ../calendar/gui/e-cal-model.c:3953
+#: ../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:6091
+#: ../modules/itip-formatter/itip-view.c:6081
 msgid "Declined"
 msgstr "Ukatua"
 
-#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-cal-model.c:3031
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: ../calendar/gui/e-cal-model.c:3955
+#: ../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:6094
+#: ../modules/itip-formatter/itip-view.c:6084
 msgid "Delegated"
 msgstr "Delegatua"
 
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Ekintza behar du"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Libre"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Lanpetuta"
 
@@ -4368,17 +4631,183 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Bat ere ez"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr "Gertaera aldatzen"
+
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying a memo"
+msgstr "Zirkularra aldatzen"
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr "Zeregina aldatzen"
+
+#: ../calendar/gui/e-cal-ops.c:387
+msgid "Removing an event"
+msgstr "Gertaera kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:391
+msgid "Removing a memo"
+msgstr "Zirkularra kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:395
+msgid "Removing a task"
+msgstr "Zeregina kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, c-format
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Gertaera bat kentzen"
+msgstr[1] "%d gertaera kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:488
+#, c-format
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Zirkular bat kentzen"
+msgstr[1] "%d zirkular kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:492
+#, c-format
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Zeregin bat kentzen"
+msgstr[1] "%d zeregin kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:692
+#, c-format
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Gertaera bat itsasten"
+msgstr[1] "%d gertaera itsasten"
+
+#: ../calendar/gui/e-cal-ops.c:707
+#, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Zirkular bat itsasten"
+msgstr[1] "%d zirkular itsasten"
+
+#: ../calendar/gui/e-cal-ops.c:722
+#, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Zeregin bat itsasten"
+msgstr[1] "%d zeregin itsasten"
+
+#: ../calendar/gui/e-cal-ops.c:820
+msgid "Updating an event"
+msgstr "Gertaera eguneratzen"
+
+#: ../calendar/gui/e-cal-ops.c:824
+msgid "Updating a memo"
+msgstr "Zirkularra eguneratzen"
+
+#: ../calendar/gui/e-cal-ops.c:828
+msgid "Updating a task"
+msgstr "Zeregina eguneratzen"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, c-format
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Gertaerak eskuratzen '%s' egutegitik betirako kentzeko"
+
+#: ../calendar/gui/e-cal-ops.c:937
+#, c-format
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "Zirkularrak eskuratzen '%s' zirkularren zerrendatik betirako kentzeko"
+
+#: ../calendar/gui/e-cal-ops.c:941
+#, c-format
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "Zereginak eskuratzen '%s' zereginen zerrendatik betirako kentzeko"
+
+#: ../calendar/gui/e-cal-ops.c:962
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "Gertaerak '%s' egutegitik betirako kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "Zirkularrak '%s' zirkularren zerrendatik betirako kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "Zereginak '%s' zereginen zerrendatik betirako kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:1068
+msgid "Purging events"
+msgstr "Gertaerak betirako kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+msgid "Purging memos"
+msgstr "Zirkularrak betirako kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+msgid "Purging tasks"
+msgstr "Zereginak betirako kentzen"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+msgid "Expunging completed tasks"
+msgstr "Ezabatu burututako zereginak"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "Gertaera bat lekuz aldatzen"
+msgstr[1] "%d gertaera lekuz aldatzen"
+
+#: ../calendar/gui/e-cal-ops.c:2035
+#, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Gertaera bat kopiatzen"
+msgstr[1] "%d gertaera kopiatzen"
+
+#: ../calendar/gui/e-cal-ops.c:2041
+#, c-format
+msgid "Moving an 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_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_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_plural "Copying %d tasks"
+msgstr[0] "Zeregin bat kopiatzen"
+msgstr[1] "%d zeregin kopiatzen"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y/%m/%d %H:%M:%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y/%m/%d %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4388,16 +4817,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "pm"
 
@@ -4407,13 +4836,13 @@ msgstr "pm"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3443
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "%d. astea"
@@ -4424,17 +4853,17 @@ msgstr "%d. astea"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:800
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutu-zatiketa"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "Erakutsi bigarren mailako ordu-zona"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.c:305
 #: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
@@ -4442,7 +4871,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:878
 #: ../calendar/gui/e-timezone-entry.c:323
 #: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
@@ -4549,67 +4978,67 @@ msgstr "Hutsegitearen zergatia: %s"
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "_Aukerak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/lanpetuta"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "_Hasiera:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "_Amaiera:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4618,7 +5047,7 @@ msgstr ""
 "Laburpena: %s\n"
 "Kokalekua: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Laburpena: %s"
@@ -4647,46 +5076,46 @@ msgstr "Izen arrunta"
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1573
+#: ../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
 msgid "Memos"
 msgstr "Zirkularrak"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* Laburpenik ez *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Hasiera: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Falta: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Ebaki hautatutako zirkularrak arbelera"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopiatu hautatutako zirkularrak arbelean"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Itsatsi zirkularrak arbeletik"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Ezabatu hautatutako zirkularrak"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Hautatu ikusgai dauden zirkular guztiak"
 
@@ -4698,40 +5127,40 @@ msgstr "Egin klik zirkularra gehitzeko"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%% %d"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/importers/icalendar-importer.c:1072
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1531
+#: ../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
 msgid "Tasks"
 msgstr "Zereginak"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Ebaki hautatutako zereginak arbelera"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopiatu hautatutako zereginak arbelean"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Itsatsi zereginak arbeletik"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Ezabatu hautatutako zereginak"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Hautatu ikusgai dauden zeregin guztiak"
 
@@ -4742,14 +5171,10 @@ msgstr "Hautatu ordu-zona"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%B %d"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "Purgatzen"
-
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
 #: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
@@ -4859,141 +5284,153 @@ msgstr "Libre/lanpetuta informazioa (%s - %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr ""
 "Ezin da baliabide bat gorde, gertaera berriak beste batekin talka egiten du."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "Ezin da baliabide bat gorde. Errorea: %s"
+#: ../calendar/gui/itip-utils.c:1153
+msgid "Unable to book a resource, error: "
+msgstr "Ezin da baliabide bat gorde, errorea: "
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaide izan behar duzu."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1917
+msgid "Sending an event"
+msgstr "Gertaera bidaltzen"
+
+#: ../calendar/gui/itip-utils.c:1921
+msgid "Sending a memo"
+msgstr "Zirkularra bidaltzen"
+
+#: ../calendar/gui/itip-utils.c:1925
+msgid "Sending a task"
+msgstr "Zeregina bidaltzen"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31."
 
@@ -5001,102 +5438,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Al"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ar"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "Az"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Og"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Or"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Lr"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "Ig"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3309
 msgid " to "
 msgstr " - "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Eginda "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Eginda "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (Falta: "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Falta: "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Partaideak: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Lehentasuna: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Kontaktuak: "
 
@@ -5109,11 +5546,13 @@ msgstr "Egiten ari da"
 msgid "% Completed"
 msgstr "Osatuta %"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "hau baino handiagoa da"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "hau baino txikiagoa da"
 
@@ -5121,177 +5560,181 @@ msgstr "hau baino txikiagoa da"
 msgid "Appointments and Meetings"
 msgstr "Hitzorduak eta bilerak"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:462
+#: ../calendar/importers/icalendar-importer.c:901
 msgid "Opening calendar"
 msgstr "Egutegia irekitzea"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "iCalendar files (.ics)"
 msgstr "iCalendar fitxategiak (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "Evolution iCalendar importer"
 msgstr "Evolution-en iCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:703
 msgid "Reminder!"
 msgstr "Oroitu!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "vCalendar files (.vcs)"
 msgstr "vCalendar fitxategiak (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "Evolution vCalendar importer"
 msgstr "Evolution-en vCalendar inportatzailea"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1065
 msgid "Calendar Events"
 msgstr "Egutegi-gertaerak"
 
 #: ../calendar/importers/icalendar-importer.c:1108
+msgid "Gnome Calendar"
+msgstr "Gnome egutegia"
+
+#: ../calendar/importers/icalendar-importer.c:1109
 msgid "Evolution Calendar intelligent importer"
 msgstr "Evolution-en egutegiaren inportatzaile adimenduna"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Bilera"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1180
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1183
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zeregina"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1186
+#: ../calendar/importers/icalendar-importer.c:1496
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Zirkularra"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "errepikapenak ditu"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "instantzia bat da"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1205
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "oroigarriak ditu"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1210
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "eranskinak ditu"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Publikoa"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1226
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Pribatua"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1229
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Konfidentziala"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1233
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Sailkapena"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1238
+#: ../calendar/importers/icalendar-importer.c:1538
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Laburpena"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1244
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Kokalekua"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1252
+#: ../calendar/importers/icalendar-importer.c:1533
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Hasiera"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1263
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Muga"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Amaiera"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1285
 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:1308
+#: ../calendar/importers/icalendar-importer.c:1309
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Eginda"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1317
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URLa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1328
+#: ../calendar/importers/icalendar-importer.c:1331
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Antolatzailea"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1351
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Partaideak"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1368
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Azalpena"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Mota"
@@ -6843,147 +7286,152 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: ../composer/e-composer-actions.c:202
+#: ../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
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:376
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:381
 msgid "New _Message"
 msgstr "_Mezu berria"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:383
 msgid "Open New Message window"
 msgstr "Ireki mezu berriaren leihoa"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:388 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Hobespenak"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:390 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Konfiguratu Evolution"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:397
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:402
 msgid "Save _As..."
 msgstr "Gorde hone_la..."
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:404
 msgid "Save the current file with a different name"
 msgstr "Gorde uneko fitxategia beste izen batekin"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:411
 msgid "Character _Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:435
 msgid "Print Pre_view"
 msgstr "Inprimatzeko _aurrebista"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:442
 msgid "Save as _Draft"
 msgstr "Gorde _zirriborro gisa"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:444
 msgid "Save as draft"
 msgstr "Gorde zirriborro gisa"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:449
 msgid "S_end"
 msgstr "_Bidali"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:451
 msgid "Send this message"
 msgstr "Bidali mezu hau"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:459
 msgid "PGP _Encrypt"
 msgstr "PGP _enkriptatzea"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with PGP"
 msgstr "Enkriptatu mezu hau PGPrekin"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:467
 msgid "PGP _Sign"
 msgstr "PGP _sinadura"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your PGP key"
 msgstr "Sinatu mezu hau zure PGP gakoarekin"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:475
 msgid "_Picture Gallery"
 msgstr "_Irudien galeria"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:477
 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:384
+#: ../composer/e-composer-actions.c:483
 msgid "_Prioritize Message"
 msgstr "_Eman lehentasuna mezuari"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:485
 msgid "Set the message priority to high"
 msgstr "Ezarri mezuaren lehentasuna altuenera"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:491
 msgid "Re_quest Read Receipt"
 msgstr "E_skatu irakurragiriak"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:493
 msgid "Get delivery notification when your message is read"
 msgstr "Lortu bidaltze-jakinarazpena mezu bat irakurtzean"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:499
 msgid "S/MIME En_crypt"
 msgstr "S/MIME e_nkriptatzea"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:501
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:507
 msgid "S/MIME Sig_n"
 msgstr "S/MIME s_inadura"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:509
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Sinatu mezu hau zure S/MIME sinadura-ziurtagiriarekin"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:563
 msgid "_Bcc Field"
 msgstr "_Bcc eremua"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:565
 msgid "Toggles whether the BCC field is displayed"
 msgstr "BCC eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:571
 msgid "_Cc Field"
 msgstr "_Cc eremua"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:573
 msgid "Toggles whether the CC field is displayed"
 msgstr "CC eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:579
 msgid "_Reply-To Field"
 msgstr "'Erant_zun honi' eremua"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:581
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "'Erantzun honi' eremua erakutsi edo ezkutatzen du"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:642
 msgid "Save Draft"
 msgstr "Gorde zirriborroa"
 
@@ -7003,48 +7451,48 @@ msgstr ""
 "Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
 "helbideak."
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:770
 msgid "Fr_om:"
 msgstr "Nor_k:"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:777
 msgid "_Reply-To:"
 msgstr "_Erantzun honi:"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:782
 msgid "_To:"
 msgstr "Nor_i:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:788
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:794
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:799
 msgid "_Post To:"
 msgstr "_Bidali hona:"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:803
 msgid "S_ubject:"
 msgstr "_Gaia:"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:811
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "Si_nadura:"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Egin klik hemen helbide-liburura joateko"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Egin klik hemen, talde-mezuak bidaltzeko karpetak hautatzeko"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:858
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7052,7 +7500,7 @@ msgstr ""
 "Ezin da sinatu irteerako mezua: ez dago sinadura-ziurtagiririk kontu "
 "honentzat"
 
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:867
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7061,18 +7509,14 @@ msgstr ""
 "Ezin da enkriptatu irteerako mezua: sinadura-ziurtagiririk ez dago ezarrita "
 "kontu honentzat"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1581 ../composer/e-msg-composer.c:2147
 msgid "Compose Message"
 msgstr "Prestatu mezua"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4390
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak."
 
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "Mezu izengabea"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "Ezin duzu erantsi &quot;{0}&quot; fitxategia mezuari."
@@ -7158,70 +7602,74 @@ msgid "_Save Draft"
 msgstr "_Gorde zirriborroa"
 
 #: ../composer/mail-composer.error.xml.h:20
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "Ziur zaude idazten ari zaren mezua baztertzea nahi duzula?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "Ezin izan da mezua sortu."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "&quot;{0}&quot; dela eta beste posta-aukera batzuk hautatu beharko dituzu"
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Ezin izan da  &quot;{0}&quot; sinadura-fitxategia ireki."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "Kontu guztiak kendu dira."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Kontu bat konfiguratu behar duzu mezuak idatzi ahal izateko."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Errorea gertatu da zure 'Irteerako ontzia' karpeta gordetzean."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Jakinarazitako errorea: &quot;{0}&quot;. Mezua ez da bidali."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Errorea gertatu da zure Zirriborroak karpeta gordetzean."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr ""
 "Jakinarazitako errorea: &quot;{0}&quot;. Baliteke mezua gorde ez izatea."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Errorea gertatu da bidaltzean. Nola nahi duzu jarraitzea?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Jakinarazitako errorea: &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "_Gorde 'Irteerako ontzia'n"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "_Saiatu berriro"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Zure mezua bidali da, baina errore bat gertatu da prozesuaren ondoren."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "Mezua 'Irteerako ontzia' karpetan gordetzen"
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7231,6 +7679,18 @@ msgstr ""
 "ontzia' karpetan gordeko da. Mezua bidal dezakezu Evolution-eko tresna-"
 "barrako Bidali/Jaso botoian klik eginez."
 
+#: ../composer/mail-composer.error.xml.h:37
+msgid "Are you sure you want to send the message?"
+msgstr "Ziur zaude mezua bidaltzea nahi duzula?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message had been pressed. Either cancel "
+"message send, if it was done by an accident, or send the message."
+msgstr ""
+"Mezua bidaltzeko laster-tekla sakatu da. Bertan behera utzi mezua bidaltze "
+"(ustekabe bat izan bada) edo bidali mezua."
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Evolution-eko alarmaren jakinarazpena"
@@ -7239,35 +7699,13 @@ msgstr "Evolution-eko alarmaren jakinarazpena"
 msgid "Calendar event notifications"
 msgstr "Egutegiko gertaeren jakinarazpenak"
 
-#: ../data/evolution.appdata.xml.in.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolution informazio pertsonala kudeatzeko aplikazio bat da, "
-"bateratutako posta elektronikoa, egutegia eta helbide-liburuaren "
-"funtzionalitatea eskaintzen du."
-
-#: ../data/evolution.appdata.xml.in.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolution-ek industriaren datu-formatuen eta sareko protokoloen "
-"barruti handia onartzen du informazioa trukatzeko, eta bereziki "
-"estandarrak eta segurtasuna betetzen du. Evolution-ek Microsoft "
-"Exchange-rekin "
-"ere bateratzen da \"Exchange Web Services\" (EWS) hedapenaren bidez."
-
 #: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Talde-lanerako suitea"
 
@@ -7391,6 +7829,50 @@ msgstr "Erakutsi aurrebistako panela"
 msgid "Whether to show the preview pane."
 msgstr "Erakutsi/ezkutatu aurrebistaren panela"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "egia"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "Telefonoen zenbakiak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "SIP helbideak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "BM helbideak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Etxeko posta-helbideak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Laneko posta-helbideak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Besteak posta-helbideak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Web helbideak editorean erakutsiko diren ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "Laneko informazioa editorean erakutsiko den ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Hainbat ataleko informazioa editorean erakutsiko den ala ez."
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "Oharrak editorean erakutsiko diren ala ez."
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Bihurtu mezuaren testua Unicode"
@@ -8261,29 +8743,19 @@ msgid "Send HTML mail by default."
 msgstr "Bidali HTML mezuak lehenespenez."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "Ortografia-egiaztapenaren kolorea"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr ""
-"Azpimarraren kolorea akastun hitzetan (lineako zuzentzaile ortografikoa "
-"erabiltzean)."
-
-#: ../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:30
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 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:31
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 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:32
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:30
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8291,11 +8763,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:33
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 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:34
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
@@ -8303,11 +8775,11 @@ msgstr ""
 "Erakutsi \"Cc\" 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:33
 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:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8315,11 +8787,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:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
 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:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8327,11 +8799,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:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 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:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8339,11 +8811,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:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 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:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8351,11 +8823,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:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Kodetu fitxategi-izenak Outlook/Gmail moduan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 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, "
@@ -8367,6 +8839,18 @@ 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
+msgid "Send messages through Outbox folder"
+msgstr "Bidali mezuak 'Irteerako ontzia' karpetaren bidez"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+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
 msgid "Put personalized signatures at the top of replies"
 msgstr "Jarri sinadura pertsonalizatuak erantzunen goian"
@@ -8432,18 +8916,38 @@ msgstr ""
 "gehigarri gisa. Adibidez: 'SV,AV'."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+msgid "Enable developer mode"
+msgstr "Gaitu garatzaileen modua"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+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
+msgid "Number of characters for wrapping"
+msgstr "Karaktere kopurua itzulbiratzeko"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+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
 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:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "'mbox' edo 'pdf' izan daiteke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Show image animations"
 msgstr "Erakutsi irudi animatuak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8451,11 +8955,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:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable or disable type ahead search feature"
 msgstr "Gaitu edo desgaitu 'bilatu idaztean' funtzioa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8463,11 +8967,11 @@ msgstr ""
 "Gaitu alboko barrako bilaketa eginbidea karpeten izenen bilaketa "
 "elkarreragilea baimentzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Enable or disable magic space bar"
 msgstr "Gaitu edo desgaitu 'zuriune magikoa'"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8475,75 +8979,75 @@ msgstr ""
 "Hau gaituz Zuriunea tekla erabiliko da mezuaren aurrebistan, mezuen "
 "zerrendan eta karpetetan korritzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 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:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 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:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\""
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markatu aipuak mezuaren \"Aurrebistan\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Citation highlight color"
 msgstr "Aipuak nabarmentzeko kolorea"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Citation highlight color."
 msgstr "Aipuak nabarmentzeko kolorea."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable/disable caret mode"
 msgstr "Gaitu/desgaitu kurtsore modua"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 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:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Default charset in which to display messages"
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Default charset in which to display messages."
 msgstr "Mezuak bistaratzeko karaktere-joko lehenetsia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Show Animations"
 msgstr "Erakutsi animazioak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Show animated images as animations."
 msgstr "Erakutsi irudi-animazioak animazio gisa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show all message headers"
 msgstr "Erakutsi mezu guztien goiburukoak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show all the headers when viewing a messages."
 msgstr "Erakutsi goiburuko guztiak mezua ikustean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 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 "
@@ -8554,35 +9058,43 @@ msgstr ""
 "dira erakutsiko mezu bat ikustean, baina Hobespenetan zerrendatuta "
 "jarraituko dute."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show photo of the sender"
 msgstr "Erakutsi bidaltzailearen argazkia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 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:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+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
+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
 msgid "Mark as Seen after specified timeout"
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Mark as Seen after specified timeout."
 msgstr "Markatu Ikusitako gisa zehaztutako denbora-muga igarotzean."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Timeout for marking messages as seen"
 msgstr "Mezua 'Ikusita'ko gisa markatzeko denbora-muga"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 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:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
@@ -8590,7 +9102,7 @@ msgstr ""
 "Erakutsi bidaltzailearen helbide elektronikoa bereiztutako zutabean mezuen "
 "zerrendan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8599,7 +9111,7 @@ msgstr ""
 "\" (Gaia) lerroetako letra-tipo berdinak erabili behar diren ala ez zehazten "
 "du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8608,19 +9120,19 @@ msgstr ""
 "\" (Gaia) lerroetako letra-tipo berdinak erabili behar diren ala ez zehazten "
 "du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show deleted messages in the message-list"
 msgstr "Erakutsi ezabatutako mezuak mezuen zerrendan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Enable Unmatched search folder"
 msgstr "Gaitu 'Sailkatu gabeak' bilaketako karpetak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8628,11 +9140,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:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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."
@@ -8641,31 +9153,31 @@ msgstr ""
 "berrezartzen da irakurri ostean. Mezua desautatzen du zerrendatik eta "
 "karpetako aurrebista ezabatzen du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Height of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren altuera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Height of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren altuera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Width of the message-list pane"
 msgstr "Mezu-zerrendaren panelaren zabalera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Width of the message-list pane."
 msgstr "Mezu-zerrendaren panelaren zabalera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Layout style"
 msgstr "Diseinuaren estiloa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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 "
@@ -8677,35 +9189,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:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Variable width font"
 msgstr "Zabalera aldakorreko letra-tipoa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Terminal font"
 msgstr "Terminaleko letra-tipoa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "The terminal font for mail display."
 msgstr "Mezuak bistaratzeko erabiliko den terminaleko letra-tipoa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Use custom fonts"
 msgstr "Erabili letra-tipo pertsonalizatuak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Use custom fonts for displaying mail."
 msgstr "Erabili letra-tipo pertsonalizatuak mezuak bistaratzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8713,11 +9225,11 @@ msgstr ""
 "Konprimituta bistaratu Nori/CC/BCC eremuko helbideak 'helbide-kopurua'n "
 "zehaztutako kopuruaren arabera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 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:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8725,11 +9237,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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Thread the message-list based on Subject"
 msgstr "Sartu harian mezuen zerrenda, Gaiaren arabera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8737,11 +9249,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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Default value for thread expand state"
 msgstr "Balio lehenetsia hariaren egoera zabaltzeko"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8749,11 +9261,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:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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 "
@@ -8763,11 +9275,11 @@ msgstr ""
 "oinarrituko den zehazten du, mezuaren dataren araberaren ordez. Evolution "
 "berrabiaraztea eskatzen du"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ordenatu kontuak alfabetikoki karpeta-zuhaitzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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 "
@@ -8779,27 +9291,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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Log filter actions"
 msgstr "Iragazki-ekintzen egunkaria"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Logfile to log filter actions"
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid "Logfile to log filter actions."
 msgstr "Iragazki-ekintzak erregistratzeko egunkari-fitxategia."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Flush Outbox after filtering"
 msgstr "Garbitu 'Irteerako ontzia' iragazi ondoren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 "
@@ -8809,46 +9321,57 @@ 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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Default forward style"
 msgstr "Birbidaltzeko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Default reply style"
 msgstr "Erantzuteko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+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
+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
 msgid "Prompt on empty subject"
 msgstr "Abisatu gaia hutsik badago"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when emptying the trash"
 msgstr "Galdetu zakarrontzia hustean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user expunges"
 msgstr "Abisatu erabiltzaileak betiko borratzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 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:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8856,19 +9379,19 @@ msgstr ""
 "Honek errepikatutako galdera gaitzen/desgaitzen du mezuaren jasotzaileen "
 "helbide eletronikorik ez dela sartu buruz abisu emateko"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user only fills Bcc"
 msgstr "Abisatu erabiltzaileak Bcc bakarrik betetzen duenean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8876,12 +9399,12 @@ msgstr ""
 "Abisatu HTML mezuak bidali aurretik beharbada HTML mezurik jaso nahi ez "
 "duten erabiltzaileei."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 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:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8889,19 +9412,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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt while marking multiple messages"
 msgstr "Gonbitea hainbat mezu markatzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when deleting messages in search folder"
 msgstr "Abisatu mezuak bilaketako karpetatik ezabatzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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 "
@@ -8911,13 +9434,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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Galdetu karpeta bat kopiatuko den edo ez karpeta-zuhaitzean arrastatu eta "
 "jaregitean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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 "
@@ -8928,13 +9451,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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Galdetu karpeta bat lekuz aldatuko den edo ez karpeta-zuhaitzean arrastatu "
 "eta jaregitean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8945,11 +9468,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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when replying privately to list messages"
 msgstr "Galdetu zerrenden mezuei pribatuki erantzutean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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."
@@ -8957,11 +9480,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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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 "
@@ -8972,11 +9495,11 @@ msgstr ""
 "'Erantzun honi' goiburuak zerrendari erantzutera bideratzen zaituena) "
 "bidaltzen saiatzen ari zarela abisatuz."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying to many recipients"
 msgstr "Galdetu hainbat hartzaileei erantzutean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -8984,7 +9507,7 @@ msgstr ""
 "Honek errepikatutako galdera gaitzen/desgaitzen du hainbat pertsonei mezua "
 "erantzuten ari zarenean abisu emateko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -8992,43 +9515,43 @@ msgstr ""
 "Bistaratutako mezuari birbidaltzean edo erantzutean mezuen arakatzailearen "
 "leihoa automatikoki ixteko araua."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Empty Trash folders on exit"
 msgstr "Hustu zakarrontziko karpetak irtetzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Last time Empty Trash was run"
 msgstr "Zakarrontzia hustu zen azken aldia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Level beyond which the message should be logged."
 msgstr "Maila, hortik gora mezua erregistratzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9036,11 +9559,11 @@ msgstr ""
 "Honako balio erabilgarriak daude: \"0\" - erroreak. \"1\" - abisuak. \"2\" - "
 "mezuen arazketa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Show original \"Date\" header value."
 msgstr "Erakutsi jatorrizko \"Date\" goiburuaren balioa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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 "
@@ -9050,11 +9573,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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "List of Labels and their associated colors"
 msgstr "Etiketen zerrenda, eta bakoitzari asoziatutako koloreak"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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."
@@ -9063,46 +9586,46 @@ msgstr ""
 "kolorea duten kateak ditu, eta koloreak HTML kodeketa hamaseitarra "
 "erabiltzen du."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Check incoming mail being junk"
 msgstr "Begiratu sarrerako mezuak baztergarriak diren"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Run junk test on incoming mail."
 msgstr "Exekutatu mezu baztergarrien proba sarrerako mezuetan."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty Junk folders on exit"
 msgstr "Hustu baztergarrien karpetak irtetzean"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Last time Empty Junk was run"
 msgstr "Baztergarria hustu zen azken aldia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "The default plugin for Junk hook"
 msgstr "Baztergarrientzako plugin lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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 "
@@ -9112,13 +9635,13 @@ msgstr ""
 "egon. Zerrendatutako plugin lehenetsia desgaitzen bada, ez ditu beste plugin "
 "erabilgarririk erabiliko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 "
@@ -9131,7 +9654,7 @@ msgstr ""
 "helbide-liburua (LDAP bezalakoa) osaketa automatikoa lantzeko markatuta "
 "badago."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9139,7 +9662,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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -9149,13 +9672,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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -9165,12 +9688,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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9178,31 +9701,31 @@ msgstr ""
 "Erabiliko diren goiburu pertsonalizatuak mezu baztergarriak aztertzeko. "
 "Zerrendako elementuak \"headername=balioa\" formatukoak dira."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "UID string of the default account."
 msgstr "Kontu lehenetsiaren UID katea."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Save directory"
 msgstr "Gorde direktorioa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Directory for saving mail component files."
 msgstr "Direktorioa mezuaren fitxategi-osagaiak gordetzeko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Composer load/attach directory"
 msgstr "Mezu-prestatzailearen kargatzeko/eransteko direktorioa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorioa mezu-prestatzaileari fitxategiak kargatzeko/eransteko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Check for new messages on start"
 msgstr "Begiratu mezu berririk dagoen abioan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9210,11 +9733,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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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 "
@@ -9225,11 +9748,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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Server synchronization interval"
 msgstr "Zerbitzariaren sinkronizazio tartea"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9237,11 +9760,39 @@ 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+msgid "Allow expunge in virtual folders"
+msgstr "Baimendu karpeta birtualetatik betirako ezabatzea"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+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 "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+"Karpeta birtualetatik betirako ezabatzea gaitzen du, Karpeta->'Ezabatu "
+"betirako' erabilgarri egongo da karpeta birtualetan, betirako ezabatzeak "
+"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
+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
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+"'Artxiboa' karpeta Mezuak|Artxiboa-n erabiltzeko... eginbidea 'Ordenagailu "
+"honetan' karpetan dagoenean."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "(Deprecated) Default forward style"
 msgstr "(Zaharkituta) Birbidaltzeko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9249,11 +9800,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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "(Deprecated) Default reply style"
 msgstr "(Zaharkituta) Erantzuteko estilo lehenetsia"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9261,13 +9812,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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 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:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9275,11 +9826,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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9287,7 +9838,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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9295,7 +9846,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:207
+#: ../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 "
 "\"browser-close-on-reply-policy\" instead."
@@ -9605,7 +10156,7 @@ msgstr "Hasierako fitxategi-hautatzailearen karpeta"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Hasierako karpeta GtkFileChooser elkarrizketa-koadroarentzako."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
@@ -9699,8 +10250,8 @@ msgid "Use only the local spam tests (no DNS)."
 msgstr "Spam-proba lokalak bakarrik erabili (DNSkorik ez)."
 
 #: ../em-format/e-mail-formatter-attachment.c:405
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
+#: ../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
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9720,8 +10271,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "Erreproduzitu eranskina kapsulatutako audio-erreproduzitzailearekin"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "Nork"
 
@@ -9753,7 +10304,7 @@ 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:1322
+#: ../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"
@@ -9781,23 +10332,25 @@ msgid "S/MIME encrpyted"
 msgstr "S/MIME enkriptatuta"
 
 #: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
+#: ../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:128
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
 msgid "Security"
 msgstr "Segurtasuna"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
-#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../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
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "Gaia"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-quote-headers.c:193
 #: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
@@ -9821,12 +10374,13 @@ msgstr "HTML"
 msgid "Format part as HTML"
 msgstr "Eman formatua zatiari HTML gisa"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../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
 msgid "Plain Text"
 msgstr "Testu soila"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
 #: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "Eman formatua zatiari testu soila bezala"
@@ -9956,13 +10510,13 @@ 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-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../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-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Bcc"
 
@@ -9976,12 +10530,12 @@ msgstr "Errorea MBOX zatia analizatzean: %s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "Ezin izan da S/MIME mezua analizatu: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Ezin izan da PGP mezua analizatu: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -10034,21 +10588,21 @@ msgstr "Ezin izan da PGP/MIME mezua analizatu: %s"
 msgid "Unsupported signature format"
 msgstr "Sinadura-formatu ez onartua"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 msgid "Reply-To"
 msgstr "Erantzun honi"
 
 #: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
 #: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Data"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "Berri-taldeak"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Aurpegia"
@@ -10058,334 +10612,18 @@ msgstr "Aurpegia"
 msgid "%s attachment"
 msgstr "%s eranskina"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Estandarra"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Jabea"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Ezkutukoa"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Ezkutu gorenekoa"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Zure begientzako soilik"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Bat ere ez"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Posta-agiria"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "_Erantzutea eskatu da"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "_Barruan"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "egun"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_Komeni denean"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "Erantzunak"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Atzeratu mezuen banaketa"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Ondoren:"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "egun"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "_Ezarri iraungitze-data"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Arte:"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Banatzeko aukerak"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Lehentasuna:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Sailkapena:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Aukera _orokorrak"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "_Sortu bidalitako elementua informazioaren jarraipena egiteko"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Banatuta"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Banatuta eta irekita"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Informazioa guztia"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "Ezabatu automatikoki bidalitako elementua"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Egoeraren jarraipena"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Irekitzean:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Ba_ztertzean:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Osatzean:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "_Onartzean:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Itzuli jakinarazpena"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "_Egoeraren jarraipena"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-msgid "_Apply"
-msgstr "_Aplikatu"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Ordenatu..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Elkartu honela..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "_Erakutsitako eremuak..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Garbitu _dena"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "_Erakutsi eremua ikuspegian"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
-msgid "Ascending"
-msgstr "Gorantz"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "Beherantz"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Elkartu elementuak honen arabera"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "Erakutsi _eremua ikuspegian"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "Gero "
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Erakutsi eremua _ikuspegian"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Erakutsi eremua i_kuspegian"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Ordenatu"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Garbitu dena"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Ordenatu elementuak honen arabera"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Hautatu ordu-zona"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Erabili saguaren ezkerreko botoia maparen area bat handiagotzeko eta hautatu "
-"ordu-zona.\n"
-"Erabili saguaren eskuineko botoia area txikiagotzeko."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Ordu-zonak"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "_Hautapena"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Ordu-zonaren goiti-beherako konbinazio-koadroa"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Sarrerakoa"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "uneko ordua"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "zuk zehaztutako ordua"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "uneko orduarekiko ordu erlatiboa"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "segundo igarotakoan"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "aste"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "hilabete"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "urte"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "duela"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "etorkizunean"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Erakutsi postaren iragazkiak:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "_Iragazteko arauak"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Konparazio-ordua:"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Mezuaren data sistemako uneko orduarekin\n"
-"konparatuko da iragazketa egiten denean."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Mezuaren data zehaztutako datako\n"
-"12:00am orduarekin konparatuko da."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Mezuaren data iragazketa gertatzen den\n"
-"orduarekin konparatuko da."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Sortu ikuspegi berria"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "_Izena:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%Y %B %d"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Ordeztu dagoen ikuspegia"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Egutegia: %s - %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "Utzi"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "Evolution-en egutegi-elementua"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10417,24 +10655,95 @@ msgstr "%s (bertan behera uzten)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1824
+msgid "Cancel"
+msgstr "Utzi"
+
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Itxi mezu hau (Ihes)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-alert-sink.c:246
+msgid "Failed to create a thread: "
+msgstr "Huts egin du haria sortzean:"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "Ikonoen ikuspegia"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "Zerrenda-ikuspegia"
 
+#. To Translators: This text is set as a description of an attached
+#. * 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
+msgid "Attached message"
+msgstr "Erantsitako mezua"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+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
+msgid "attachment.dat"
+msgstr "eranskina.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+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
+msgid "A save operation is already in progress"
+msgstr "Gordetzeko eragiketa lantzen ari da."
+
+#: ../e-util/e-attachment.c:2473
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ezin izan da '%s' kargatu"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Ezin izan da eranskina kargatu"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ezin izan da '%s' ireki"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ezin izan da eranskina ireki"
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "Eranskinaren edukia ez da kargatu"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Ezin izan da '%s' gorde"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ezin izan da eranskina gorde"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Eranskinaren propietateak"
@@ -10447,55 +10756,65 @@ msgstr "_Fitxategi-izena:"
 msgid "MIME Type:"
 msgstr "MIME mota:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "_Proposatu eranskina automatikoki bistaratzea"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Ezin izan da atzeko plano gisa ezarri"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Ezarri _atzeko plano gisa"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Kargatzen"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Gordetzen"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Ezkutatu _eranskin-barra"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "Erakutsi _eranskin-barra"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Gehitu eranskina"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "_Erantsi"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr "Artxibatu hautatutako direktorioak formatu hau erabiliz:"
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Gorde eranskina"
 msgstr[1] "Gorde eranskinak"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "eranskina.dat"
+#: ../e-util/e-attachment-store.c:653
+msgid "Do _not extract files from the attachment"
+msgstr "_Ez erauzi fitxategiak eranskinetik"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr "Gorde erauzitako fitxategiak _soilik"
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr "Gorde erauzitako fitxategiak eta jatorrizko _artxiboa"
 
 #: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
@@ -10521,12 +10840,12 @@ msgid "A_dd Attachment..."
 msgstr "_Gehitu eranskina..."
 
 #: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
-#: ../modules/calendar/e-task-shell-view-actions.c:752
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../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
 msgid "_Properties"
 msgstr "_Propietateak"
 
@@ -10556,56 +10875,6 @@ msgstr "Ireki honekin: %s"
 msgid "Open this attachment in %s"
 msgstr "Ireki eranskina '%s(r)ekin"
 
-#. To Translators: This text is set as a description of an attached
-#. * 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:1108
-msgid "Attached message"
-msgstr "Erantsitako mezua"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "Kargatzeko eragiketa lantzen ari da."
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "Gordetzeko eragiketa lantzen ari da."
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Ezin izan da '%s' kargatu"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Ezin izan da eranskina kargatu"
-
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ezin izan da '%s' ireki"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Ezin izan da eranskina ireki"
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "Eranskinaren edukia ez da kargatu"
-
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Ezin izan da '%s' gorde"
-
-#: ../e-util/e-attachment.c:3127
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Ezin izan da eranskina gorde"
-
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Markatu helbide-liburu lehenetsi gisa"
@@ -10623,6 +10892,44 @@ msgstr "Kopiatu liburuaren edukia lokalean lineaz kanpo lan egiteko"
 msgid "Ctrl-click to open a link"
 msgstr "Ktrl+klik egin esteka irekitzeko"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Aurreko hilabetea"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Hurrengo hilabetea"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Aurreko urtea"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Hurrengo urtea"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Hileko egutegia"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%Y %B"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Markatu egutegi lehenetsi gisa"
@@ -10651,44 +10958,6 @@ msgstr "Kopiatu zereginen edukia lokalean lineaz kanpo lan egiteko"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Kopiatu zirkularren edukia lokalean lineaz kanpo lan egiteko"
 
-#. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%Y %B"
-
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "Aurreko hilabetea"
-
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "Hurrengo hilabetea"
-
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "Aurreko urtea"
-
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "Hurrengo urtea"
-
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "Hileko egutegia"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Unean _erabilitako kategoriak:"
@@ -10697,17 +10966,17 @@ msgstr "Unean _erabilitako kategoriak:"
 msgid "_Available Categories:"
 msgstr "_Kategoria erabilgarriak:"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../e-util/e-categories-editor.c:274
 #: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#: ../shell/e-shell-window-actions.c:1099
 msgid "_New"
 msgstr "_Berria"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Ikonoa"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Sortu '%s' kategoria"
@@ -10744,13 +11013,17 @@ msgstr ""
 msgid "popup list"
 msgstr "Zerrenda laster-leihoan"
 
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "Orain"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Gaur"
@@ -10766,31 +11039,15 @@ msgstr "Bat ere ez"
 msgid "OK"
 msgstr "Ados"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:873
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Ordua formatu honetan idatzi behar da: %s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Ehunekoaren balioak 0 eta 100 bitartekoa izan behar du (biak barne)."
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Karaktere-kodeketa"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "Adierazi erabili behar den karaktere-jokoa"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "Besterik..."
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arabiera"
@@ -10868,11 +11125,194 @@ msgstr "Ukrainarra"
 msgid "Visual"
 msgstr "Bisuala"
 
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Karaktere-kodeketa"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Adierazi erabili behar den karaktere-jokoa"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Besterik..."
+
+#: ../e-util/e-client-cache.c:1209
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Ezin da bezeroaren objektu bat sortu '%s' hedapen-izenetik"
 
+#: ../e-util/e-color-chooser-widget.c:124
+msgid "Choose custom color"
+msgstr "Aukeratu kolore pertsonalizatua"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "beltza"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "marroi argia"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "marroi urreztatua"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "2. berde iluna"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "itsasoko urdina"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "urdin iluna"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "2. purpura"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "gris oso iluna"
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "gorri iluna"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "gorri laranja"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "urrea"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "berde iluna"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "urdin itzaldua"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "urdina"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "more itzaldua"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "gris iluna"
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "gorria"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "laranja"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "limoia"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "berde itzaldua"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "2. urdin itzaldua"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "2. zeru urdina"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "purpura"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "grisa"
+
+#: ../e-util/e-color-combo.c:108
+msgid "magenta"
+msgstr "magenta"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "laranja disdiratsua"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "horia"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "berdea"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "cyana"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "urdin disdiratsua"
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr "gorri purpura"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "gris argia"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "arrosa"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "laranja argia"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "hori argia"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "berde argia"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "cyan argia"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "urdin argia"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "more argia"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+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
+msgid "Default"
+msgstr "Lehenetsia"
+
 #: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Data eta ordua"
@@ -10997,6 +11437,111 @@ msgstr "Erabili lokala lehenetsia"
 msgid "Format:"
 msgstr "Formatua:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:39
+msgid "_Smile"
+msgstr "_Irribarrea"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:41
+msgid "S_ad"
+msgstr "_Goibel"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:43
+msgid "_Wink"
+msgstr "_Keinu egiten"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:45
+msgid "Ton_gue"
+msgstr "_Mihia"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:47
+msgid "Laug_h"
+msgstr "_Barrea egiten"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:49
+msgid "_Plain"
+msgstr "_Soila"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:51
+msgid "Smi_rk"
+msgstr "Irribarre _maltzurra"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:53
+msgid "_Embarrassed"
+msgstr "_Lotsatia"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:55
+msgid "_Big Smile"
+msgstr "_Irribarrea"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:57
+msgid "Uncer_tain"
+msgstr "_Zalantza"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:59
+msgid "S_urprise"
+msgstr "_Harridura"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:61
+msgid "W_orried"
+msgstr "_Kezkati"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:63
+msgid "_Kiss"
+msgstr "_Muxua"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:65
+msgid "A_ngry"
+msgstr "Ha_serre"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:67
+msgid "_Cool"
+msgstr "_Sekulakoa"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:69
+msgid "Ange_l"
+msgstr "_Aingerua"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:71
+msgid "Cr_ying"
+msgstr "_Negartia"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:73
+msgid "S_ick"
+msgstr "_Gaixoa"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:75
+msgid "Tire_d"
+msgstr "_Nekatua"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:77
+msgid "De_vilish"
+msgstr "_Inpernukoa"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:79
+msgid "_Monkey"
+msgstr "_Tximinoa"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Fitxategi-izen ezezaguna)"
@@ -11136,23 +11681,23 @@ msgstr "Hautatu ordua"
 msgid "Choose a File"
 msgstr "Aukeratu fitxategi bat"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "_Arau-izena:"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "honako baldintza guztiak"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "honako baldintzetariko edozein"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "_Bilatu honekin bat datozen elementuak:"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "Bilatu honako baldintzak betetzen dituzten elementuak"
 
@@ -11160,38 +11705,1030 @@ msgstr "Bilatu honako baldintzak betetzen dituzten elementuak"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../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-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:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "Erlazionatutako guztiak"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Erantzunak"
+
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "Erantzunak eta gurasoak"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "Erantzunik edo gurasorik ez"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "Hariak _barne:"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "Gehitu _baldintza"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:229
+msgid "Incoming"
+msgstr "Sarrerakoa"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Irteerakoa"
 
+#: ../e-util/e-html-editor-actions.c:57
+msgid "Failed to insert HTML file."
+msgstr "Huts egin du HTML fitxategia txertatzean."
+
+#: ../e-util/e-html-editor-actions.c:94
+msgid "Failed to insert text file."
+msgstr "Huts egin du testu-fitxategia txertatzean."
+
+#: ../e-util/e-html-editor-actions.c:478
+msgid "Insert HTML File"
+msgstr "Txertatu HTML fitxategia"
+
+#: ../e-util/e-html-editor-actions.c:484
+msgid "HTML file"
+msgstr "HTML fitxategia"
+
+#: ../e-util/e-html-editor-actions.c:511
+#: ../e-util/e-html-editor-actions.c:1292
+msgid "Insert Image"
+msgstr "Txertatu irudia"
+
+#: ../e-util/e-html-editor-actions.c:571
+msgid "Insert text file"
+msgstr "Txertatu testu-fitxategia"
+
+#: ../e-util/e-html-editor-actions.c:577
+msgid "Text file"
+msgstr "Testu-fitxategia"
+
+#: ../e-util/e-html-editor-actions.c:961
+msgid "Copy selected text to the clipboard"
+msgstr "Kopiatu hautatutako testua arbelean"
+
+#: ../e-util/e-html-editor-actions.c:968
+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
+msgid "Paste text from the clipboard"
+msgstr "Itsatsi testua arbeletik"
+
+#: ../e-util/e-html-editor-actions.c:982
+msgid "Redo the last undone action"
+msgstr "Desegin den azken ekintza berregiten du"
+
+#: ../e-util/e-html-editor-actions.c:996
+msgid "Undo the last action"
+msgstr "Desegin azken ekintza"
+
+#: ../e-util/e-html-editor-actions.c:1017
+msgid "For_mat"
+msgstr "For_matua"
+
+#: ../e-util/e-html-editor-actions.c:1024
+msgid "_Paragraph Style"
+msgstr "_Paragrafo-estiloa"
+
+#: ../e-util/e-html-editor-actions.c:1038
+#: ../e-util/e-html-editor-image-dialog.c:591
+msgid "_Alignment"
+msgstr "_Lerrokatu"
+
+#: ../e-util/e-html-editor-actions.c:1045
+msgid "Current _Languages"
+msgstr "Uneko _hizkuntzak"
+
+#: ../e-util/e-html-editor-actions.c:1062
+msgid "_Increase Indent"
+msgstr "_Handiagotu koska"
+
+#: ../e-util/e-html-editor-actions.c:1064
+msgid "Increase Indent"
+msgstr "Handiagotu koska"
+
+#: ../e-util/e-html-editor-actions.c:1069
+msgid "_HTML File..."
+msgstr "_HTML fitxategia..."
+
+#: ../e-util/e-html-editor-actions.c:1076
+msgid "Te_xt File..."
+msgstr "Te_stu-fitxategia..."
+
+#: ../e-util/e-html-editor-actions.c:1083
+msgid "Paste _Quotation"
+msgstr "Itsatsi _aipua"
+
+#: ../e-util/e-html-editor-actions.c:1090
+msgid "_Find..."
+msgstr "_Bilatu..."
+
+#: ../e-util/e-html-editor-actions.c:1092
+msgid "Search for text"
+msgstr "Bilatu testua"
+
+#: ../e-util/e-html-editor-actions.c:1097
+msgid "Find A_gain"
+msgstr "Bilat_u berriro"
+
+#: ../e-util/e-html-editor-actions.c:1104
+msgid "Re_place..."
+msgstr "Orde_ztu..."
+
+#: ../e-util/e-html-editor-actions.c:1106
+msgid "Search for and replace text"
+msgstr "Bilatu eta ordeztu testua"
+
+#: ../e-util/e-html-editor-actions.c:1111
+msgid "Check _Spelling..."
+msgstr "Egiaztatu _ortografia..."
+
+#: ../e-util/e-html-editor-actions.c:1118
+msgid "_Decrease Indent"
+msgstr "_Txikiagotu koska"
+
+#: ../e-util/e-html-editor-actions.c:1120
+msgid "Decrease Indent"
+msgstr "Txikiagotu koska"
+
+#: ../e-util/e-html-editor-actions.c:1125
+msgid "_Wrap Lines"
+msgstr "_Itzulbiratu lerroak"
+
+#: ../e-util/e-html-editor-actions.c:1132
+msgid "Open Inspector"
+msgstr "Ireki ikuskatzailea"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1142
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "_Zentratuta"
+
+#: ../e-util/e-html-editor-actions.c:1144
+msgid "Center Alignment"
+msgstr "Zentroan lerrokatua"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1149
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "E_zkerrean"
+
+#: ../e-util/e-html-editor-actions.c:1151
+msgid "Left Alignment"
+msgstr "Ezkerrean lerrokatua"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1156
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "E_skuinean"
+
+#: ../e-util/e-html-editor-actions.c:1158
+msgid "Right Alignment"
+msgstr "Eskuinean lerrokatua"
+
+#: ../e-util/e-html-editor-actions.c:1166
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1168
+msgid "HTML editing mode"
+msgstr "HTML edizio modua"
+
+#: ../e-util/e-html-editor-actions.c:1173
+msgid "Plain _Text"
+msgstr "_Testu soila"
+
+#: ../e-util/e-html-editor-actions.c:1175
+msgid "Plain text editing mode"
+msgstr "Testu soilaren edizio modua"
+
+#: ../e-util/e-html-editor-actions.c:1183
+msgid "_Normal"
+msgstr "_Arrunta"
+
+#: ../e-util/e-html-editor-actions.c:1190
+msgid "Header _1"
+msgstr "_1. izenburua"
+
+#: ../e-util/e-html-editor-actions.c:1197
+msgid "Header _2"
+msgstr "_2. izenburua"
+
+#: ../e-util/e-html-editor-actions.c:1204
+msgid "Header _3"
+msgstr "_3. izenburua"
+
+#: ../e-util/e-html-editor-actions.c:1211
+msgid "Header _4"
+msgstr "_4. izenburua"
+
+#: ../e-util/e-html-editor-actions.c:1218
+msgid "Header _5"
+msgstr "_5. izenburua"
+
+#: ../e-util/e-html-editor-actions.c:1225
+msgid "Header _6"
+msgstr "_6. izenburua"
+
+#: ../e-util/e-html-editor-actions.c:1232
+msgid "_Preformatted"
+msgstr "_Aurreformatua"
+
+#: ../e-util/e-html-editor-actions.c:1239
+msgid "A_ddress"
+msgstr "_Helbidea"
+
+#: ../e-util/e-html-editor-actions.c:1246
+msgid "_Blockquote"
+msgstr "_Aipu-blokea"
+
+#: ../e-util/e-html-editor-actions.c:1253
+msgid "_Bulleted List"
+msgstr "_Buletdun zerrenda"
+
+#: ../e-util/e-html-editor-actions.c:1260
+msgid "_Roman Numeral List"
+msgstr "Zenbaki e_rromatarren zerrenda"
+
+#: ../e-util/e-html-editor-actions.c:1267
+msgid "Numbered _List"
+msgstr "Zenbakidun _zerrenda"
+
+#: ../e-util/e-html-editor-actions.c:1274
+msgid "_Alphabetical List"
+msgstr "_Zerrenda alfabetikoa"
+
+#: ../e-util/e-html-editor-actions.c:1290
+#: ../e-util/e-html-editor-actions.c:1327
+msgid "_Image..."
+msgstr "I_rudia..."
+
+#: ../e-util/e-html-editor-actions.c:1297
+#: ../e-util/e-html-editor-actions.c:1334
+msgid "_Link..."
+msgstr "_Esteka..."
+
+#: ../e-util/e-html-editor-actions.c:1299
+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
+msgid "_Rule..."
+msgstr "_Marra..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1308
+msgid "Insert Rule"
+msgstr "Txertatu marra"
+
+#: ../e-util/e-html-editor-actions.c:1313
+#: ../e-util/e-html-editor-actions.c:1356
+msgid "_Table..."
+msgstr "_Taula..."
+
+#: ../e-util/e-html-editor-actions.c:1315
+msgid "Insert Table"
+msgstr "Txertatu taula"
+
+#: ../e-util/e-html-editor-actions.c:1320
+msgid "_Cell..."
+msgstr "_Gelaxka..."
+
+#: ../e-util/e-html-editor-actions.c:1341
+msgid "Pa_ge..."
+msgstr "_Orria..."
+
+#: ../e-util/e-html-editor-actions.c:1365
+msgid "Font _Size"
+msgstr "Letra-_tamaina"
+
+#: ../e-util/e-html-editor-actions.c:1372
+msgid "_Font Style"
+msgstr "Letra-e_stiloa"
+
+#: ../e-util/e-html-editor-actions.c:1379
+msgid "Paste As _Text"
+msgstr "_Itsatsi testu gisa"
+
+#: ../e-util/e-html-editor-actions.c:1390
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr "_Lodia"
+
+#: ../e-util/e-html-editor-actions.c:1392
+msgid "Bold"
+msgstr "Lodia"
+
+#: ../e-util/e-html-editor-actions.c:1398
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "_Etzana"
+
+#: ../e-util/e-html-editor-actions.c:1400
+msgid "Italic"
+msgstr "Etzana"
+
+#: ../e-util/e-html-editor-actions.c:1406
+msgid "_Plain Text"
+msgstr "_Testu soila"
+
+#: ../e-util/e-html-editor-actions.c:1414
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr "_Marratua"
+
+#: ../e-util/e-html-editor-actions.c:1416
+msgid "Strikethrough"
+msgstr "Marratua"
+
+#: ../e-util/e-html-editor-actions.c:1422
+#: ../e-util/e-html-editor-text-dialog.c:236
+msgid "_Underline"
+msgstr "_Azpimarratua"
+
+#: ../e-util/e-html-editor-actions.c:1424
+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
+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
+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
+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
+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
+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
+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
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1501
+msgid "Cell Contents"
+msgstr "Gelaxkaren edukia"
+
+#: ../e-util/e-html-editor-actions.c:1508
+msgid "Column"
+msgstr "Zutabea"
+
+#: ../e-util/e-html-editor-actions.c:1515
+msgid "Row"
+msgstr "Errenkada"
+
+#: ../e-util/e-html-editor-actions.c:1522
+#: ../e-util/e-html-editor-actions.c:1607
+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
+msgid "Table Delete"
+msgstr "Ezabatu taula"
+
+#: ../e-util/e-html-editor-actions.c:1539 ../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
+msgid "Table Insert"
+msgstr "Txertatu taula"
+
+#: ../e-util/e-html-editor-actions.c:1554
+msgid "Properties"
+msgstr "Propietateak"
+
+#: ../e-util/e-html-editor-actions.c:1572
+msgid "Column After"
+msgstr "Zutabea ondoren"
+
+#: ../e-util/e-html-editor-actions.c:1579
+msgid "Column Before"
+msgstr "Zutabea aurrean"
+
+#: ../e-util/e-html-editor-actions.c:1586
+msgid "Insert _Link"
+msgstr "Txertatu _esteka"
+
+#: ../e-util/e-html-editor-actions.c:1593
+msgid "Row Above"
+msgstr "Errenkada goian"
+
+#: ../e-util/e-html-editor-actions.c:1600
+msgid "Row Below"
+msgstr "Errenkada behean"
+
+#: ../e-util/e-html-editor-actions.c:1614
+msgid "Cell..."
+msgstr "Gelaxka..."
+
+#: ../e-util/e-html-editor-actions.c:1621
+msgid "Image..."
+msgstr "Irudia..."
+
+#: ../e-util/e-html-editor-actions.c:1628
+msgid "Link..."
+msgstr "Esteka..."
+
+#: ../e-util/e-html-editor-actions.c:1635
+msgid "Page..."
+msgstr "Orria..."
+
+#: ../e-util/e-html-editor-actions.c:1642
+msgid "Paragraph..."
+msgstr "Paragrafoa..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1650
+msgid "Rule..."
+msgstr "Marra..."
+
+#: ../e-util/e-html-editor-actions.c:1657
+msgid "Table..."
+msgstr "Taula..."
+
+#: ../e-util/e-html-editor-actions.c:1664
+msgid "Text..."
+msgstr "Testua..."
+
+#: ../e-util/e-html-editor-actions.c:1671
+msgid "Remove Link"
+msgstr "Kendu esteka"
+
+#: ../e-util/e-html-editor-actions.c:1688
+msgid "Add Word to Dictionary"
+msgstr "Gehitu hitza hiztegiari"
+
+#: ../e-util/e-html-editor-actions.c:1695
+msgid "Ignore Misspelled Word"
+msgstr "Ez ikusi egin oker idatzitako hitzei"
+
+#: ../e-util/e-html-editor-actions.c:1702
+msgid "Add Word To"
+msgstr "Gehitu hitza:"
+
+#: ../e-util/e-html-editor-actions.c:1711
+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
+#, c-format
+msgid "%s Dictionary"
+msgstr "'%s' hiztegia"
+
+#: ../e-util/e-html-editor-actions.c:1906
+msgid "_Emoticon"
+msgstr "_Aurpegiera"
+
+#: ../e-util/e-html-editor-actions.c:1907
+msgid "Insert Emoticon"
+msgstr "Txertatu aurpegiera"
+
+#: ../e-util/e-html-editor-actions.c:1975
+msgid "Re_place"
+msgstr "_Ordeztu"
+
+#: ../e-util/e-html-editor-actions.c:1978
+msgid "_Image"
+msgstr "_Irudia"
+
+#: ../e-util/e-html-editor-actions.c:1981
+msgid "_Link"
+msgstr "Este_ka"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1985
+msgid "_Rule"
+msgstr "_Marra"
+
+#: ../e-util/e-html-editor-actions.c:1988
+#: ../e-util/e-html-editor-cell-dialog.c:658
+msgid "_Table"
+msgstr "_Taula"
+
+#: ../e-util/e-html-editor.c:669
+msgid "Paragraph Style"
+msgstr "Paragrafo-estiloa"
+
+#: ../e-util/e-html-editor.c:683
+msgid "Editing Mode"
+msgstr "Edizio modua"
+
+#: ../e-util/e-html-editor.c:695
+msgid "Font Color"
+msgstr "Letra-kolorea"
+
+#: ../e-util/e-html-editor.c:713
+msgid "Font Size"
+msgstr "Letra-tamaina"
+
+#: ../e-util/e-html-editor-cell-dialog.c:618
+msgid "<b>Scope</b>"
+msgstr "<b>Esparrua</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:632
+msgid "C_ell"
+msgstr "_Gelaxka"
+
+#: ../e-util/e-html-editor-cell-dialog.c:645
+msgid "_Row"
+msgstr "_Errenkada"
+
+#: ../e-util/e-html-editor-cell-dialog.c:671
+msgid "Col_umn"
+msgstr "_Zutabea"
+
+#: ../e-util/e-html-editor-cell-dialog.c:681
+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
+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
+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
+msgid "Right"
+msgstr "Eskuinean"
+
+#: ../e-util/e-html-editor-cell-dialog.c:704
+msgid "_Horizontal:"
+msgstr "_Horizontala:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:712
+#: ../e-util/e-html-editor-image-dialog.c:581
+msgid "Top"
+msgstr "Goian"
+
+#: ../e-util/e-html-editor-cell-dialog.c:713
+#: ../e-util/e-html-editor-image-dialog.c:582
+msgid "Middle"
+msgstr "Erdialdean"
+
+#: ../e-util/e-html-editor-cell-dialog.c:714
+#: ../e-util/e-html-editor-image-dialog.c:583
+msgid "Bottom"
+msgstr "Behean"
+
+#: ../e-util/e-html-editor-cell-dialog.c:722
+msgid "_Vertical:"
+msgstr "_Bertikala:"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:728
+msgid "_Wrap Text"
+msgstr "_Itzulbiratu testua"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:736
+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
+msgid "<b>Layout</b>"
+msgstr "<b>Diseinua</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:761
+msgid "_Width"
+msgstr "_Zabalera"
+
+#: ../e-util/e-html-editor-cell-dialog.c:800
+msgid "Row S_pan:"
+msgstr "Errenkada-_hedadura:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:814
+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
+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
+msgid "Transparent"
+msgstr "Gardena"
+
+#: ../e-util/e-html-editor-cell-dialog.c:842
+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
+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
+msgid "Images"
+msgstr "Irudiak"
+
+#: ../e-util/e-html-editor-cell-dialog.c:868
+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
+msgid "_Remove image"
+msgstr "_Kendu irudia"
+
+#: ../e-util/e-html-editor-cell-dialog.c:895
+msgid "Cell Properties"
+msgstr "Gelaxkaren propietateak"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+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
+msgid "Search _backwards"
+msgstr "Bilatu _atzerantz"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr "_Maiuskula/minuskula"
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+msgid "_Wrap Search"
+msgstr "_Itzulbiratu bilaketa"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+msgid "Find"
+msgstr "Bilatu"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:319
+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
+msgid "_Width:"
+msgstr "_Zabalera:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:364
+msgid "_Size:"
+msgstr "_Tamaina:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:371
+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
+msgid "_Alignment:"
+msgstr "_Lerrokatu:"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:402
+msgid "S_haded"
+msgstr "_Itzaldura"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:419
+msgid "Rule properties"
+msgstr "Marraren propietateak"
+
+#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:685
+msgid "<b>General</b>"
+msgstr "<b>Orokorra</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:500
+msgid "_Source:"
+msgstr "_Iturburua:"
+
+#: ../e-util/e-html-editor-image-dialog.c:563
+msgid "_Height:"
+msgstr "_Altuera:"
+
+#: ../e-util/e-html-editor-image-dialog.c:604
+msgid "_X-Padding:"
+msgstr "_X betegarria:"
+
+#: ../e-util/e-html-editor-image-dialog.c:620
+msgid "_Y-Padding:"
+msgstr "_Y betegarria:"
+
+#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-table-dialog.c:809
+msgid "_Border:"
+msgstr "_Ertza:"
+
+#: ../e-util/e-html-editor-image-dialog.c:646
+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
+msgid "_URL:"
+msgstr "_URLa:"
+
+#: ../e-util/e-html-editor-image-dialog.c:669
+#: ../e-util/e-html-editor-link-dialog.c:339
+msgid "_Test URL..."
+msgstr "_Probatu URLa..."
+
+#: ../e-util/e-html-editor-image-dialog.c:686
+msgid "Image Properties"
+msgstr "Irudiaren propietateak"
+
+#: ../e-util/e-html-editor-link-dialog.c:363
+msgid "_Remove Link"
+msgstr "_Kendu esteka"
+
+#: ../e-util/e-html-editor-link-dialog.c:388
+msgid "Link Properties"
+msgstr "Estekaren propietateak"
+
+#: ../e-util/e-html-editor-page-dialog.c:69
+msgid "Perforated Paper"
+msgstr "Zulatutako papera"
+
+#: ../e-util/e-html-editor-page-dialog.c:78
+msgid "Blue Ink"
+msgstr "Tinta urdina"
+
+#: ../e-util/e-html-editor-page-dialog.c:87
+msgid "Paper"
+msgstr "Papera"
+
+#: ../e-util/e-html-editor-page-dialog.c:96
+msgid "Ribbon"
+msgstr "Zinta"
+
+#: ../e-util/e-html-editor-page-dialog.c:105
+msgid "Midnight"
+msgstr "Gauerdian"
+
+#: ../e-util/e-html-editor-page-dialog.c:123 ../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
+msgid "Graph Paper"
+msgstr "Paper grafikoa"
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "<b>Colors</b>"
+msgstr "<b>Koloreak</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:434
+msgid "_Text:"
+msgstr "_Testua:"
+
+#: ../e-util/e-html-editor-page-dialog.c:449
+msgid "_Link:"
+msgstr "_Esteka:"
+
+#: ../e-util/e-html-editor-page-dialog.c:464
+msgid "_Background:"
+msgstr "_Atzeko planoa:"
+
+#: ../e-util/e-html-editor-page-dialog.c:472
+msgid "<b>Background Image</b>"
+msgstr "<b>Atzeko planoko irudia</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:494
+msgid "_Template:"
+msgstr "_Txantiloia:"
+
+#: ../e-util/e-html-editor-page-dialog.c:502
+msgid "Selection a file"
+msgstr "Hautatu fitxategia"
+
+#: ../e-util/e-html-editor-page-dialog.c:509
+msgid "_Custom:"
+msgstr "_Pertsonalizatu:"
+
+#: ../e-util/e-html-editor-page-dialog.c:536
+msgid "Page Properties"
+msgstr "Orriaren propietateak"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+msgid "_Style:"
+msgstr "_Estiloa:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+msgid "<b>Alignment</b>"
+msgstr "<b>Lerrokadura</b>"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+msgid "Paragraph Properties"
+msgstr "Paragrafoaren propietateak"
+
+#: ../e-util/e-html-editor-replace-dialog.c:148
+#, c-format
+msgid "%d occurences replaced"
+msgstr "%d agerpen ordeztuta"
+
+#: ../e-util/e-html-editor-replace-dialog.c:209
+msgid "R_eplace:"
+msgstr "_Ordeztu:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:221
+msgid "_With:"
+msgstr "_Honekin:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:233
+msgid "_Case sensitive"
+msgstr "_Maiuskula/minuskula"
+
+#: ../e-util/e-html-editor-replace-dialog.c:237
+msgid "Wra_p search"
+msgstr "Bilaketa _jarraitua"
+
+#: ../e-util/e-html-editor-replace-dialog.c:247
+msgid "_Skip"
+msgstr "_Saltatu"
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Ordeztu"
+
+#: ../e-util/e-html-editor-replace-dialog.c:263
+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
+msgid "Replace"
+msgstr "Ordeztu"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>'%s'(r)en iradokizunak</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:501
+msgid "<b>Suggestions</b>"
+msgstr "<b>Iradokizunak</b>"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:545
+msgid "Replace All"
+msgstr "Ordeztu denak"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Ez ikusi egin"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:563
+msgid "Skip"
+msgstr "Saltatu"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:572
+msgid "Back"
+msgstr "Atzera"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:581
+msgid "<b>Dictionary</b>"
+msgstr "<b>Hiztegia</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:601
+msgid "Add word"
+msgstr "Gehitu hitza"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:618
+#: ../mail/mail-config.ui.h:36
+msgid "Spell Checking"
+msgstr "Ortografia-egiaztapena"
+
+#: ../e-util/e-html-editor-table-dialog.c:707
+msgid "_Rows:"
+msgstr "_Errenkadak:"
+
+#: ../e-util/e-html-editor-table-dialog.c:724
+msgid "C_olumns:"
+msgstr "_Zutabeak:"
+
+#: ../e-util/e-html-editor-table-dialog.c:775
+msgid "_Spacing:"
+msgstr "_Tartea:"
+
+#: ../e-util/e-html-editor-table-dialog.c:792
+msgid "_Padding:"
+msgstr "_Betegarria:"
+
+#: ../e-util/e-html-editor-table-dialog.c:856
+#: ../e-util/e-html-editor-text-dialog.c:261
+msgid "_Color:"
+msgstr "_Kolorea:"
+
+#: ../e-util/e-html-editor-table-dialog.c:882
+msgid "Image:"
+msgstr "Irudia:"
+
+#: ../e-util/e-html-editor-table-dialog.c:909
+msgid "Table Properties"
+msgstr "Taularen propietateak"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr "Ta_maina:"
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+msgid "Text Properties"
+msgstr "Testuaren propietateak"
+
+#: ../e-util/e-html-editor-view.c:3149
+msgid "Changed property"
+msgstr "Propietatea aldatuta"
+
+#: ../e-util/e-html-editor-view.c:3150
+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 "
@@ -11225,7 +12762,7 @@ msgid "Import a _single file"
 msgstr "Inportatu fitxategi _bakarra"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
@@ -11240,7 +12777,7 @@ msgstr ""
 "aurkitu. Berriro saiatu nahi baduzu, sakatu \"Atzera\" botoia."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
@@ -11298,27 +12835,27 @@ msgstr "Hautatu fitxategia"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Egin klik \"Aplikatu\"n fitxategia Evolution-era inportatzen hasteko."
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Automatikoki sortua"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "Itxi"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "_Gorde eta itxi"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "Editatu sinadura"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "_Sinaduraren izena:"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "Izengabea"
 
@@ -11326,15 +12863,15 @@ msgstr "Izengabea"
 msgid "Add _Script"
 msgstr "_Gehitu script-a"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Gehitu sinaduraren script-a"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Editatu sinaduraren script-a"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11344,11 +12881,18 @@ msgstr ""
 "erabiliko da. Idazten duzun izena bistaratzeko\n"
 "bakarrik erabiliko da."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../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:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "Script fitxategia exekutagarria izan behar du."
 
@@ -11364,14 +12908,34 @@ msgstr ""
 "Saguan oinarritutako mapa elkarreragilea ordu-zona hautatzeko. Teklatuarekin "
 "beheko goitibeherako konbinazio-koadroa erabil daiteke."
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "Ezin izan da esteka ireki."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "Ezin izan da Evolution-en laguntza bistaratu."
 
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "'%s' egutegia irekitzen"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "'%s' zirkularrak irekitzen"
+
+#: ../e-util/e-misc-utils.c:2396
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "'%s' zereginak irekitzen"
+
+#: ../e-util/e-misc-utils.c:2399
+#, c-format
+msgid "Opening address book '%s'"
+msgstr "'%s' helbide-liburua irekitzen"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Erakutsi kontaktuak"
@@ -11390,10 +12954,10 @@ 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:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1215
+#: ../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
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
@@ -11412,7 +12976,7 @@ msgstr "Helbide-liburua"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Kontaktuak"
 
@@ -11421,25 +12985,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Zabaldu %s barnean"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopiatu %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "E_baki %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "E_ditatu %s"
@@ -11449,43 +13013,43 @@ msgstr "E_ditatu %s"
 msgid "_Delete %s"
 msgstr "E_zabatu %s"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolution linean dago. Egin klik botoi honetan lineaz kanpo lan egiteko."
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolution lineaz kanpo dago.Egin klik botoi honetan linean lan egiteko."
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolution lineaz kanpo dago, sarea ez dagoelako erabilgarri."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "Gako-sortaren gakoa ezin da erabili: ez dago erabiltzaile- edo ostalari-"
 "izenik"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Blok. Maius. aktibatuta dago."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "_Gogoratu pasaesaldia"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Gogoratu pasaesaldia saio honen oroigarriarentzako"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "_Gogoratu pasahitza"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Gogoratu pasahitza saio honen oroigarriarentzako"
 
@@ -11508,69 +13072,69 @@ msgid ""
 msgstr ""
 "Inprimatzeko sistemak ez du erroreari buruzko bestelako xehetasunik eman."
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Metodoa:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Atzeratu mahaigainaren ezarpenetara"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "_Ireki mahaigainaren ezarpenak"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "Eskuz"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_HTTP proxy-a:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS proxy-a:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_Socks proxy-a:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "Ez ikusi egin _ostalariei:"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "Konfigurazioaren _URLa:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Erabili zuzeneko konexioa, ez da proxy-rik behar."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Aldatu oinarrizko proxy-en hobespenetara"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Aldatu proxy-en hobespen aurreratuerara"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Aplikatu proxy-aren ezarpen pertsonalizatua kontu hauei:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
 msgstr ""
-"<b>Proxy-aren hobespen aurreratua</b>k bestelako sareko "
-"proxy-ak definitzen uzten dizu, hauek kontu zehatzei aplikatzeko."
+"<b>Proxy-aren hobespen aurreratua</b>k bestelako sareko proxy-ak definitzen "
+"uzten dizu, hauek kontu zehatzei aplikatzeko."
 
 #: ../e-util/e-proxy-selector.c:85
 msgid "Custom Proxy"
@@ -11592,116 +13156,267 @@ msgstr "Gehitu araua"
 msgid "Edit Rule"
 msgstr "Editatu araua"
 
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "Bat datozenak: %u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "Itxi bilaketa-barra"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "_Bilatu:"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "Garbitu bilaketa"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "_Aurrekoa"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "Bilatu esaldiaren aurreko agerraldia"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "_Hurrengoa"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "Bilatu esaldiaren hurrengo agerraldia"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "_Maiuskula/minuskula"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "Orrialdearen behera iritsi da, jarraitu goitik"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "Orrialdearen gora iritsi da, jarraitu behetik"
 
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "Posta"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "_Ezabatzean:"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Estandarra"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Jabea"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Ezkutukoa"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Ezkutu gorenekoa"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Zure begientzako soilik"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Bat ere ez"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Posta-agiria"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "_Erantzutea eskatu da"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "_Barruan"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "egun"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_Komeni denean"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Atzeratu mezuen banaketa"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Ondoren:"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "egun"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "_Ezarri iraungitze-data"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Arte:"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Banatzeko aukerak"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Lehentasuna:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Sailkapena:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Aukera _orokorrak"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "_Sortu bidalitako elementua informazioaren jarraipena egiteko"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Banatuta"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Banatuta eta irekita"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Informazioa guztia"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "Ezabatu automatikoki bidalitako elementua"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Egoeraren jarraipena"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Irekitzean:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Ba_ztertzean:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Osatzean:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "_Onartzean:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Itzuli jakinarazpena"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "_Egoeraren jarraipena"
+
+#: ../e-util/e-source-config.c:684 ../e-util/e-source-config.c:688
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:696 ../e-util/e-source-config.c:700
 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:1301
+#: ../e-util/e-source-config.c:1305
 msgid "Refresh every"
 msgstr "Freskatzeko maiztasuna: "
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1335 ../e-util/e-source-config.c:1405
 msgid "Use a secure connection"
 msgstr "Erabili konexio segurua"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1431
 msgid "Unset _trust for SSL certificate"
 msgstr "Kendu SSL ziurtagiriaren _fidagarritasuna"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1467
 msgid "User"
 msgstr "Erabiltzailea"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "_Helburua"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "Hautatu helburua"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Ezezaguna (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(iradokizunik ez)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "Gehiago..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Gehitu '%s' hiztegiari"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "Ez ikusi egin denei"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "Zuzenketa ortografikoaren iradokizunak"
 
@@ -11716,10 +13431,6 @@ msgstr ""
 "\"{0}\" izeneko fitxategia badago lehendik ere. Hau ordeztean bere edukia "
 "gainidazten da."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Ordeztu"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Ezin da \"{0}\" fitxategia gorde."
@@ -11814,29 +13525,29 @@ msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr ""
 "Zereginak zerbitzatzeko &quot;{0}&quot; motorrak errore bat aurkitu du."
 
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:684
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "egin klik gehitzeko"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Eraman hautatutako zutabeen izenak gora"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Eraman hautatutako zutabeen izenak bat gora"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Eraman hautatutako zutabeen izenak bat behera"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Eraman hautatutako zutabeen izenak behera"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Hautatu zutabeen izen guztiak"
 
@@ -11864,9 +13575,71 @@ msgstr "Erakutsi eremuak"
 msgid "Choose the order of information to appear in the message list."
 msgstr "Aukeratu informazioaren ordena mezuen zerrendan agertzeko."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Gehitu zutabea"
+#: ../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"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Ordenatu..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Elkartu honela..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "_Erakutsitako eremuak..."
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Garbitu _dena"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "_Erakutsi eremua ikuspegian"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Gorantz"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Beherantz"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Elkartu elementuak honen arabera"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Erakutsi _eremua ikuspegian"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Gero "
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Erakutsi eremua _ikuspegian"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Erakutsi eremua i_kuspegian"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Ordenatu"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Garbitu dena"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Ordenatu elementuak honen arabera"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -11876,6 +13649,10 @@ msgstr ""
 "Taulan zutabe bat gehitzeko arrastatu zutabea\n"
 "agertzea nahi duzun kokalekura."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Gehitu zutabea"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -11890,71 +13667,67 @@ msgid_plural "%s (%d items)"
 msgstr[0] "%s (elementu %d)"
 msgstr[1] "%s (%d elementu)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "Pertsonalizatu uneko ikuspegia"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "Ordenatu g_orantz"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "Ordenatu _beherantz"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "Ordenatu _gabe"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "Elkartu _eremu honen arabera"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "Taldekatu _koadroaren arabera"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "Kendu _zutabe hau"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "Gehitu z_utabea..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "_Lerrokadura"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "_Egokiena"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "Eman formatu zu_tabeei..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "_Pertsonalizatu uneko ikuspegia..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "_Ordenatu honen arabera"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "_Pertsonalizatu"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "Hautatu denak"
 
-#: ../e-util/e-text.c:2123
-msgid "Input Methods"
-msgstr "Sarrerako metodoak"
-
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
 #: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
@@ -11962,6 +13735,32 @@ msgstr "Sarrerako metodoak"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Hautatu ordu-zona"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Erabili saguaren ezkerreko botoia maparen area bat handiagotzeko eta hautatu "
+"ordu-zona.\n"
+"Erabili saguaren eskuineko botoia area txikiagotzeko."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Ordu-zonak"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Hautapena"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Ordu-zonaren goiti-beherako konbinazio-koadroa"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Egin klik hemen URLa irekitzeko"
@@ -11970,72 +13769,96 @@ msgstr "Egin klik hemen URLa irekitzeko"
 msgid "Enter a URL here"
 msgstr "Idatzi URLa hemen"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Evolution-en iturburuaren ikustailea"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Bistaratu izena"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Banderak"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "Identitatea"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "_Kopiatu estekaren helbidea"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "Kopiatu esteka arbelean."
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "Ire_ki esteka arakatzailean"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "Ireki esteka web arakatzailean"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "Kopiatu _helbide elektronikoa"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "_Kopiatu irudia"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "Kopiatu irudia arbelean"
 
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "Gorde _irudia..."
+
+#: ../e-util/e-web-view.c:331
+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
 msgid "Select all text and images"
 msgstr "Hautatu testu eta irudi guztiak"
 
-#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
-#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view.c:1001
 #, c-format
 msgid "Click to call %s"
 msgstr "Egin klik %s(r)i deitzeko"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view.c:1003
 msgid "Click to hide/unhide addresses"
 msgstr "Egin klik helbideak ezkutatzeko/bistaratzeko"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1014
 #, c-format
-msgid "Click to open %s"
-msgstr "Egin klik %s irekitzeko"
+msgid "Go to the section %s of the message"
+msgstr "Joan mezuaren '%s' atalera"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "Gorde _irudia..."
+#: ../e-util/e-web-view.c:1016
+msgid "Go to the beginning of the message"
+msgstr "Joan mezuaren hasierara"
 
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "Gorde irudia fitxategi batean"
+#: ../e-util/e-web-view.c:1020
+#, c-format
+msgid "Click to open %s"
+msgstr "Egin klik %s irekitzeko"
 
-#: ../e-util/e-web-view.c:2902
+#: ../e-util/e-web-view.c:2853
 msgid "Copying image to clipboard"
 msgstr "Irudia arbelean kopiatzen"
 
-#: ../e-util/e-web-view.c:3090
+#: ../e-util/e-web-view.c:3041
 msgid "Save Image"
 msgstr "Gorde irudia"
 
-#: ../e-util/e-web-view.c:3126
+#: ../e-util/e-web-view.c:3077
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Irudia '%s'(e)n gordetzen"
@@ -12056,37 +13879,6 @@ msgstr "Desegin 'Ezabatu testua'"
 msgid "Redo 'Delete text'"
 msgstr "Berregin 'Ezabatu testua'"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%Y %B %d"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Egutegia: %s - %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "Evolution-en egutegi-elementua"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Evolution-en iturburuaren ikustailea"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Bistaratu izena"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Banderak"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Identitatea"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Data falta da."
@@ -12147,6 +13939,83 @@ msgstr "Balioa falta da."
 msgid "One or more values cannot be empty."
 msgstr "Balio bat edo gehiago ezin dira hutsik egon."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "uneko ordua"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "zuk zehaztutako ordua"
+
+#: ../e-util/filter.ui.h:4
+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
+msgid "seconds"
+msgstr "segundo igarotakoan"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "aste"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "hilabete"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "urte"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "duela"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "etorkizunean"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Erakutsi postaren iragazkiak:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "_Iragazteko arauak"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Konparazio-ordua:"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Mezuaren data sistemako uneko orduarekin\n"
+"konparatuko da iragazketa egiten denean."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Mezuaren data zehaztutako datako\n"
+"12:00am orduarekin konparatuko da."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Mezuaren data iragazketa gertatzen den\n"
+"orduarekin konparatuko da."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Taulako gelaxka"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
@@ -12167,10 +14036,6 @@ msgstr "zabaldu errenkada gelaxka hau duen ETree-an"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "tolestu errenkada gelaxka hau duen ETree-an"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Taulako gelaxka"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "egin klik"
@@ -12183,6 +14048,14 @@ msgstr "ordenatu"
 msgid "Save Current View"
 msgstr "Gorde uneko ikuspegia"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Sortu ikuspegi berria"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Ordeztu dagoen ikuspegia"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
@@ -12219,6 +14092,27 @@ msgstr "Ezin izan da sinadura kargatu."
 msgid "Could not save signature."
 msgstr "Ezin izan da sinadura gorde."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolution informazio pertsonala kudeatzeko aplikazio bat da, bateratutako "
+"posta elektronikoa, egutegia eta helbide-liburuaren funtzionalitatea "
+"eskaintzen du."
+
+#: ../evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolution-ek industriaren datu-formatuen eta sareko protokoloen barruti "
+"handia onartzen du informazioa trukatzeko, eta bereziki estandarrak eta "
+"segurtasuna betetzen du. Evolution-ek Microsoft Exchange-rekin ere "
+"bateratzen da \"Exchange Web Services\" (EWS) hedapenaren bidez."
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -12285,87 +14179,56 @@ msgstr[1] "%d mezu gordetzen"
 msgid "Invalid folder URI '%s'"
 msgstr "Karpetaren '%s' URIa baliogabea"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Ez dago garraioaren zerbitzu erabilgarririk."
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Huts egin du irteerako iragazkiak aplikatzean: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Huts egin du %s(r)i eranstean: %s\n"
-"Horren ordez, Bidalitakoen karpeta lokalean gehituko da."
-
-#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../libemail-engine/mail-ops.c:774
-#, 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:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "Mezua bidaltzen"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1060
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174
+#: ../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:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1167
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Zirriborroa"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1178
+#: ../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:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1182
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Bidalitakoak"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1170
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
+#: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "Txantiloiak"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa"
 
-#: ../libemail-engine/e-mail-session.c:1373
+#: ../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:1423
+#: ../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:1486
+#: ../libemail-engine/e-mail-session.c:1502
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
@@ -12373,13 +14236,62 @@ msgid ""
 msgstr ""
 "Ez da helburuko helbiderik eman, mezua birbidaltzea bertan behera utzi da."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1515
 #, 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
+#, c-format
+msgid "Waiting for '%s'"
+msgstr "%s(r)en zain"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+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
+#, 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
+msgid "Sending message"
+msgstr "Mezua bidaltzen"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -12417,7 +14329,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Mezuak '%s'(e)ndik hartzen"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:753
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12430,56 +14342,61 @@ msgstr ""
 "zure iragazkiak 'Editatu->Mezuen iragazkiak' menuan.\n"
 "Jatorrizko errorea: %s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1046
 #, 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:975
+#: ../libemail-engine/mail-ops.c:1052
 msgid "Canceled."
 msgstr "Bertan behera utzita."
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "Osatuta."
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1168
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Mezuak '%s'(e)ra eramaten"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1169
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Mezuak '%s'(e)n kopiatzen"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1288
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1416
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "'%s' kontua betiko ezabatzen eta biltegiratzen"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1417
 #, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' kontua biltegiratzen"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1492
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
+#: ../libemail-engine/mail-ops.c:1584
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "Karpetaren aldaketak '%s'(e)n prozesatzen"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -12540,51 +14457,44 @@ msgstr "Ireki _lineako kontuak"
 msgid "This account was created through the Online Accounts service."
 msgstr "Kontu hau Lineako Kontuen zerbitzuaren bidez sortu zen."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "_Berrezarri ordena"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
 "Kontuen izenak arrasta eta jaregin ditzakezu haiek berriro ordenatzeko."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1228
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Kontuaren izena"
 
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "Lehenetsia"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Ez da helbide elektronikorik eman"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "Domeinua falta da helbide elektronikoan"
 
-#: ../mail/e-mail-backend.c:841
+#: ../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:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../mail/e-mail-browser.c:128 ../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"
 
@@ -12598,23 +14508,23 @@ msgid "Go _Back"
 msgstr "Joan a_tzera"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Saltatu bilaketa"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Evolution-eko kontuaren morroia"
 
-#: ../mail/e-mail-config-assistant.c:936
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "_Berrikusi xehetasunak"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "_Begiratu zein mota onartzen diren"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12628,7 +14538,7 @@ msgstr ""
 "\n"
 "Ezarpenak gordetzeko, egin klik \"Aplikatu\" botoian."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Eginda"
 
@@ -12657,62 +14567,71 @@ msgid "S_ave replies in the folder of the message being replied to"
 msgstr "_Gorde erantzunak erantzuten ari zaizkion mezuaren karpetan"
 
 #: ../mail/e-mail-config-defaults-page.c:628
+msgid "Archi_ve Folder:"
+msgstr "_Artxibatu karpeta:"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+msgid "Choose a folder to archive messages to."
+msgstr "Aukeratu karpeta mezuak hor artxibatzeko."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "_Leheneratu lehenetsiak"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Erabili _Zakarrontziaren benetako karpeta:"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "Aukeratu karpeta ezabatutako mezuentzako."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Erabili _Baztergarrien benetako karpeta:"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "Aukeratu karpeta mezu baztergarrientzako."
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Mezuak prestatzea"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Be_ti bidali Cc kopia honi:"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Beti bi_dali Bcc kopia honi:"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Mezuaren hartzaileak"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "B_idali mezuaren irakurragiria:"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Inoiz ere ez"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Beti"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Galdetu mezu bakoitzean"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "Lehenespenak"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12722,13 +14641,13 @@ msgstr ""
 "eremuak ez dira nahitaez bete beharrekoak. Datu horiek zuk bidaltzen dituzun "
 "mezuetan agertzea nahi baduzu bakarrik bete behar dituzu."
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Kontuaren informazioa"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12736,36 +14655,41 @@ msgstr ""
 "Idatzi kontu honentzat erabili nahi duzun izena.\n"
 "Adibidez 'Lanekoa' edo 'Nirea'."
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "Beharrezko informazioa"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "_Izen-abizenak:"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "_Helbide elektronikoa:"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Aukerako informazioa"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "Erant_zun honi:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "E_rakundea:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "Gehitu _sinadura berria..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "Try _setup account automatically, based on Email Address"
+msgstr ""
+"_Saiatu kontua automatikoki konfiguratzen. helb. elektronikoan oinarrituz"
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Kontuen xehetasunak bilatzen..."
 
@@ -12777,7 +14701,7 @@ msgstr "Mezu berriak ote dauden begiratzen"
 msgid "Check for _new messages every"
 msgstr "Begiratu _mezu berririk dagoen"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Jasotzeko aukerak"
 
@@ -12785,99 +14709,107 @@ msgstr "Jasotzeko aukerak"
 msgid "Receiving Email"
 msgstr "Mezuak jaso"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
-#: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, c-format
+msgctxt "PGPKeyDescription"
+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
+#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Orokorra"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "_Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Pretty Good Privacy (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "OpenPGP _gakoaren IDa:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "_Sinaduraren algoritmoa:"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:69
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:70
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:71
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:72
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Beti _sinatu kontu honetatik bidalitako mezuak"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Enkriptatu _beti neure buruari posta enkriptatua bidaltzean"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Enkriptatzean beti _fidagarritzat jo nire gako-sortako gakoak"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "MIME segurua (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "Sinatze-ziur_tagiria:"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "Hautatu"
 
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1007
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "_Garbitu"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "Sinaduraren _algoritmoa:"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:594
 msgid "Always sign outgoing messages when using this account"
 msgstr "Beti sinatu kontu honetatik bidalitako mezuak"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "Enkriptatze-ziurtagiria:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Beti enkriptatu kontu honetatik bidalitako mezuak"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Enkriptatu beti neure buruari posta enkriptatua bidaltzean"
 
@@ -12885,7 +14817,7 @@ msgstr "Enkriptatu beti neure buruari posta enkriptatua bidaltzean"
 msgid "Sending Email"
 msgstr "Mezuak bidali"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "_Zerbitzari mota:"
 
@@ -12897,50 +14829,50 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 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:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Xehetasun pertsonalak"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Izen-abizenak:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Helbide elektronikoa:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Mezuak jaso"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Mezuak bidali"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Zerbitzari mota:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Erabiltzaile-izena:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Segurtasuna:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "Kontuaren laburpena"
 
@@ -12948,48 +14880,104 @@ msgstr "Kontuaren laburpena"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "Ongi etorri Evolution-en posta konfiguratzeko morroira.\n"
 "\n"
-"Hasteko, egin klik \"Jarraitu\"n."
+"Hasteko, egin klik \"Hurrengoa\" botoian."
 
 #: ../mail/e-mail-config-welcome-page.c:166
 #: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Kontu-editorea"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "_Gehitu helbide-liburuan..."
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "_Helbidera"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "_Helbidetik"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "Bidali _erantzuna honi..."
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "Bidali erantzun bat helbide honetara"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "Sortu _bilaketa-karpeta"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "Sortu karpeta"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Adierazi karpeta non sortu behar den:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "_Sortu"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+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
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Erantzunda"
+
+#: ../mail/e-mail-free-form-exp.c:227
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Ezabatuta"
+
+#: ../mail/e-mail-free-form-exp.c:228
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Zirriborroa"
+
+#: ../mail/e-mail-free-form-exp.c:229
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Markatuta"
+
+#: ../mail/e-mail-free-form-exp.c:230
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Ikusita"
+
+#: ../mail/e-mail-free-form-exp.c:231
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Eranskina"
+
+#: ../mail/e-mail-free-form-exp.c:479
+msgctxt "ffe"
+msgid "no"
+msgstr "ez"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr "faltsua"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Baztergarriak iragazteko softwarea:"
 
@@ -12997,32 +14985,32 @@ msgstr "Baztergarriak iragazteko softwarea:"
 msgid "_Label name:"
 msgstr "_Etiketa-izena:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Garrantzitsua"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Lanekoa"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Pertsonala"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "_Egitekoa"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Geroago"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1124
 msgid "Add Label"
 msgstr "Gehitu etiketa"
 
@@ -13042,35 +15030,35 @@ msgstr ""
 msgid "Color"
 msgstr "Kolorea"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Eraman hautatutako goiburuak gora"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Eraman hautatutako goiburuak errenkada bat gora"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Eraman hautatutako goiburuak errenkada bat behera"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Eraman hautatutako goiburuak behera"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Hautatu goiburu guztiak"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Goiburuaren izena"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Goiburuaren balioa"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:113
 msgid "Headers"
 msgstr "Goiburua"
 
@@ -13079,598 +15067,654 @@ msgstr "Goiburua"
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Kopiatu karpeta honetara"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "K_opiatu"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+msgid "Copy to Folder"
+msgstr "Kopiatu karpeta honetara"
+
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "_Lekuz aldatu"
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:350 ../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
 msgid "_Do not ask me again."
 msgstr "_Ez galdetu berriro."
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Beti ezikusi egin posta-zerrenden 'Erantzun honi'"
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "Huts egin du mezuak eskuratzean:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3013
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "'%s' mezua eskuratzen"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "Ge_hitu bidaltzailea helbide-liburuan"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr "_Artxiboa..."
+
+#: ../mail/e-mail-reader.c:1970
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "Eraman hautatutako mezuak kontuaren 'Artxiboa' karpetara"
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr "Begiratu mezu _baztergarririk dagoen"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "Iragazi hautatutako mezuak, baztergarri-egoeraren arabera"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "_Ezabatu mezua"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko gisa"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Sortu iragazkiaren araua _posta-zerrendarentzako..."
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sortu araua posta-zerrenda honetako mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Sortu iragazkiaren araua _hartzailearentzako..."
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sortu araua hartzaile hauek dituzten mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Sortu iragazkiaren araua _bidaltzailearentzako..."
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sortu araua bidaltzaile hau duten mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Sortu iragazkiaren araua _gaiarentzako..."
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sortu araua gai hau duten mezuak iragazteko"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "_Aplikatu iragazkiak"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "Aplikatu iragazki-arauak hautatutako mezuei"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "_Bilatu mezuan..."
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:2033
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "_Garbitu bandera"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Kendu jarraipenaren bandera hautatutako mezuetatik"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "Ban_dera osatuta"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:2047
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Ezarri jarraipenaren bandera osatutakoei hautatutako mezuetan"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "Jarrait_u..."
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "Birbidali _eranskin gisa"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 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:1974
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "Birbidali _barnean gisa"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "Birbidali _aipamen gisa"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
 msgstr "Kargatu iru_diak"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
 msgstr "Kargarazi HTML mezuetako irudiak"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Sub-Thread"
+msgstr "_Ez ikusi egin azpi-hariari"
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a sub-thread as read automatically"
+msgstr "Markatu azpi-hariko mezu berriak irakurrita gisa automatikoki"
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+msgid "_Ignore Thread"
+msgstr "_Ez ikusi egin hariari"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr "Markatu hariko mezu berriak irakurrita gisa automatikoki"
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "_Garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "Markatu hautatutako mezuak garrantzitsu gisa"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "_Baztergarria"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "Markatu hautatutako mezuak baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "E_z-baztergarria"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "Markatu hautatutako mezuak ez-baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "_Irakurri"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "Markatu hautatutako mezuak irakurritako gisa"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+msgid "Do not _Ignore Sub-Thread"
+msgstr "_Kontutan hartu azpi-haria"
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a sub-thread as read automatically"
+msgstr "Ez markatu azpi-hariko mezu berriak irakurrita gisa automatikoki"
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr "_Kontutan hartu haria"
+
+#: ../mail/e-mail-reader.c:2159
+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
 msgid "Uni_mportant"
 msgstr "Ez-garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "Markatu hautatutako mezuak ez-garrantzitsu gisa"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "_Irakurri gabea"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "Markatu hautatutako mezuak irakurri gabeko gisa"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr "Ireki hautatutako mezuak prestatzeko leihoan editatzeko"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "Prestatu mezu _berria"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "Ireki posta-mezua idazteko leihoa"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "Ireki leiho _berrian"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "Eraman hautatutako mezuak beste karpeta batera"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "_Hurrengo mezua"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "Bistaratu hurrengo mezua"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu _garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "Bistaratu hurrengo mezu garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "_Hurrengo haria"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "Bistaratu hurrengo haria"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "Hurrengo _irakurri gabeko mezua"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "Bistaratu irakurri gabeko hurrengo mezua"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "_Aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "Bistaratu aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "Aurreko _mezu garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "Bistaratu aurreko mezu garrantzitsua"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "Aurreko _haria"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "Bistaratu aurreko haria"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "Irakurri _gabeko aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "Bistaratu irakurri gabeko aurreko mezua"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "_Kendu eranskinak"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "Kendu eranskinak"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "Kendu _bikoiztutako mezuak"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "Markatu hautatutako mezuak bikoiztuta gisa"
 
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2297 ../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:2165
+#: ../mail/e-mail-reader.c:2299
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Prestatu hautatutako mezuaren hartzaile guztientzako erantzuna"
 
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2311
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Prestatu hautatutako mezuaren bidaltzailearentzako erantzuna"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "_Gorde mbox gisa..."
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "Gorde hautatutako mezuak mbox gisa"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "_Mezuaren iturburua"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "_Berreskuratu mezua"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "_Tamaina normala"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "_Handiagotu"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "Txikitu testuaren tamaina"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "_Sortu"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "_Karaktere-kodeketa"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "_Birbidali honela"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "Erantzun _taldeari"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "_Joan hona"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "Mar_katu honela"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "_Zooma"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Sortu _posta-zerrendaren bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr "Sortu bilaketa-karpeta posta-zerrenda honentzat"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Sortu _hartzailearen bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "Sortu bilaketa-karpeta hartzaile hauentzat"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Sortu _bidaltzailearen bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "Sortu bilaketa-karpeta bidaltzaile honentzat"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Sortu _gaiaren bilaketa-karpeta..."
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "Sortu bilaketa-karpeta gai honentzat"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "Markatu jarraitasunerako..."
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "Markatu _baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "Markatu _ez baztergarri gisa"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "Markatu _ez-garrantzitsu gisa"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "Kurtsore _modua"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2568
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Erakutsi kurtsore keinukaria bistaratutako mezuen gorputzean"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "Mezu guztien _goiburuak"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "Erakutsi mezuak posta-goiburu guztiekin"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:3019
 msgid "Retrieving message"
 msgstr "Mezua eskuratzen"
 
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:4027
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:4028
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:4047
 msgid "Group Reply"
 msgstr "Erantzun taldeari"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:4048
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Erantzun posta-zerrendari, edo hartzaile guztiei"
 
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4114 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: ../mail/e-mail-reader.c:3871
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4126
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ../mail/e-mail-reader.c:3875
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4130
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4139 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Erantzun"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Ez abisatu berriro"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../mail/e-mail-reader-utils.c:556 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1033
+msgid "Marking thread to be ignored"
+msgstr "Markatu haria ez ikusi egiteko"
+
+#: ../mail/e-mail-reader-utils.c:1037
+msgid "Unmarking thread from being ignored"
+msgstr "Kendu hariaren 'ez ikusi egin' marka"
+
+#: ../mail/e-mail-reader-utils.c:1041
+msgid "Marking sub-thread to be ignored"
+msgstr "Markatu azpi-haria ez ikusi egiteko"
+
+#: ../mail/e-mail-reader-utils.c:1045
+msgid "Unmarking sub-thread from being ignored"
+msgstr "Kendu azpi-hariaren 'ez ikusi egin' marka"
+
+#: ../mail/e-mail-reader-utils.c:1280
 msgid "Printing"
 msgstr "Inprimatzen"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1515
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13684,7 +15728,7 @@ msgstr[1] ""
 "'%s' karpetak bikoiztutako %u mezu ditu. Ziur zaude horiek ezabatzea nahi "
 "dituzula?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2345
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Gorde mezua"
@@ -13695,13 +15739,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:2047
+#: ../mail/e-mail-reader-utils.c:2366
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Mezua"
 msgstr[1] "Mezuak"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2739
 msgid "Parsing message"
 msgstr "Mezua analizatzen"
 
@@ -13717,7 +15761,7 @@ msgstr "Markatu jarraipena egiteko"
 #. * 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:1454
+#: ../mail/em-composer-utils.c:1507
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13725,23 +15769,24 @@ msgstr ""
 "Jatorrizko mezua: ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} ${24Hour}:"
 "${Minute} ${TimeZone}, egilea: ${Sender}"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Birbidalitako mezua --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-------- Jatorrizko mezua --------"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3076
 msgid "Posting destination"
 msgstr "Bidalketa-helburua"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3081
 msgid "Choose folders to post the message to."
 msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
 
@@ -13749,264 +15794,6 @@ msgstr "Aukeratu talde-mezua bidaltzeko karpetak."
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Doitu puntuazioa"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Edozein goiburu"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Esleitu kolorea"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Esleitu puntuazioa"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "BCC"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Soinu-seinalea"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "CC"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Eginda: "
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Jasotze-data"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Bidaltze-data"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Ezabatuta"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "Zirriborroa"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "Adierazpena"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "Jarraipena"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "Birbidali: "
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "Garrantzitsua"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "Mezu baztergarrien proba"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "Baztergarriak"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "Etiketa"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "Posta-zerrenda"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "Guztiekin bat etorri"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "Mezuaren gorputza"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "Mezuaren goiburua"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Message Location"
-msgstr "Mezuaren kokalekua"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Message is Junk"
-msgstr "Mezua baztergarria da"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "Message is not Junk"
-msgstr "Mezua ez da baztergarria"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "Kanalizatu programara"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "Jo soinua"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "Irakurrita"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Hartzailea"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "Adierazpen erregularra"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "Erantzunda"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "Exekutatu programa"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Puntuazioa"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "Bidaltzailea edo hartzaileak"
-
-#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Bidaltzailea"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Set Label"
-msgstr "Ezarri etiketa"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Set Status"
-msgstr "Ezarri egoera"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "Tamaina (kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "Iturburu-kontua"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "Goiburu espezifikoa"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "Utzi prozesatzeari"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "Kendu kolorea"
-
-#: ../mail/em-filter-i18n.h:54
-msgid "Unset Status"
-msgstr "Egoera ezarri gabe"
-
-#: ../mail/em-filter-i18n.h:57
-msgid "does not end with"
-msgstr "ez da honela amaitzen"
-
-#: ../mail/em-filter-i18n.h:58
-msgid "does not exist"
-msgstr "ez dago"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "does not have words"
-msgstr "ez du hitzik"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "does not return"
-msgstr "ez du hau ematen"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "does not sound like"
-msgstr "ez da honen antzekoa"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "does not start with"
-msgstr "ez da honela hasten"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "ends with"
-msgstr "honela amaitzen da"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "exists"
-msgstr "badago"
-
-#: ../mail/em-filter-i18n.h:65
-msgid "has words"
-msgstr "hitzak ditu"
-
-#: ../mail/em-filter-i18n.h:66
-msgid "is Flagged"
-msgstr "Banderaduna da"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "is after"
-msgstr "honen ondorengoa da"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "is before"
-msgstr "honen aurrekoa da"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "is not Flagged"
-msgstr "ez da Banderaduna"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "is not set"
-msgstr "ez da ezarri"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "is set"
-msgstr "ezarri da"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "returns greater than"
-msgstr "hau baino handiagoa ematen du"
-
-#: ../mail/em-filter-i18n.h:77
-msgid "returns less than"
-msgstr "hau baino txikiagoa ematen du"
-
-#: ../mail/em-filter-i18n.h:78
-msgid "returns"
-msgstr "hau ematen du"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "sounds like"
-msgstr "honen antzekoa da"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "starts with"
-msgstr "honela hasten da"
-
 #. and now for the action area
 #: ../mail/em-filter-rule.c:587
 msgid "Then"
@@ -14052,13 +15839,9 @@ msgstr "Karpetaren propietateak"
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "_Sortu"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "_Karpetaren izena:"
+#: ../mail/em-folder-selector.c:398
+msgid "Create a new folder"
+msgstr "Sortu karpeta berria"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
@@ -14070,31 +15853,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1661
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "Posta-karpetaren zuhaitza"
 
-#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta lekuz aldatzen"
 
-#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta kopiatzen"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2470
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s karpetara eramaten"
 
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2472
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s karpetan kopiatzen"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin da mezurik ekarri maila goreneko biltegira"
@@ -14104,26 +15887,18 @@ msgstr "Ezin da mezurik ekarri maila goreneko biltegira"
 msgid "UNMATCHED"
 msgstr "SAILKATU GABEAK"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Eraman karpeta hona"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopiatu karpeta hemen"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "Sortu karpeta"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "Adierazi karpeta non sortu behar den:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Harpidetu"
@@ -14137,7 +15912,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:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
@@ -14174,7 +15949,7 @@ msgid "Su_bscribe"
 msgstr "_Harpidetu"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Unsubscribe from the selected folder"
 msgstr "Kendu harpidetza hautatutako karpetatik"
 
@@ -14199,8 +15974,8 @@ msgid "Refresh the folder list"
 msgstr "Freskatu karpeten zerrenda"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "_Refresh"
 msgstr "_Freskatu"
 
@@ -14209,7 +15984,7 @@ msgid "Stop the current operation"
 msgstr "Gelditu uneko eragiketa"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "_Stop"
 msgstr "_Gelditu"
 
@@ -14224,11 +15999,6 @@ 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:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Ez erakutsi mezu hau berriro."
-
 #: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Posta-iragazkiak"
@@ -14246,34 +16016,328 @@ msgstr "Bilatu _karpetak"
 msgid "Add Folder"
 msgstr "Gehitu karpeta"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Bilaketa-karpetaren iturburuak"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Eguneratu automatikoki _iturburuko edozein karpeta aldatzean"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Karpeta lokal guztiak"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Urruneko karpeta aktibo guztiak"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Karpeta lokal eta urruneko karpeta aktibo guztiak"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Zehaztutako karpetak"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "azpikarpetak barne"
 
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "Bidaltzailea"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "honela hasten da"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "ez da honela hasten"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "Hartzailea"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "BCC"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "Bidaltzailea edo hartzaileak"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "hitzak ditu"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "ez du hitzik"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "Goiburu espezifikoa"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "badago"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "ez dago"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Mezuaren gorputza"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Adierazpena"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+msgid "Free Form Expression"
+msgstr "Formaren adierazpen askea"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "Bidaltze-data"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "honen aurrekoa da"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "honen ondorengoa da"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Jasotze-data"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Etiketa"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "Puntuazioa"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "Tamaina (kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "Erantzunda"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "Garrantzitsua"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "Irakurrita"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:120
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "Baztergarriak"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "Jarraipena"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
+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: "
+
+#: ../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"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Mailing list"
+msgstr "Posta-zerrenda"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Regex Match"
+msgstr "Adierazpen erregularra"
+
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Header"
+msgstr "Mezuaren goiburua"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Source Account"
+msgstr "Iturburu-kontua"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "Pipe to Program"
+msgstr "Kanalizatu programara"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "returns"
+msgstr "hau ematen du"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "does not return"
+msgstr "ez du hau ematen"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns greater than"
+msgstr "hau baino handiagoa ematen du"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "returns less than"
+msgstr "hau baino txikiagoa ematen du"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Junk Test"
+msgstr "Mezu baztergarrien proba"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is Junk"
+msgstr "Mezua baztergarria da"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Message is not Junk"
+msgstr "Mezua ez da baztergarria"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+msgid "Message Location"
+msgstr "Mezuaren kokalekua"
+
+#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:56
+msgid "Match All"
+msgstr "Guztiekin bat etorri"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Stop Processing"
+msgstr "Utzi prozesatzeari"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Set Label"
+msgstr "Ezarri etiketa"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Assign Color"
+msgstr "Esleitu kolorea"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Unset Color"
+msgstr "Kendu kolorea"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Score"
+msgstr "Esleitu puntuazioa"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Adjust Score"
+msgstr "Doitu puntuazioa"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Set Status"
+msgstr "Ezarri egoera"
+
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "Ezabatuta"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Unset Status"
+msgstr "Egoera ezarri gabe"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Beep"
+msgstr "Soinu-seinalea"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Play Sound"
+msgstr "Jo soinua"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Run Program"
+msgstr "Exekutatu programa"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Forward to"
+msgstr "Birbidali: "
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Elm datuak inportatzen"
@@ -14438,107 +16502,102 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodetu fitxategi-izenak _Outlook/Gmail moduan"
 
 #: ../mail/mail-config.ui.h:12
+msgid "Send messages through Outbo_x folder"
+msgstr "Bidali mezuak '_Irteerako ontzia' karpetaren bidez"
+
+#: ../mail/mail-config.ui.h:13
+msgid "Number of characters for word w_rapping:"
+msgstr "Karaktere kopurua _itzulbiratzeko:"
+
+#: ../mail/mail-config.ui.h:14
 msgid "Ch_aracter encoding:"
 msgstr "_Karaktere-kodeketa:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "Replies and Forwards"
 msgstr "Erantzunak eta birbidalketak"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "_Reply style:"
 msgstr "_Erantzuteko estiloa:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Forward style:"
 msgstr "_Birbidaltzeko estiloa:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "Start _typing at the bottom on replying"
 msgstr "Hasi _idazten behean erantzutean"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "_Keep signature above the original message on replying"
 msgstr "_Mantendu sinadura jatorrizko mezuaren gainean erantzutean"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Ez ikusi egin posta-zerrenden 'Erantzun honi:'"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 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:20
+#: ../mail/mail-config.ui.h:22
 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:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Eranskina"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Barnean (Outlook estiloa)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Aipamen gisa"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ez jarri komatxorik"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Barnean"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "Sig_natures"
 msgstr "_Sinadurak"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Signatures"
 msgstr "Sinadurak"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid "_Languages"
 msgstr "_Hizkuntzak"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:32
 msgid "Languages Table"
 msgstr "Hizkuntzen taula"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 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:33
+#: ../mail/mail-config.ui.h:35
 msgid "Check spelling while I _type"
 msgstr "_Egiaztatu ortografia idatzi ahala"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "_Ortografia-akatsa duten hitzen kolorea:"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Aukeratu kolorea"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "Ortografia-egiaztapena"
-
 #: ../mail/mail-config.ui.h:37
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
@@ -14579,233 +16638,256 @@ msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr ""
 "_Hartzaileen baliozko helbide elektronikorik gabeko mezua bidali aurretik"
 
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:51
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "Galdetu bidaltzeko _laster-tekla erabiltzean (Ktrl+Sartu)"
+
+#: ../mail/mail-config.ui.h:52
 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:54
+#: ../mail/mail-config.ui.h:56
 msgid "Use for Folders"
 msgstr "Erabili karpetentzako"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:57
 msgid "A_dd"
 msgstr "_Gehitu"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:59
 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:59
+#: ../mail/mail-config.ui.h:61
 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:61 ../modules/mail/em-composer-prefs.c:870
+#: ../mail/mail-config.ui.h:63 ../modules/mail/em-composer-prefs.c:836
 msgid "Account"
 msgstr "Kontua"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:64
 msgid "Send account overrides"
 msgstr "Bidalketako kontua gainjartzea"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:65
 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 "
 "recipients can contain partial addresses or names. The name and the address "
 "parts are compared separately."
 msgstr ""
-"Esleitu zein kontu erabiliko den bidalketako kontu bezala "
-"dagokien karpetentzako edo hartzaileentzako, bidalketako "
-"ohiko kontua gainjartzeko. Hartzaileen zerrendak helbide edo izen "
-"partzialak eduki ditzake. Izen eta helbideen zatiak bereiztuta "
-"konparatzen dira,."
+"Esleitu zein kontu erabiliko den bidalketako kontu bezala dagokien "
+"karpetentzako edo hartzaileentzako, bidalketako ohiko kontua gainjartzeko. "
+"Hartzaileen zerrendak helbide edo izen partzialak eduki ditzake. Izen eta "
+"helbideen zatiak bereiztuta konparatzen dira,."
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:66
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 "_'Karpetaren gainjartzeak' lehentasuna du 'Hartzailearen gainjartzea'ren "
 "gainetik"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:67
 msgid "Send Account"
 msgstr "Bidalketa kontua"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:73 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:75
 msgid "Start up"
 msgstr "Abioan"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:76
 msgid "Check for new _messages on start"
 msgstr "Begiratu _mezu berririk dagoen abioan"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Begiratu mezu berririk dagoen kontu _aktibo guztietan"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:78
 msgid "Message Display"
 msgstr "Mezu-bistaratzea"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:79
 msgid "_Use the same fonts as other applications"
 msgstr "_Erabili beste aplikazioetako letra-tipo berak"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:80
 msgid "S_tandard Font:"
 msgstr "_Letra-tipo estandarra:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:81
 msgid "Select HTML fixed width font"
 msgstr "Hautatu HTML zabalera finkoko letra-tipoa"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML variable width font"
 msgstr "Hautatu HTML zabalera aldakorreko letra-tipoa"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:83
 msgid "Fix_ed Width Font:"
 msgstr "_Zabalera-finkodun letra-tipoa:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:84
 msgid "_Mark messages as read after"
 msgstr "Markatu _mezuak irakurritako gisa honen ondoren"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:86
 msgid "Highlight _quotations with"
 msgstr "_Aipamenak nabarmentzeko erabili"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:87
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "Aukeratu kolorea"
+
+#: ../mail/mail-config.ui.h:88
 msgid "color"
 msgstr "kolorea"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:89
 msgid "Default character e_ncoding:"
 msgstr "Karaktere-kodeketa _lehenetsia:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:90
 msgid "Apply the same _view settings to all folders"
 msgstr "Aplikatu _ikuspegiaren ezarpen berdinak karpeta guztiei"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:91
 msgid "F_all back to threading messages by subject"
 msgstr "_Itzuli mezuen harira gaiaren arabera"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:92
 msgid "Delete Mail"
 msgstr "Ezabatu mezua"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:93
 msgid "Empty _trash folders"
 msgstr "Hustu _zakarrontziko karpetak"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:94
 msgid "Confirm _when expunging a folder"
 msgstr "Berretsi ka_rpeta betiko borratu aurretik"
 
+#: ../mail/mail-config.ui.h:95
+msgid "Archive Mail"
+msgstr "Artxibatu mezuak"
+
+#: ../mail/mail-config.ui.h:96
+msgid "On This Computer A_rchive folder:"
+msgstr "'Ordenagailu honetan'-eko _Artxiboa karpeta:"
+
+#: ../mail/mail-config.ui.h:97
+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:93
+#: ../mail/mail-config.ui.h:99
 msgid "_Show animated images"
 msgstr "_Erakutsi irudi-animazioak"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:100
 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:95
+#: ../mail/mail-config.ui.h:101
 msgid "Loading Images"
 msgstr "Irudiak kargatzea"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:102
 msgid "_Never load images from the Internet"
 msgstr "_Inoiz ez kargatu irudirik Internetetik"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:103
 msgid "_Load images only in messages from contacts"
 msgstr "_Kargatu irudiak mezuan kontaktuetatik"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:104
 msgid "_Always load images from the Internet"
 msgstr "_Beti kargatu irudiak Internetetik"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:105
 msgid "HTML Messages"
 msgstr "HTML mezuak"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:106 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Etiketak"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:107
 msgid "Sender Photograph"
 msgstr "Bidaltzailearen argazkia"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:108
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Erakutsi bidaltzailearen argazkia mezuaren aurrebistan"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:109
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr "Bilatu gra_vatarcom webgunean bidaltzailearen argazkia"
+
+#: ../mail/mail-config.ui.h:110
 msgid "Displayed Message Headers"
 msgstr "Bistaratutako mezuen goiburuak"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:111
 msgid "Mail Headers Table"
 msgstr "Posta-goiburuen taula"
 
-#: ../mail/mail-config.ui.h:105
-#: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../mail/mail-config.ui.h:112
+#: ../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:107
+#: ../mail/mail-config.ui.h:114
 msgid "Check incoming _messages for junk"
 msgstr "Begiratu _sarreran mezurik baztertzeko dagoen"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:115
 msgid "_Delete junk messages"
 msgstr "_Ezabatu mezu baztergarriak"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "_Begiratu baztergarrien aurkako goiburu pertsonalizatuak"
+#: ../mail/mail-config.ui.h:116
+msgid "Just Test Options"
+msgstr "Probako aukerak soilik"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:117
 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:111
+#: ../mail/mail-config.ui.h:118
 msgid "_Lookup in local address book only"
 msgstr "_Begiratu lokaleko helbide-liburuetan soilik"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Aukera honi ezikusi egingo zaio baztergarrien goiburu pertsonalizatu batekin "
-"bat datorrela aurkituz gero."
+#: ../mail/mail-config.ui.h:119
+msgid "Check cu_stom headers for junk"
+msgstr "_Begiratu baztergarrien aurkako goiburu pertsonalizatuak"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:121
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Enkriptaziorik gabe"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:122
 msgid "TLS encryption"
 msgstr "TLS enkriptazioa"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:123
 msgid "SSL encryption"
 msgstr "SSL enkriptazioa"
 
@@ -15076,7 +17158,7 @@ msgstr "Jarraitzen baduzu, ezingo dituzu mezu hauek berreskuratu."
 
 #: ../mail/mail.error.xml.h:37
 msgid "_Expunge"
-msgstr "_Ezabatu betiko"
+msgstr "_Ezabatu betirako"
 
 #: ../mail/mail.error.xml.h:38
 msgid ""
@@ -15087,7 +17169,7 @@ msgstr ""
 "dituzula?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "_Empty Trash"
 msgstr "Hustu _zakarrontzia"
 
@@ -15372,10 +17454,6 @@ msgstr ""
 "Karpeta honi ez ikusi egitea aukera dezakezu, gainidaztea, bere edukia "
 "eranstea edo irtetzea aukera dezakezu."
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Ez ikusi egin"
-
 #: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "_Gainidatzi"
@@ -15574,6 +17652,10 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "'{0}' karpetak ez du bikoiztutako mezurik."
 
 #: ../mail/mail.error.xml.h:155
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Huts egin du &quot;{0}&quot; kontua konektatzean."
+
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Huts egin du &quot;{0}&quot; kontua deskonektatzean."
 
@@ -15590,38 +17672,56 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+msgid "Message is not available in offline."
+msgstr "Mezua ez dago erabilgarri lineaz kanpo."
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline."
+msgstr ""
+"Mezua oraindik deskargatu gabe egoteagatik gerta daiteke. Karpeta, edo "
+"kontua, lineaz kanpo sinkronizatzeko marka daiteke. Ondoren, kontua berriro "
+"linean dagoenean, erabili Fitxategia-&gt;'Deskargatu mezuak lineaz kanpo "
+"erabiltzeko', karpeta hau hautatuta dagoenean, karpetako mezu guztiak lineaz "
+"kanpo erabilgarri egongo direla ziurtatzeko."
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "Huts egin du karpeta irekitzean."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "Huts eign du bikoiztutako mezuak bilatzean."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "Huts egin du mezuak eskuratzean."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "Huts egin du mezuak irakurritako gisa markatzean."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Huts egin du eranskinak mezuetatik kentzean."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "Huts egin du mezuak deskargatzean lineaz kanpo ikusteko."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Huts egin du mezuak diskoan gordetzean."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Ezkutuko fitxategia erantsita dago."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15629,51 +17729,83 @@ msgstr ""
 "'{0}' izeneko eranskina ezkutuko fitxategi bat da, eta datu garrantzitsuak  "
 "eduki ditzake. Gainbegiratu ezazu bidali aurretik."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "Inprimaketak huts egin du."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Inprimagailuaren errorea: &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "Ezin izan da eragiketa '{0}'(e)n landu."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:175
 msgid "You must be working online to complete this operation."
 msgstr "Konektatuta lan egin behar duzu eragiketa hau osatzeko."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Mezua &quot;{0}&quot; kontutik:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:177
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "Huts egin du haria ez ikusi egiteko markatzean '{0}' karpetan"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr "Huts egin du hariari  'ez ikusi egin' marka kentzean '{0}' karpetan"
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark sub-thread to be ignored in folder '{0}'"
+msgstr "Huts egin du azpi-haria ez ikusi egiteko markatzean '{0}' karpetan"
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark sub-thread from being ignored in folder '{0}'"
+msgstr ""
+"Huts egin du azpi-hariari  'ez ikusi egin' marka kentzean '{0}' karpetan"
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Bertan behera uzten..."
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "_Utzi dena"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1248
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "'%s'(e)n mezu berririk dagoen begiratzen"
 
+#: ../mail/mail-send-recv.c:1421
+#, 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
+#, c-format
+msgid "Deleting junk at '%s'"
+msgstr "'%s'(e)ko baztergarriak ezabatzen"
+
+#: ../mail/mail-send-recv.c:1425
+#, c-format
+msgid "Expunging trash at '%s'"
+msgstr "'%s' zakarrontzia betirako ezabatzen"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Bilatu karpeta"
@@ -15686,86 +17818,86 @@ msgstr "Editatu bilaketa-karpeta"
 msgid "New Search Folder"
 msgstr "Bilaketa berrien karpeta"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Ikusita"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Birbidalita"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Txikia"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Handia"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "Handiena"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5749
+#: ../mail/message-list.c:459 ../mail/message-list.c:5969
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: ../mail/message-list.c:2771
+#: ../mail/message-list.c:2960
 msgid "Select all visible messages"
 msgstr "Hautatu ikusgai dauden mezu guztiak"
 
-#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3610 ../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:4706
+#: ../mail/message-list.c:4918
 msgid "Follow-up"
 msgstr "Jarraipena"
 
-#: ../mail/message-list.c:5687
+#: ../mail/message-list.c:5906
 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 "
@@ -15777,7 +17909,7 @@ msgstr ""
 "dagoen goitibeherako zerrendan, edo bilaketa berri bat exekutatuz hura "
 "garbituz (Bilatu->Garbitu menua erabiliz) edo gaineko kontsulta aldatuz."
 
-#: ../mail/message-list.c:5695
+#: ../mail/message-list.c:5914
 msgid "There are no messages in this folder."
 msgstr "Ez dago mezurik karpeta honetan."
 
@@ -15809,55 +17941,64 @@ msgstr "Mezuak hona"
 msgid "Subject - Trimmed"
 msgstr "Gaia - moztuta"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Edozein goiburu"
+
+#: ../mail/searchtypes.xml.in.h:55
 msgid "Subject or Addresses contains"
 msgstr "Gaiak edo Helbideak hau dauka"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Recipients contain"
 msgstr "hartzaileak hau dauka"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Message contains"
 msgstr "mezuak hau dauka"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2123
 msgid "Subject contains"
 msgstr "gaiak hau dauka"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2116
 msgid "Sender contains"
 msgstr "bidaltzaileak hau dauka"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2088
 msgid "Body contains"
 msgstr "gorputzak hau dauka"
 
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2095
+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:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/addressbook/autocompletion-config.c:123
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "_Taulako zutabea:"
 
-#: ../modules/addressbook/autocompletion-config.c:125
+#: ../modules/addressbook/autocompletion-config.c:126
 msgid "Address formatting"
 msgstr "Helbideari formatua ematen"
 
-#: ../modules/addressbook/autocompletion-config.c:128
+#: ../modules/addressbook/autocompletion-config.c:129
 msgid "_Format address according to standard of its destination country"
 msgstr ""
 "_Eman formatua helbideari bere helburuko herrialdearen estandarren arabera"
 
-#: ../modules/addressbook/autocompletion-config.c:136
+#: ../modules/addressbook/autocompletion-config.c:137
 msgid "Autocompletion"
 msgstr "Osatze automatikoa"
 
-#: ../modules/addressbook/autocompletion-config.c:139
+#: ../modules/addressbook/autocompletion-config.c:140
 msgid "Always _show address of the autocompleted contact"
 msgstr "Erakutsi _beti helbidea auto-osatutako kontaktuarekin"
 
@@ -15892,7 +18033,7 @@ msgid "_Contact"
 msgstr "_Kontaktua"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1081
 msgid "Create a new contact"
 msgstr "Sortu kontaktu berria"
 
@@ -15902,7 +18043,7 @@ msgid "Contact _List"
 msgstr "Kontaktuen _zerrenda"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1088
 msgid "Create a new contact list"
 msgstr "Sortu kontaktu-zerrenda berria"
 
@@ -15912,7 +18053,7 @@ msgid "Address _Book"
 msgstr "_Helbide-liburua"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:1004
 msgid "Create a new address book"
 msgstr "Sortu helbide-liburu berria"
 
@@ -15925,264 +18066,264 @@ msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:578
+#: ../modules/addressbook/e-book-shell-view-actions.c:874
 msgid "Save as vCard"
 msgstr "Gorde vCard gisa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Co_py All Contacts To..."
 msgstr "_Kopiatu kontaktu guztiak hemen..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 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:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "D_elete Address Book"
 msgstr "E_zabatu helbide-liburua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Delete the selected address book"
 msgstr "Ezabatu hautatutako helbide-liburua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Mo_ve All Contacts To..."
 msgstr "E_raman kontaktu guztiak hona..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 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:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "_New Address Book"
 msgstr "Helbide-liburu _berria"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Address _Book Properties"
 msgstr "Helbide-_liburuaren propietateak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:1011
 msgid "Show properties of the selected address book"
 msgstr "Erakutsi hautatutako helbide-liburuaren propietateak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../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:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
 msgid "Refresh the selected address book"
 msgstr "Freskatu hautatutako helbide-liburua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Address Book _Map"
 msgstr "Helbide-liburuen _mapa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1025
 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:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../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
 msgid "_Rename..."
 msgstr "Izena _aldatu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:1032
 msgid "Rename the selected address book"
 msgstr "Aldatu hautatutako helbide-liburuaren izena"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:1039
 msgid "Stop loading"
 msgstr "Gelditu kargatzea"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "_Copy Contact To..."
 msgstr "_Kopiatu kontaktua hemen..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:1046
 msgid "Copy selected contacts to another address book"
 msgstr "Kopiatu hautatutako kontaktuak beste helbide-liburu batean"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
 msgid "_Delete Contact"
 msgstr "_Ezabatu kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
 msgid "_Find in Contact..."
 msgstr "_Bilatu kontaktuan..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1060
 msgid "Search for text in the displayed contact"
 msgstr "Bilatu testua bistaratutako kontaktuan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1065
 msgid "_Forward Contact..."
 msgstr "Birbidali _kontaktua..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
 msgid "Send selected contacts to another person"
 msgstr "Bidali hautatutako kontaktuak beste norbaiti"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1072
 msgid "_Move Contact To..."
 msgstr "E_raman kontaktua hona..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Move selected contacts to another address book"
 msgstr "Eraman hautatutako kontaktuak beste helbide-liburu batera"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "_New Contact..."
 msgstr "Kontaktu _berria..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1086
 msgid "New Contact _List..."
 msgstr "Kontaktuen _zerrenda berria..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
 msgid "_Open Contact"
 msgstr "_Ireki kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1100
 msgid "_Send Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
 msgid "Send a message to the selected contacts"
 msgstr "Bidali mezua hautatutako kontaktuei"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../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:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1116
+#: ../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
 msgid "_Preview"
 msgstr "_Aurrebista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Address Book Map"
 msgstr "Helbide-liburuen mapa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Contact _Preview"
 msgstr "Kontaktuen _aurrebista"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1171
 msgid "Show contact preview window"
 msgstr "Erakutsi kontaktu-aurrebistaren leihoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1177
 msgid "Show _Maps"
 msgstr "Erakutsi _mapak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show maps in contact preview window"
 msgstr "Erakutsi mapak kontaktu-aurrebistaren leihoan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/addressbook/e-book-shell-view-actions.c:1198
+#: ../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
 msgid "_Classic View"
 msgstr "_Ikuspegi klasikoa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
 msgid "Show contact preview below the contact list"
 msgstr "Erakutsi kontaktuaren aurrebista kontaktuen zerrendaren azpian"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../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
 msgid "_Vertical View"
 msgstr "Ikuspegi _bertikala"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Show contact preview alongside the contact list"
 msgstr "Erakutsi kontaktuen aurrebista kontaktuen zerrendaren alboan"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1222
+#: ../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:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1232
+#: ../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
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1265
 msgid "Print all shown contacts"
 msgstr "Inprimatu erakutsitako kontaktu guztiak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Preview the contacts to be printed"
 msgstr "Aurreikusi inprimatuko diren kontaktuak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1279
 msgid "Print selected contacts"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1294
 msgid "S_ave Address Book as vCard"
 msgstr "_Gorde helbide-liburua vCard gisa"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1296
 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:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1302
+#: ../modules/addressbook/e-book-shell-view-actions.c:1312
 msgid "_Save as vCard..."
 msgstr "_Gorde vCard gisa..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1304
 msgid "Save selected contacts as a vCard"
 msgstr "Gorde hautatutako kontaktuak vCard gisa"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "_Birbidali kontaktuak"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "_Birbidali kontaktua"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "Bidali _mezua kontaktuei"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "Bidali _mezua zerrendari"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "Bidali _mezua kontaktuari"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -16192,17 +18333,17 @@ msgstr ""
 "Ezarpen pertsonalak, mezu iragazki eta bestelako guztiak berreskura ditzake "
 "ere."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Leheneratu babeskopiatik:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Aukeratu babeskopiaren fitxategia leheneratzeko"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Leheneratu babeskopiatik"
@@ -16239,106 +18380,106 @@ msgstr "_Leheneratu Evolution-eko datuak..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Leheneratu Evolution-en datu eta ezarpenak artxibo batetik"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Egin Evolution direktorioaren babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Leheneratu Evolution-en direktorioa"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Egiaztatu Evolution-en babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Berrabiatu Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "Interfaze grafikoarekin"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:475
 msgid "Shutting down Evolution"
 msgstr "Evolution ixten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Egin Evolution-en datuen eta ezarpenen babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Egin Evolution-en datuen (Posta, Kontaktuak, Egutegia, Zereginak, "
 "Zirkularrak) babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Babeskopia osatuta"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:665
 msgid "Restarting Evolution"
 msgstr "Evolution berrabiatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:481
 msgid "Back up current Evolution data"
 msgstr "Egin uneko Evolution-en datuen babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:488
 msgid "Extracting files from back up"
 msgstr "Fitxategiak babeskopiatik erauzten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:570
 msgid "Loading Evolution settings"
 msgstr "Evolution-en ezarpenak kargatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:636
 msgid "Removing temporary back up files"
 msgstr "Aldi baterako babeseko fitxategiak ezabatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Reloading registry service"
 msgstr "Erregistroaren zerbitzua birkargatzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:853
 msgid "Evolution Back Up"
 msgstr "Evolution-en babeskopia"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:854
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Babeskopia %s karpetan gordetzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:858
 msgid "Evolution Restore"
 msgstr "Evolution leheneratzea"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:859
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "%s karpetatik leheneratzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:928
 msgid "Backing up Evolution Data"
 msgstr "Evolution-en datuen babeskopia egiten"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:929
 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:994
+#: ../modules/backup-restore/evolution-backup-tool.c:931
 msgid "Restoring Evolution Data"
 msgstr "Evolution-eko datuak berreskuratzen"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:932
 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:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:954
 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."
 
@@ -16419,70 +18560,75 @@ msgid "Convert message text to _Unicode"
 msgstr "Bihurtu mezuaren testua _Unicode"
 
 #: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
+msgstr "Baztergarriak iragazteko Bogofilter erabiltzen"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "LDAParen ataka estandarra"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP SSL gainean (zaharkitua)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "Microsoft-en Katalogo Globala"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Microsoft-en Katalogo Globala SSL gainean"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "LDAParekin konektatzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "Zerbitzariaren datuak"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Ataka:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (gomendatua)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "Enkriptatzea:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Autentifikazioa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "Anonimoa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Helbide elektronikoa erabiliz"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Izen bereizlea (DN) erabiliz"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "Metodoa:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16493,36 +18639,36 @@ msgstr ""
 "dela LDAP zerbitzarian."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "LDAP erabiltzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "Bilaketa-oinarria:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "Bilatu bilaketa-oinarri posibleak"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "Maila bat"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "Azpizuhaitza"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "Bilaketa-esparrua: "
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 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 "
@@ -16535,23 +18681,23 @@ msgstr ""
 "\"Maila bat\" bilaketa-esparruak oinarritik maila bat beherago arteko "
 "sarrerak bakarrik hartuko ditu."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "Bilaketa-iragazkia:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "Deskargatzen"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "Muga:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "kontaktuak"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "Arakatu muga gainditu arte"
 
@@ -16565,41 +18711,41 @@ 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:441
+#: ../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:469
+#: ../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:478
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:450
 msgid "Empty response"
 msgstr "Erantzuna hutsik"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
+#: ../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:1118
+#: ../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:1342
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1291
 msgid "Path"
 msgstr "Bide-izena"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:262
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:198
 msgid "Choose a Calendar"
 msgstr "Aukeratu egutegia"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:265
 msgid "Choose a Memo List"
 msgstr "Aukeratu zirkularren zerrenda"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:268
 msgid "Choose a Task List"
 msgstr "Aukeratu zereginen zerrenda"
 
@@ -16627,11 +18773,11 @@ msgstr "Zerbitzariak bileren gonbidapenak kudeatzen ditu"
 msgid "Choose which address books to use."
 msgstr "Aukeratu zein helbide-liburu erabiliko diren."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Erabili urtebetetze eta urteurrenen egutegian"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:125
 msgid "Default User Calendar"
 msgstr "Erabiltzailearen egutegi lehenetsia"
 
@@ -16696,26 +18842,103 @@ msgstr "Kelvin (K)"
 msgid "Units:"
 msgstr "Unitateak:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "_Inportatu"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "Gertaera inportatzen"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "Zirkularra inportatzen"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "Zeregina inportatzen"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Hautatu egutegia"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "Hautatu zirkularren zerrenda"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Hautatu zeregin-zerrenda"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "_Inportatu egutegira"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "_Inportatu zereginetara"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "_Inportatu zirkularren zerrenda"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "_Inportatu zereginen zerrenda"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Egutegi berria"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Zirkularren zerrenda berria"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Zeregin-zerrenda berria"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, c-format
+msgid "Copying an event into the calendar '%s'"
+msgstr "Gertaera bat '%s' egutegian kopiatzen"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "Gertaera bat '%s' egutegira eramaten"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "Zirkularra '%s' zirkularren zerrendan kopiatzen"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "Zirkularra '%s' zirkularren zerrendara eramaten"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "Zeregina '%s' zereginen zerrendan kopiatzen"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "Zeregina '%s' zereginen zerrendara eramaten"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "Egutegi-hautatzailea"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Zirkularren zerrenden hautatzailea"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Zereginen zerrendaren hautatzailea"
 
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
@@ -16786,7 +19009,7 @@ msgid "_24 hour"
 msgstr "_24 ordu"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "Lan-astea"
 
@@ -16842,13 +19065,9 @@ msgstr "_ig."
 msgid "Day _ends:"
 msgstr "Eg_unaren amaiera:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Abisuak"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "Eskatu _berrespena elementuak ezabatzeko"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "Ikusteko aukerak"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -16875,139 +19094,132 @@ msgstr ""
 msgid "Sc_roll Month View by a week"
 msgstr "_Korritu 'Hileko ikuspegia' aste bat"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Abisuak"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "Eskatu _berrespena elementuak ezabatzeko"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Bistaratu"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Zereginen zerrenda"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "Nabarmendu gaurko _zereginak"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Nabarmendu _atzeratutako zereginak"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "Ezkutatu _burututako zereginak"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "Bistaratu oroigarriak _jakinarazpenen arean soilik"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "Era_kutsi oroigarria hitzordua hasi baino"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr "lehenago"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "Erakutsi _oroigarria"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "urteurrena/urtebetetzea baino lehen"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "Hautatu egutegiak oroigarrien jakinarazpenerako"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "Libre/lanpetuta' zerbitzari lehenetsia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "Txantiloia"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../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."
 msgstr ""
 "%u eta %d aldagaiak helbide elektronikoko erabiltzaileagatik eta "
 "domeinuagatik ordeztuko dira."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "Argitaraketaren informazioa"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "Egutegi berria"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Egun osoko _hitzordua"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "_Bilera"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Egutegia"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Egutegi berria sortzen du"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Egutegia eta zereginak"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "'%s' egutegia irekitzen"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Egutegi-hautatzailea"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Inprimatu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Egutegiaren propietateak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -17022,369 +19234,365 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "Ezabatu hau baino zaharragoak diren gertaerak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "Elementuak kopiatzen"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "Elementuak lekuz aldatzen"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+msgid "Making an occurrence movable"
+msgstr "Egin egiteanagerraldi hau aldagarri"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "gertaerak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Gorde iCalendar gisa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "K_opiatu..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "E_zabatu egutegia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Ezabatu hautatutako egutegia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Joan atzera"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Joan aurrera"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Hautatu gaur"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Hautatu _data"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Hautatu zehaztutako data bat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "Egutegi _berria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "_Ezabatu betiko"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Ezabatu hitzordu eta bilera zaharrak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Freskatu hautatutako egutegia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Aldatu hautatutako egutegiaren izena"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "Bilatu _hurrengoa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Bilatu uneko bilaketaren katearen hurrengo agerraldia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "Bilatu _aurrekoa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Bilatu uneko bilaketaren katearen aurreko agerraldia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "Gelditu bilaketaren _exekuzioa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Gelditu uneko bilaketaren exekuzioa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "_Erakutsi egutegi hau soilik"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "_Kopiatu egutegian..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "_Delegatu bilera..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "E_zabatu hitzordua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Ezabatu hautatutako hitzordua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Ezabatu agerraldi hau"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Ezabatu agerraldi guztiak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Egun osoko gertaera _berria..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Sortu egun osoko gertaera berria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "_Bilera berria..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Sortu bilera berria"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman egutegira..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "_Ireki hitzordua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Ikusi uneko hitzordua"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu bilera..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "Hitzordu bat bilera batean bihurtzen du"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "_Bihurtu hitzordura..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "Bilera bat hitzordua batean bihurtzen du"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Irten"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Eguna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Erakutsi egun bat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Zerrenda"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Erakutsi zerrenda gisa"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Erakutsi hilabete bat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Astea"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Erakutsi aste bat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Erakutsi lan-aste bat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Hitzordu aktiboak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Hurrengo 7 egunetako hitzorduak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "5 aldiz baino gutxiago"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Azalpenak hau dauka"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "Laburpenak hau dauka"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
-#: ../modules/calendar/e-cal-shell-view-actions.c:1808
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "Inprimatu..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Aurreikusi inprimatuko den egutegia"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "_Gorde iCalendar gisa..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Joan"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "zirkularra"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Zirkular _berria"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Sortu zirkular berria"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "_Ireki zirkularra"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Ikusi hautatutako zirkularra"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "Ireki _web orria"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Inprimatu hautatutako zirkularra"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Bat datorren hurrengo gertaera bilatzen"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Bat datorren aurreko gertaera bilatzen"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
 msgstr[0] "Ezin da bat datorren gertaerarik aurkitu hurrengo urte %d-ean"
 msgstr[1] "Ezin da bat datorren gertaerarik aurkitu hurrengo %d urtetan"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
 msgstr[0] "Ezin da bat datorren gertaerarik aurkitu aurreko urte %d-ean"
 msgstr[1] "Ezin da bat datorren gertaerarik aurkitu aurreko %d urtetan"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Ezin da bilatu egutegi aktiborik gabe"
 
@@ -17392,237 +19600,209 @@ msgstr "Ezin da bilatu egutegi aktiborik gabe"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "zeregina"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Markatu hautatutako zereginak osatutako gisa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "_Markatu 'Osatu gabea'"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Markatu hautatutako zereginak osatuta gabe gisa"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "_Zeregin berria"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Ireki zeregina"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Ikusi hautatutako zeregina"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Inprimatu hautatutako zeregina"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "Zirkularren zerrenda berria"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Zirkularra"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Partekatutako zirkularra"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Sortu partekatutako zirkular berria"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Zirkularren _zerrenda"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Sortu zirkularren zerrenda berria"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "'%s' zirkularrak irekitzen"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Zirkularren zerrenden hautatzailea"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Inprimatu zirkularrak"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Zirkularren zerrendaren propietateak"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "_Ezabatu zirkularra"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "_Bilatu zirkularrean..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Bilatu testua bistaratutako zirkularrean"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "_Ezabatu zirkularren zerrenda"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Ezabatu hautatutako zirkularren zerrenda"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "Zirkularren zerrenda _berria"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Freskatu hautatutako zirkularren zerrenda"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Aldatu hautatutako zirkularren zerrendaren izena"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "_Erakutsi zirkularren zerrenda hau soilik"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "Zirkularren _aurrebista"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Erakutsi zirkularren aurrebistako panela"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "Erakutsi zirkularren aurrebista zirkularren zerrendaren azpian"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "Erakutsi zirkularren aurrebista zirkularren zerrendaren alboan"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Inprimatu zirkularren zerrenda"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Aurreikusi inprimatuko diren zirkularren zerrenda"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Ezabatu zirkularrak"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Ezabatu zirkularra"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
 msgstr[0] "zirkular %d"
 msgstr[1] "%d zirkular"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "%d hautatuta"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "Zeregin-zerrenda berria"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Esleitutako _zeregina"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Sortu esleitutako zeregin berria"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Zereginen _zerrenda"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Sortu zereginen zerrenda berria"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "'%s' zereginak irekitzen"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Zereginen zerrendaren hautatzailea"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Inprimatu zereginak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Zeregin-zerrendaren propietateak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17634,111 +19814,107 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Ez galdetu berriro."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "_Ezabatu zeregina"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "_Bilatu zereginean..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Bilatu testua bistaratutako zereginean"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "_Ezabatu zereginen zerrenda"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Ezabatu hautatutako zereginen zerrenda"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "Zeregin-zerrenda _berria"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Freskatu hautatutako zereginen zerrenda"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Aldatu hautatutako zereginen zerrendaren izena"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "_Erakutsi zereginen zerrenda hau soilik"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "_Markatu 'Osatu gabea'"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Ezabatu osatutako zereginak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "Zereginaren _aurrebista"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Erakutsi zereginen aurrebistaren panela"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Erakutsi zereginen aurrebista zereginen zerrendaren azpian"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "Erakutsi zereginen aurrebista zereginen zerrendaren alboan"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Zeregin aktiboak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Burutako zereginak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Hurrengo 7 egunetako zereginak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Atzeratutako zereginak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Zereginak eranskinekin"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Inprimatu zereginen zerrenda"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Aurreikusi inprimatuko den zeregin-zerrenda"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Ezabatu zereginak"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Ezabatu zeregina"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "Betiko ezabatzen"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -18126,7 +20302,7 @@ msgid "Start day:"
 msgstr "Hasiera-data:"
 
 #: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:1494
 msgid "Start time:"
 msgstr "Hasiera:"
 
@@ -18135,254 +20311,255 @@ msgid "End day:"
 msgstr "Amaiera-data:"
 
 #: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:1495
 msgid "End time:"
 msgstr "Amaiera-ordua:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1020
 msgid "Ope_n Calendar"
 msgstr "_Ireki egutegia"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1023
 msgid "_Decline all"
 msgstr "_Ukatu denak"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1026
 msgid "_Decline"
 msgstr "_Ukatu"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1029
 msgid "_Tentative all"
 msgstr "_Behin-behinekoak denak"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1032
 msgid "_Tentative"
 msgstr "_Behin-behinekoa"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1035
 msgid "Acce_pt all"
 msgstr "Onartu _denak"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1038
 msgid "Acce_pt"
 msgstr "_Onartu"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Send _Information"
 msgstr "_Bidali informazioa"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Update Attendee Status"
 msgstr "_Eguneratu partaidearen egoera"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1047
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "_Eguneratu"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1497
+#: ../modules/itip-formatter/itip-view.c:1545
+#: ../modules/itip-formatter/itip-view.c:1616
 msgid "Comment:"
 msgstr "Iruzkina"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1533
 msgid "Send reply to sender"
 msgstr "Erantzun bidaltzaileari"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1548
 msgid "Send _updates to attendees"
 msgstr "Bidali _eguneraketak partaideei"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1551
 msgid "_Apply to all instances"
 msgstr "_Aplikatu instantzia guztiak"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1552
 msgid "Show time as _free"
 msgstr "Erakutsi ordua _libre gisa"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1553
 msgid "_Preserve my reminder"
 msgstr "_Mantendu nire oroigarria"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "_Inherit reminder"
 msgstr "_Heredatu oroigarria"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1884
 msgid "_Tasks:"
 msgstr "_Zereginak:"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1887
 msgid "_Memos:"
 msgstr "_Zirkularrak:"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3115
 msgid "Sa_ve"
 msgstr "_Gorde"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3575
+#: ../modules/itip-formatter/itip-view.c:5022
 msgid "Attendee status updated"
 msgstr "Partaide-egoera eguneratu da"
 
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3754
 #, 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:3793
+#: ../modules/itip-formatter/itip-view.c:3783
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Hitzordua '%s' egutegian aurkitu da"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:3896
 msgid "Unable to find any calendars"
 msgstr "Ezin da egutegirik aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:3904
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ezin da bilera hau egutegietan aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:3919
+#: ../modules/itip-formatter/itip-view.c:3909
 msgid "Unable to find this task in any task list"
 msgstr "Ezin da zeregin hau zereginen zerrendetan aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:3924
+#: ../modules/itip-formatter/itip-view.c:3914
 msgid "Unable to find this memo in any memo list"
 msgstr "Ezin da zirkular hau zirkularren zerrendetan aurkitu"
 
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../modules/itip-formatter/itip-view.c:4258
 msgid "Opening the calendar. Please wait..."
 msgstr "Egutegia irekitzen. Itxaron..."
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4263
 msgid "Searching for an existing version of this appointment"
 msgstr "Hitzorduaren existitzen den bertsioa bilatzen"
 
-#: ../modules/itip-formatter/itip-view.c:4668
+#: ../modules/itip-formatter/itip-view.c:4658
 #, 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:4683
+#: ../modules/itip-formatter/itip-view.c:4673
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Bidali '%s' egutegira onartuta bezala"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4678
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Bidali '%s' egutegira saialdi gisa"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4684
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Bidali '%s' egutegira baztertua bezala"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4690
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "'%s' egutegira bertan behera utzita bezala bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4711
+#: ../modules/itip-formatter/itip-view.c:5168
+#: ../modules/itip-formatter/itip-view.c:5274
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Aldaketak egutegian gordetzen. Itxaron..."
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4752
 msgid "Unable to parse item"
 msgstr "Ezin da elementua analizatu"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:4945
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Antolatzaileak %s delegatua kendu du"
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:4962
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Bertan behera uztearen mezua delegatuari bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:4966
 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:5024
+#: ../modules/itip-formatter/itip-view.c:5014
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ezin da partaideak eguneratu. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5057
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Bilera baliogabea da eta ezin da eguneratu"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5133
 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:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5205
+#: ../modules/itip-formatter/itip-view.c:5244
 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:5317
+#: ../modules/itip-formatter/itip-view.c:5307
 msgid "Meeting information sent"
 msgstr "Bileraren informazioa bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5312
 msgid "Task information sent"
 msgstr "Zereginaren informazioa bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Memo information sent"
 msgstr "Zirkularraren informazioa bidalita"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5328
 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:5343
+#: ../modules/itip-formatter/itip-view.c:5333
 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:5348
+#: ../modules/itip-formatter/itip-view.c:5338
 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:5413
+#: ../modules/itip-formatter/itip-view.c:5403
 msgid "calendar.ics"
 msgstr "egutegia.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5408
 msgid "Save Calendar"
 msgstr "Gorde egutegia"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5457
+#: ../modules/itip-formatter/itip-view.c:5470
 msgid "The calendar attached is not valid"
 msgstr "Erantsitako egutegia ez da baliozkoa"
 
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5458
+#: ../modules/itip-formatter/itip-view.c:5471
 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:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5513
+#: ../modules/itip-formatter/itip-view.c:5543
+#: ../modules/itip-formatter/itip-view.c:5644
 msgid "The item in the calendar is not valid"
 msgstr "Egutegiko elementua ez da baliozkoa"
 
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5514
+#: ../modules/itip-formatter/itip-view.c:5544
+#: ../modules/itip-formatter/itip-view.c:5645
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18390,11 +20567,11 @@ msgstr ""
 "Mezuak egutegi bat du, baina egutegiak ez du gertaerarik, zereginik edo "
 "libre/lanpetuta informaziorik"
 
-#: ../modules/itip-formatter/itip-view.c:5569
+#: ../modules/itip-formatter/itip-view.c:5559
 msgid "The calendar attached contains multiple items"
 msgstr "Erantsitako egutegiak hainbat elementu ditu"
 
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5560
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18402,24 +20579,24 @@ msgstr ""
 "Fitxategia gorde eta egutegia inportatu behar da elementu guzti horiek "
 "prozesatzeko"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../modules/itip-formatter/itip-view.c:6062
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6078
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6238
 msgid "This meeting recurs"
 msgstr "Bilera hau errepikatu egiten da"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6241
 msgid "This task recurs"
 msgstr "Zeregin hau errepikatu egiten da"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6244
 msgid "This memo recurs"
 msgstr "Zirkular hau errepikatu egiten da"
 
@@ -18463,19 +20640,19 @@ msgstr "Itip formatu emailea"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Bistaratu \"testuen/egutegien\" MIME zatiak mezuetan."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Google-ren eginbideak"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "Gehitu Google-ren _egutegia kontu honi"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "Gehitu Google-ren _kontaktuak kontu honi"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "IMAPen sarbidetza gaitu behar duzu"
 
@@ -18517,60 +20694,60 @@ msgid "Choose a mbox spool directory"
 msgstr "Aukeratu mbox ilararen direktorioa"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "_Ataka:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "Enkriptatzeko _metodoa:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS konektatu ondoren"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "SSL dedikatutako atakan"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Erabili bitar pertsonalizatua, 'sendmail'-en ordez"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "_Bitar pertsonalizatua:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "_Erabili argumentu pertsonalizatuak"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "_Argumentu pertsonalizatuak:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18580,23 +20757,23 @@ msgstr ""
 "   %F - 'Nork' helbidea adierazten du\n"
 "   %R - hartzaileen helbideak adierazten ditu"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
 msgid "Send mail also when in offline _mode"
 msgstr "Bidali mezua lineaz _kanpo egotean ere"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "Zerbitzariak _autentifikazioa behar du"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "_Mota:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Yahoo!-ren eginbideak"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Gehitu Yahoo!-ren _egutegi eta zereginak kontu honi"
 
@@ -18607,485 +20784,497 @@ msgid_plural "%d attached messages"
 msgstr[0] "Erantsitako mezu %d"
 msgstr[1] "Erantsitako %d mezu"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:348
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:358
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Posta-_kontua"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgid "Create a new mail account"
 msgstr "Sortu posta-kontu berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Mezuen _karpeta"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgid "Create a new mail folder"
 msgstr "Sortu posta-karpeta berria"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:682
 msgid "Mail Accounts"
 msgstr "Posta-kontuak"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:691
 msgid "Mail Preferences"
 msgstr "Posta-hobespenak"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:700
 msgid "Composer Preferences"
 msgstr "Mezuak prestatzeko hobespenak"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:710
 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:964
+#: ../modules/mail/e-mail-shell-backend.c:1002
 msgctxt "label"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:752
 msgid "Marking messages as read..."
 msgstr "Markatu _mezuak irakurritako gisa..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "_Disable Account"
 msgstr "_Desgaitu kontua"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Disable this account"
 msgstr "Desgaitu kontu hau"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 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:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1628
 msgid "Edit properties of this account"
 msgstr "Editatu kontu honen propietateak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1635
 msgid "Refresh list of folders of this account"
 msgstr "Freskatu kontu honen karpeten zerrenda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "_Download Messages for Offline Usage"
 msgstr "_Deskargatu mezuak lineaz kanpo erabiltzeko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1642
 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:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Fl_ush Outbox"
 msgstr "_Garbitu irteerako ontzia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "_Copy Folder To..."
 msgstr "K_opiatu karpeta hemen..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1656
 msgid "Copy the selected folder into another folder"
 msgstr "Kopiatu hautatutako karpeta beste karpeta batean"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1663
 msgid "Permanently remove this folder"
 msgstr "Betiko kendu karpeta honetatik"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "E_xpunge"
 msgstr "_Ezabatu betiko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
 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:1575
 #: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "Mar_k All Messages as Read"
 msgstr "_Markatu mezu guztiak irakurritako gisa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
 #: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1777
 msgid "Mark all messages in the folder as read"
 msgstr "Markatu karpetako mezu guztiak irakurrita gisa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "_Move Folder To..."
 msgstr "_Eraman karpeta hona..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Move the selected folder into another folder"
 msgstr "Eraman hautatutako karpeta beste karpeta batera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "_New..."
 msgstr "_Berria..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Create a new folder for storing mail"
 msgstr "Sortu karpeta berria posta gordetzeko"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1705
 msgid "Refresh the folder"
 msgstr "Freskatu karpeta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1712
 msgid "Change the name of this folder"
 msgstr "Aldatu karpetaren izena"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "Select Message _Thread"
 msgstr "Hautatu mezuen _haria"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1719
 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:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Select Message S_ubthread"
 msgstr "Hautatu mezuen a_zpiharia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Select all replies to the currently selected message"
 msgstr "Hautatu hautatutako mezuaren erantzun guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "Empty _Trash"
 msgstr "Hustu _zakarrontzia"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 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:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_New Label"
 msgstr "Etiketa _berria"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "N_one"
 msgstr "_Bat ere ez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Manage Subscriptions"
 msgstr "_Kudeatu harpidetzak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1770
+#: ../modules/mail/e-mail-shell-view-actions.c:1854
 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:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1782
+#: ../modules/mail/e-mail-shell-view-actions.c:1803
 msgid "Send / _Receive"
 msgstr "Bidali / _Jaso"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1784
 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:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1789
 msgid "R_eceive All"
 msgstr "_Jaso denak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1791
 msgid "Receive new items from all accounts"
 msgstr "Jaso elementu berriak kontu guztietatik"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1796
 msgid "_Send All"
 msgstr "_Bidali denak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1798
 msgid "Send queued items in all accounts"
 msgstr "Bidali kontu guztietan ilaran dauden elementuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1826
 msgid "Cancel the current mail operation"
 msgstr "Bertan behera utzi uneko posta-eragiketa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1831
 msgid "Collapse All _Threads"
 msgstr "Tolestu hari _guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "Collapse all message threads"
 msgstr "Tolestu mezuen hari guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1838
 msgid "E_xpand All Threads"
 msgstr "_Zabaldu hari guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1840
 msgid "Expand all message threads"
 msgstr "Zabaldu mezuen hari guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1845
 msgid "_Message Filters"
 msgstr "Posta-_iragazkiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 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:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1852
 msgid "_Subscriptions..."
 msgstr "_Harpidetzak..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "F_older"
 msgstr "Kar_peta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1868
 msgid "_Label"
 msgstr "_Etiketa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "C_reate Search Folder From Search..."
 msgstr "Sortu bilaketa-karpeta bilaketatik..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1892
 msgid "Search F_olders"
 msgstr "Bilaketa-_karpetak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1894
 msgid "Create or edit search folder definitions"
 msgstr "Sortu edo editatu bilaketa-karpetaren definizioak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1933
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1961
 msgid "Show Message _Preview"
 msgstr "Erakutsi mezuaren _aurrebista"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1963
 msgid "Show message preview pane"
 msgstr "Erakutsi mezuen aurrebistaren panela"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show _Deleted Messages"
 msgstr "Erakutsi _ezabatutako mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Show deleted messages with a line through them"
 msgstr "Erakutsi ezabatutako mezuak marratuta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1977
 msgid "_Group By Threads"
 msgstr "_Elkartu harien arabera"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1979
 msgid "Threaded message list"
 msgstr "Harian sartutako mezu-zerrenda"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1985
 msgid "_Unmatched Folder Enabled"
 msgstr "'_Sailkatu gabeak' karpeta gaituta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1987
 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:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:2007
 msgid "Show message preview below the message list"
 msgstr "Erakutsi mezuaren aurrebista mezuen zerrendaren azpian"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Show message preview alongside the message list"
 msgstr "Erakutsi mezuaren aurrebista mezuen zerrendaren alboan"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "All Messages"
 msgstr "Mezu guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:2029
 msgid "Important Messages"
 msgstr "Mezu garrantzitsuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 msgid "Last 5 Days' Messages"
 msgstr "Azken 5 egunetako mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Messages Not Junk"
 msgstr "Baztergarriak ez diren mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
 msgid "Messages with Attachments"
 msgstr "Mezuak eranskinekin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "No Label"
 msgstr "Etiketarik ez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Read Messages"
 msgstr "Irakurri mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Unread Messages"
 msgstr "Irakurri gabeko mezuak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2130
 msgid "Subject or Addresses contain"
 msgstr "Gaiak edo Helbideak hau dauka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2140
 msgid "All Accounts"
 msgstr "Kontu guztiak"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2147
 msgid "Current Account"
 msgstr "Uneko kontua"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2154
 msgid "Current Folder"
 msgstr "Uneko karpeta"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "Kontu guztien bilaketa"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Kontuaren bilaketa"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
 msgstr[0] "%d hautatuta, "
 msgstr[1] "%d hautatuta, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:981
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
 msgstr[0] "%d ezabatuta"
 msgstr[1] "%d ezabatuta"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
 msgstr[0] "baztergarri %d"
 msgstr[1] "%d baztergarri"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
 msgstr[0] "zirriborro %d"
 msgstr[1] "%d zirriborro"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
 msgstr[0] "%d bidali gabe"
 msgstr[1] "%d bidali gabe"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
 msgstr[0] "%d bidalita"
 msgstr[1] "%d bidalita"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
 msgstr[0] "%d irakurri gabe, "
 msgstr[1] "%d irakurri gabe, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
 msgstr[0] "%d guztira"
 msgstr[1] "%d guztira"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1068
+#: ../modules/mail/e-mail-shell-view-private.c:1082
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1505
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Bidali / Jaso"
 
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/mail/em-composer-prefs.c:394
 msgid "Select Folder to Add"
 msgstr "Hautatu karpeta gehitzeko"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:854
 msgid "Folder"
 msgstr "Karpeta"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:890
 msgid "Recipient"
 msgstr "Hartzailea"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1157
+msgid "Keep in Outbox"
+msgstr "Mantendu 'Irteerako ontzia'n"
+
+#: ../modules/mail/em-composer-prefs.c:1158
+msgid "Send immediately"
+msgstr "Bidali berehala"
+
+#: ../modules/mail/em-composer-prefs.c:1159
+msgid "Send after 5 minutes"
+msgstr "Bidali 5 minutu barru"
+
+#: ../modules/mail/em-composer-prefs.c:1232
 msgid "Language(s)"
 msgstr "Hizkuntza(k)"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "Irtetean, beti"
 
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "Once per day"
+msgstr "Egunean behin"
+
 #: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
-msgstr "Irtetean, egunean behin"
+msgid "Once per week"
+msgstr "Astean behin"
 
 #: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
-msgstr "Irtetean, astean behin"
+msgid "Once per month"
+msgstr "Hilean behin"
 
 #: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "Irtetean, hilean behin"
-
-#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "Berehala, karpeta uztean"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Goiburua"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:360
 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:1214
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "_Dataren goiburua:"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "Erakutsi _jatorrizko goiburuaren balioa"
 
@@ -19095,24 +21284,24 @@ msgstr "Evolution posta-bezero lehenetsia izatea nahi duzu?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "%1$s helbidera '%3$s' datan bidali zenuen \"%2$s\" mezua irakurri da."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "'%s'(r)en bidaltze-jakinarazpena"
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Bidali mezuaren irakurragiria '%s'(r)i"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "_Jakinarazpenaren bidaltzailea"
 
@@ -19188,22 +21377,22 @@ msgstr "Bistaratu HTML bertsioa"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Bistaratu multipart/alternatiboa mezuaren HTML bertsioa"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Erakutsi HTML egonez gero"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Baimendu Evolution-ek zati onena aukeratzea erakusteko."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Erakutsi testu soila egonez gero"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -19212,12 +21401,12 @@ msgstr ""
 "Erakutsi testu soilaren zatia, egonez gero. Bestela, utzi Evolution-i zati "
 "onena aukeratzea erakusteko."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Formaturik gabe bakarrik erakutsi"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -19284,21 +21473,26 @@ msgstr ""
 "izatea ere."
 
 #: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+msgid "Junk filter using SpamAssassin"
+msgstr "Baztergarriak iragazteko SpamAssassin erabiltzen"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Inportatu fitxategiak"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Inportatzea bertan behera utzita."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Inportatzea osatu da."
 
@@ -19326,11 +21520,11 @@ msgstr "Eman _formatua honela..."
 msgid "_Other languages"
 msgstr "_Beste hizkuntzak"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:437
 msgid "Text Highlight"
 msgstr "Testuaren nabarmentzea"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Syntax highlighting of mail parts"
 msgstr "Mezu zatien sintaxia nabarmentzea"
 
@@ -19358,10 +21552,6 @@ msgstr "_C#"
 msgid "_Cascade Style Sheet"
 msgstr "_CSS"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
@@ -19587,7 +21777,7 @@ msgstr "Bistaratu zatia helbide-liburuaren kontaktu gisa"
 msgid "Evolution Web Inspector"
 msgstr "Evolution-en web ikuskatzailea"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
 msgid "_Do not show this message again."
 msgstr "_Ez erakutsi mezu hau berriro."
 
@@ -19624,36 +21814,36 @@ msgstr "Eranskin ohartarazlea"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Mezu bati eranskina gehitzea ahaztu zaizula gogorarazten dizu."
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Kontaktu automatikoak"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Sortu helbide-liburuko sarrerak mezuei erantzutean"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Hautatu kontaktu automatikoen helbide-liburua"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Berehalako mezularitzako kontaktuak"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr ""
 "_Sinkronizatu kontaktuen datuak eta irudiak Pidgin-eko lagunen zerrendatik"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Hautatu Pidgin-eko lagunen zerrendaren helbide-liburua"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Sinkronizatu _lagunen zerrendarekin"
 
@@ -19731,12 +21921,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Bat ere ez"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "_Goiburu pertsonalizatuak"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19745,11 +21935,11 @@ msgstr ""
 "goiburu pertsonalizatuaren gako-balioen izena \";\" karakterearekin "
 "bereiztua."
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Gakoa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Balioak"
@@ -19783,8 +21973,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:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:467
+#: ../plugins/external-editor/external-editor.c:469
 msgid "Compose in External Editor"
 msgstr "Prestatu kanpoko editorean"
 
@@ -19881,14 +22071,6 @@ msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr ""
 "Hautatu duzun fitxategiak ez dirudi baliozko png irudia denik. Errorea: {0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Barneko irudia"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "Ikusi irudien eranskinak zuzenean mezuetan."
-
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Lortu _artxiboen zerrenda"
@@ -20188,12 +22370,12 @@ msgstr "Zerbitzariak objektu baliogabea itzuli du"
 msgid "An error occurred during processing: %s"
 msgstr "Errorea gertatu da prozesatzean: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:854
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ezin da egutegia ireki. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:858
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -20201,7 +22383,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:859
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -20209,7 +22391,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:862
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -20217,35 +22399,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:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1266
 msgid "Create an _Appointment"
 msgstr "Sortu _hitzordu berria"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a new event from the selected message"
 msgstr "Sortu gertaera berri bat hautatutako mezutik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1273
 msgid "Create a Mem_o"
 msgstr "Sortu _zirkularra"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a new memo from the selected message"
 msgstr "Sortu zirkular berri bat hautatutako mezutik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1280
 msgid "Create a _Task"
-msgstr "Sortu z_eeregina"
+msgstr "Sortu z_eregina"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1282
 msgid "Create a new task from the selected message"
 msgstr "Sortu zeregin berri bat hautatutako mezutik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Meeting"
 msgstr "Sortu _bilera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new meeting from the selected message"
 msgstr "Sortu bilera berri bat hautatutako mezutik"
 
@@ -20340,11 +22522,11 @@ 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:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "Ezin izan da argitalpenaren haria sortu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "_Argitaratu egutegiaren informazioa"
 
@@ -20425,6 +22607,7 @@ msgid "_Username:"
 msgstr "_Erabiltzaile-izena:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Pasahitza"
 
@@ -20436,8 +22619,8 @@ msgstr "_Gogoratu pasahitza"
 msgid "Publishing Location"
 msgstr "Argitaratze-kokalekua"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Iturburuaren '%s' URIa baliogabea"
@@ -20554,15 +22737,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Formatua:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Hautatu helburuko fitxategia"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "Gorde _honela"
 
@@ -20588,31 +22771,31 @@ msgstr ""
 "[from], $ORIG[to] edo $ORIG[body] bezalako aldagaiak erabil ditzakezu, "
 "erantzuten ari zaren mezuko balioekin ordeztuko dira."
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "Titulurik ez"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "Gorde _txantiloi gisa"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "Gorde txantiloi gisa"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:320
 msgid "Preparing to go offline..."
 msgstr "Prestatzen lineaz kanpo jartzeko..."
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:373
 msgid "Preparing to go online..."
 msgstr "Prestatzen linean jartzeko.."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:480
 msgid "Preparing to quit"
 msgstr "Irteteko prestatzen"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:486
 msgid "Preparing to quit..."
 msgstr "Prestatzen irtetzeko..."
 
@@ -20628,19 +22811,19 @@ msgstr "Gorde bilaketa"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:937
+#: ../shell/e-shell-searchbar.c:930
 msgid "Sho_w:"
 msgstr "_Erakutsi:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:962
+#: ../shell/e-shell-searchbar.c:955
 msgid "Sear_ch:"
 msgstr "_Bilatu:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1023
 msgid "i_n"
 msgstr "_hemen:"
 
@@ -20652,288 +22835,288 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Fitxategi guztiak (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Erabiltzaile-interfazearen egoera gordetzen"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Hizkuntza Politikarako Sailburuordetza <hizpol ej-gv es>\n"
 "Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Evolution-en web gunea"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "Kategorien editorea"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "Bug Buddy ez dago instalatuta."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "Honi _buruz"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Erakutsi Evolution-i buruzko informazioa"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "_Itxi leihoa"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "_Edukia"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "Ireki Evolution-en erabiltzailearen gida"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "Inp_ortatu..."
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "Inportatu datuak beste programa batzuetatik"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "Leiho _berria"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "Sortu ikuspegi hau erakusten duen leiho berri bat"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "_Kategoria erabilgarriak"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "Kudeatu kategoria erabilgarriak"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "_Erreferentzia azkarra"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "Erakutsi Evolution-en lasterbideak"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "I_rten"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Irten programatik"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "Bilaketa _aurreratua..."
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Eraiki bilaketa aurreratuago bat"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "Garbitu uneko bilaketaren parametroak"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "_Editatu gordetako bilaketak..."
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Kudeatu gordetako bilaketak"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Egin klik bilaketa mota aldatzeko"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Bilatu orain"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "Exekutatu uneko bilaketaren parametroak"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "_Gorde bilaketa..."
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "Gorde uneko bilaketaren parametroak"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "_Bidali programa-erroreen berri-ematea.."
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Eman programa-erroreen berri Bug Buddy erabiliz"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Jarri Evolution lineaz kanpo"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Jarri Evolution linean"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "_Diseinua"
 
-#: ../shell/e-shell-window-actions.c:1107
+#: ../shell/e-shell-window-actions.c:1106
 msgid "_Search"
 msgstr "_Bilatu"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:1113
 msgid "_Switcher Appearance"
 msgstr "_Konmutadorearen itxura"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:1127
 msgid "_Window"
 msgstr "_Leihoa"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1156
 msgid "Show Side _Bar"
 msgstr "Erakutsi albo-_barra"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Show the side bar"
 msgstr "Erakutsi alboko barra"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1164
 msgid "Show _Buttons"
 msgstr "Erakutsi _botoiak"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1166
 msgid "Show the switcher buttons"
 msgstr "Erakutsi aldatzailearen botoiak"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Show _Status Bar"
 msgstr "Erakutsi _egoera-barra"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1174
 msgid "Show the status bar"
 msgstr "Erakutsi egoera-barra"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Show _Tool Bar"
 msgstr "Erakutsi _tresna-barra"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Show the tool bar"
 msgstr "Erakutsi tresna-barra"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1204
 msgid "_Icons Only"
 msgstr "_Ikonoak soilik"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Display window buttons with icons only"
 msgstr "Bistaratu leihoko botoiak ikonoekin bakarrik"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1211
 msgid "_Text Only"
 msgstr "_Testua soilik"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1213
 msgid "Display window buttons with text only"
 msgstr "Bistaratu leihoko botoiak testuarekin soilik"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Icons _and Text"
 msgstr "Ikonoak _eta testua"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1220
 msgid "Display window buttons with icons and text"
 msgstr "Bistaratu leihoko botoiak ikonoekin eta testuarekin"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1225
 msgid "Tool_bar Style"
 msgstr "Tresna-_barraren estiloa"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1227
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr ""
 "Bistaratu leihoko botoiak mahagaineko tresna-barraren ezarpenak erabiliz"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1235
 msgid "Delete Current View"
 msgstr "Ezabatu uneko ikuspegia"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1242
 msgid "Save Custom View..."
 msgstr "Gorde ikuspegi pertsonalizatua..."
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1244
 msgid "Save current custom view"
 msgstr "Gorde uneko ikuspegi pertsonalizatua"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1251
 msgid "C_urrent View"
 msgstr "_Uneko ikuspegia"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1261
 msgid "Custom View"
 msgstr "Ikuspegi pertsonalizatua"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1263
 msgid "Current view is a customized view"
 msgstr "Uneko ikuspegia ikuspegi pertsonalizatua da"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1271
 msgid "Page Set_up..."
 msgstr "Orriaren _konfigurazioa..."
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1273
 msgid "Change the page settings for your current printer"
 msgstr "Aldatu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1634
 #, c-format
 msgid "Switch to %s"
 msgstr "Aldatu hona: %s"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1757
 #, c-format
 msgid "Select view: %s"
 msgstr "Hautatu ikuspegia: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1774
 #, c-format
 msgid "Delete view: %s"
 msgstr "Ezabatu ikuspegia: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1868
 msgid "Execute these search parameters"
 msgstr "Exekutatu bilaketaren parametro hauek"
 
@@ -20948,7 +23131,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20985,7 +23168,7 @@ msgstr ""
 "Gogor lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20993,13 +23176,13 @@ msgstr ""
 "Eskerrik asko\n"
 "Evolution taldea\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "Ez esan berriro"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21008,40 +23191,40 @@ msgstr ""
 "erabilgarriak:'mail' (posta), 'calendar' (egutegia), "
 "'contacts' (kontaktuak), 'tasks' (zereginak), eta 'memos' (zirkularrak)"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Aplikatu emandako geometria leiho nagusiari"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "Ezikusi egin sarearen erabilgarritasunari"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Behartu Evolution itzaltzea"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Desgaitu edozein plugin kargatzea."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Desgaitu mezuen, kontaktuen eta zereginen aurrebisten panela."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr ""
 "Inportatu URIak edo fitxategi-izenak (beste argumentuen bezala emandakoak)"
 
-#: ../shell/main.c:325
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Eskatu exekutatzen ari den Evolution prozesua irtetzea"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21050,11 +23233,11 @@ msgstr ""
 "Ezin da Evolution abiarazi. Baliteke Evolution-en beste instantzia bat "
 "erantzun gabe aritzea. Sistemaren errorea: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:454 ../shell/main.c:459
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Evolution PIM  eta posta-bezeroa"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:517
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21063,7 +23246,7 @@ msgstr ""
 "%s: --online eta --offline ezin dira aldi berean erabili.\n"
 "  Exekutatu %s --help informazio gehiago lortzeko.\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:523
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21109,7 +23292,29 @@ msgstr ""
 "onartzen. Hala ere, hau konpontzeko aurrenik Evolution 2 bertsiora eta gero "
 "Evolution 3 bertsiora bertsio-berrituz saia zintezke."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "Itxi Evolution atzeko planoan eragiketak zain egonda?"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evolution-ek denbora luzea darama itzaltzen, baliteke sarearen konexioan "
+"arazoak egotea. Nahi duzu zain dauden eragiketa guztiak bertan behera uztea "
+"eta berehala ixtea, edo nahiago duzu itxarotea?"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "_Itxi berehala"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "_Itxaron..."
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21120,101 +23325,282 @@ msgstr ""
 "\n"
 "Editatu fidagarritasun-ezarpenak:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Ziurtagiri-izena"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Erakundearentzako jaulkita"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Erakundeko Sailarentzako (OU) jaulkita"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Serie-zenbakia"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Xedeak"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Jaulkitzailea"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Erakundeak jaulkita"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Erakundeko Sailak (OU) jaulkita"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Jaulkita"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Iraungitze-data"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 hatz-marka"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 hatz-marka"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Helbide elektronikoa"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "Hautatu ziurtagiria inportatzeko..."
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr "Hautatu fitxategi bat zure gakoa eta ziurtagiria gordetzeko..."
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-babeskopia.p12"
 
-#: ../smime/gui/certificate-manager.c:635
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:728
+msgid "Backup Certificate"
+msgstr "Ziurtagiriaren babeskopia"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+msgid "_File name:"
+msgstr "_Fitxategi-izena:"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+msgid "Please select a file..."
+msgstr "Hautatu fitxategia..."
+
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
+msgstr "_Sartu ziurtagiriaren katea babeskopian"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+"Hemen ezarri duzun (ziurtagiriaren babeskopiarako) pasahitza sortzera\n"
+"zoazen babeskopiaren fitxategia babestuko du.\n"
+"Pasahitz hori ezarri behar duzu babeskopia egiteko."
+
+#: ../smime/gui/certificate-manager.c:786
+msgid "_Repeat Password:"
+msgstr "E_rrepikatu pasahitza:"
+
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
+msgstr "Pasahitzak ez datoz bat"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+"Garrantzitsua:\n"
+"Ziurtagiriaren babeskopiaren pasahitza ahazten baduzu, ezin zara babeskopia "
+"hau geroago leheneratzeko gai izango.\n"
+"Gorde ezazu leku seguru batean."
+
+#: ../smime/gui/certificate-manager.c:858
+msgid "No file name provided"
+msgstr "Ez da fitxategi-izenik eman"
+
+#: ../smime/gui/certificate-manager.c:862
+msgid "Failed to backup key and certificate"
+msgstr "Huts egin du gakoaren eta ziurtagiriaren babeskopia egitean"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "Hautatu ziurtagiria inportatzeko..."
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "Huts egin du ziurtagiria inportatzean"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "Galdetu erabiltzean"
+
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Inoiz ere ez"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr "Noiz behinka"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "Osoa"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr "Erabatekoa"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr "Aldi baterakoa"
+
+#: ../smime/gui/certificate-manager.c:1333
+msgid "Change certificate trust"
+msgstr "Aldatu ziurtagiriaren fidagarritasuna"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "Aldatu '%s' ostalariaren fidagarritasuna"
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "Galdetu _erabiltzean"
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr "_Aldi baterako (saio hau soilik)"
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "_Inoiz ere ez"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr "Noizean behin"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Osoa"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr "_Erabatekoa"
+
+#: ../smime/gui/certificate-manager.c:1378
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"Gune honetaz fidatu aurretik, bere politika, prozedurak eta ziurtagiria "
+"aztertu beharko zenituzke (erabilgarri badaude)."
+
+#: ../smime/gui/certificate-manager.c:1393
+msgid "_Display certificate"
+msgstr "_Bistaratu ziurtagiria"
+
+#: ../smime/gui/certificate-manager.c:1598
+msgid "You have certificates on file that identify these mail servers:"
+msgstr ""
+"Posta-zerbitzari hauek identifikatzen dituzten ziurtagiriak dituzu "
+"artxibatuta:"
+
+#: ../smime/gui/certificate-manager.c:1629
+msgid "Host name"
+msgstr "Ostalari-izena"
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
+msgstr "Jaulkitzailea"
+
+#: ../smime/gui/certificate-manager.c:1632
+msgid "Fingerprint"
+msgstr "Hatz-marka"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr "Fidatu"
+
+#: ../smime/gui/certificate-manager.c:1654
+msgid "_Edit Trust"
+msgstr "_Editatu fidagarritasuna"
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "PKCS12 fitxategi guztiak"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "Posta elektronikoko ziurtagiri-fitxategi guztiak"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "ZE ziurtagiri-fitxategi guztiak"
 
@@ -21255,26 +23641,7 @@ msgstr "Idatzi ziurtagirien datu-baseko pasahitz berria"
 msgid "Enter new password"
 msgstr "Idatzi pasahitz berria"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Honentzat jaulkia:\n"
-"  Gaia: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Jaulkitzailea:\n"
-"  Gaia: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Hautatu ziurtagiria"
 
@@ -21349,22 +23716,18 @@ msgid "Certificate"
 msgstr "Ziurtagiria"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "Ziurtagiriaren xehetasunak"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Postaren ziurtagiriaren fidagarritasun kontrola"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Fidatu ziurtagiri-emaile honetaz posta-erabiltzaileak identifikatzeko."
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ez fidatu ziurtagiri honen autentikotasunaz"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "_Editatu ziurtagiri-emailearen fidagarritasuna"
 
@@ -21381,19 +23744,44 @@ msgstr "Sinatu"
 msgid "Encrypt"
 msgstr "Enkriptatu"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Ziurtagiria badago lehendik"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "PKCS12 fitxategiaren pasahitza"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Idatzi PKCS12 fitxategiaren pasahitza:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:329
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
 msgid "Imported Certificate"
 msgstr "Inportatutako ziurtagiria"
 
@@ -21469,6 +23857,106 @@ msgstr "E_pearekin"
 msgid "With _Status"
 msgstr "Eg_oerarekin"
 
+#~ msgid "Web addresses"
+#~ msgstr "Web helbideak"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Ezin izan da helburua ireki"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Ezin da objektua sortu"
+
+#~ msgid "Could not open source"
+#~ msgstr "Ezin izan da iturburua ireki"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Gertaera ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Zeregina ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Zirkularra ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr ""
+#~ "Elementua ezin izan da ezabatu, dbus-eko errore bat gertatu delako: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Gertaera ezin izan da ezabatu, baimena ukatu delako"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Zeregina ezin izan da ezabatu, baimena ukatu delako"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Zirkularra ezin izan da ezabatu, baimena ukatu delako"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Elementua ezin izan da ezabatu, baimena ukatu delako"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Gertaera ezin izan da ezabatu, errore bat gertatu delako: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Zeregina ezin izan da ezabatu, errore bat gertatu delako: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Zirkularra ezin izan da ezabatu, errore bat gertatu delako: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Elementua ezin izan da ezabatu, errore bat gertatu delako: %s"
+
+#~ msgid "Customize"
+#~ msgstr "Pertsonalizatu"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Oroigarri pertsonalizatua:"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Hautatutako objektuak ezabatzen"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Mezu izengabea"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Ortografia-egiaztapenaren kolorea"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr ""
+#~ "Azpimarraren kolorea akastun hitzetan (lineako zuzentzaile ortografikoa "
+#~ "erabiltzean)."
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr ""
+#~ "Aukera honi ezikusi egingo zaio baztergarrien goiburu pertsonalizatu "
+#~ "batekin bat datorrela aurkituz gero."
+
+#~ msgid "Expunging"
+#~ msgstr "Betiko ezabatzen"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Ikusi irudien eranskinak zuzenean mezuetan."
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Honentzat jaulkia:\n"
+#~ "  Gaia: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Jaulkitzailea:\n"
+#~ "  Gaia: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Ziurtagiriaren xehetasunak"
+
 #~ msgid "Original Contact:"
 #~ msgstr "Jatorrizko kontaktua:"
 
@@ -21553,9 +24041,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Expires On"
 #~ msgstr "Iraungitze-data"
 
-#~ msgid "Fingerprints"
-#~ msgstr "Hatz-marka"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Ziurtagiriaren hierarkia"
 
@@ -21676,9 +24161,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Ziurtagiriaren sinaduraren algoritmoa"
 
-#~ msgid "Issuer"
-#~ msgstr "Jaulkitzailea"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "Jaulkitzailearen ID esklusiboa"
 
@@ -21822,9 +24304,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Define Views"
 #~ msgstr "Definitu ikuspegiak"
 
-#~ msgid "Table"
-#~ msgstr "Taula"
-
 #~ msgid "Define New View"
 #~ msgstr "Definitu ikuspegi berria"
 
@@ -21834,9 +24313,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "UID '%s' is not a mail transport"
 #~ msgstr "'%s' UIDa ez da posta-garraio bat"
 
-#~ msgid "Please select a folder"
-#~ msgstr "Hautatu zerbitzari bat"
-
 #~ msgid "_Switch to Folder"
 #~ msgstr "_Aldatu karpetara"
 
@@ -22075,18 +24551,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "%m/%d/%Y"
 #~ msgstr "%Y/%m/%d"
 
-#~ msgid "Undo the last action"
-#~ msgstr "Desegin azken ekintza"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "Desegin den azken ekintza berregiten du"
-
-#~ msgid "Search for text"
-#~ msgstr "Bilatu testua"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "Bilatu eta ordeztu testua"
-
 #~ msgid "ID of the socket to embed in"
 #~ msgstr "Socket-aren IDa han kapsulatzeko"
 
@@ -22108,9 +24572,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "CalDAV"
 #~ msgstr "CalDAV"
 
-#~ msgid "Google"
-#~ msgstr "Google"
-
 #~ msgid "Email address:"
 #~ msgstr "Helbide elektronikoa:"
 
@@ -22191,9 +24652,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Back - Receiving mail"
 #~ msgstr "Itzuli - Mezuak jaso"
 
-#~ msgid "Sending mail"
-#~ msgstr "Mezuak bidali"
-
 #~ msgid "Next - Review account"
 #~ msgstr "Hurrengoa - Gainbegiratu kontua"
 
@@ -22251,9 +24709,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Evolution account assistant"
 #~ msgstr "Evolution-eko kontuaren morroia"
 
-#~ msgid "On This Computer"
-#~ msgstr "Ordenagailu honetan"
-
 #~ msgid "Modify %s..."
 #~ msgstr "Aldatu %s..."
 
@@ -22351,9 +24806,6 @@ msgstr "Eg_oerarekin"
 #~ "\n"
 #~ "Itxaron Evolution-ek karpetak migratzen dituen bitartean..."
 
-#~ msgid "Unable to create local mail folders at '%s': %s"
-#~ msgstr "Ezin da posta lokalaren karpetak sortu '%s'(e)n: %s"
-
 #~ msgid "Create R_ule"
 #~ msgstr "Sortu a_raua"
 
@@ -22366,9 +24818,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Enter Password"
 #~ msgstr "Idatzi pasahitza"
 
-#~ msgid "Cannot get transport for account '%s'"
-#~ msgstr "Ezin da '%s' kontuaren garraioa lortu"
-
 #~ msgid "Unsubscribing from folder '%s'"
 #~ msgstr "\"%s\" karpetatik harpidetza kentzen"
 
@@ -22397,15 +24846,9 @@ msgstr "Eg_oerarekin"
 #~ msgid "by"
 #~ msgstr "arabera"
 
-#~ msgid "View _Unformatted"
-#~ msgstr "Ikusi formaturik _gabe"
-
 #~ msgid "Hide _Unformatted"
 #~ msgstr "Ezkutatu formaturik _gabekoak"
 
-#~ msgid "O_pen With"
-#~ msgstr "Ireki _honekin"
-
 #~ msgid "\"Filter Editor\" window height"
 #~ msgstr "\"Iragazkien editorea\" leihoaren altuera"
 
@@ -22706,9 +25149,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "_Make this my default account"
 #~ msgstr "_Lehenetsi kontu hau"
 
-#~ msgid "_Trash Folder:"
-#~ msgstr "_Zakarrontziaren karpeta:"
-
 #~ msgid "_Use secure connection:"
 #~ msgstr "E_rabili konexio segurua:"
 
@@ -22808,9 +25248,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "On LDAP Servers"
 #~ msgstr "LDAP zerbitzarian"
 
-#~ msgid "1"
-#~ msgstr "1"
-
 #~ msgid "5"
 #~ msgstr "5"
 
@@ -22896,12 +25333,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "_New Calendar..."
 #~ msgstr "Egutegi _berria..."
 
-#~ msgid "Loading memos"
-#~ msgstr "Zirkularrak kargatzen"
-
-#~ msgid "Loading tasks"
-#~ msgstr "Zereginak kargatzen"
-
 #~ msgid "Recent Messages"
 #~ msgstr "Azken mezuak"
 
@@ -23008,18 +25439,12 @@ msgstr "Eg_oerarekin"
 #~ msgid "User e_mail:"
 #~ msgstr "Erabiltzailearen _posta:"
 
-#~ msgid "Failed to create thread: %s"
-#~ msgstr "Huts egin du haria sortzean: %s"
-
 #~ msgid "Server URL '%s' is not a valid URL"
 #~ msgstr "Zerbitzariaren '%s' URLa ez da baliozko URLa"
 
 #~ msgid "Browse for a CalDAV calendar"
 #~ msgstr "Arakatu CalDAV egutegi batentzako"
 
-#~ msgid "_URL:"
-#~ msgstr "_URLa:"
-
 #~ msgid "Brows_e server for a calendar"
 #~ msgstr "_Arakatu zerbitzaria egutegi batentzako"
 
@@ -23032,9 +25457,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "CalDAV Support"
 #~ msgstr "CalDAV euskarria"
 
-#~ msgid "_Customize options"
-#~ msgstr "_Pertsonalizatu aukerak"
-
 #~ msgid "File _name:"
 #~ msgstr "_Fitxategi-izena:"
 
@@ -23135,9 +25557,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Cal_endar:"
 #~ msgstr "_Egutegia:"
 
-#~ msgid "Retrieve _List"
-#~ msgstr "Eskuratu _zerrenda"
-
 #~ msgid "Google Calendars"
 #~ msgstr "Google egutegiak"
 
@@ -23208,9 +25627,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Cannot get source list. %s"
 #~ msgstr "Ezin da iturburuko zerrenda lortu. %s."
 
-#~ msgid "Create an _Event"
-#~ msgstr "Sortu _gertaera"
-
 #~ msgid "Could not publish calendar: Calendar backend no longer exists"
 #~ msgstr ""
 #~ "Ezin izan da egutegia argitaratu: egutegiaren motorra ez da gehiago "
@@ -23476,9 +25892,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Protocol"
 #~ msgstr "Protokoloa"
 
-#~ msgid "_Filename:"
-#~ msgstr "_Fitxategi-izena:"
-
 #~ msgid "Invalid object"
 #~ msgstr "Objektua ez da baliozkoa."
 
@@ -23527,24 +25940,15 @@ msgstr "Eg_oerarekin"
 #~ msgid "Scanning folders in \"%s\""
 #~ msgstr "\"%s\": karpetak eskaneatzen"
 
-#~ msgid "Creating folder '%s'"
-#~ msgstr "'%s' karpeta sortzen"
-
 #~ msgid "_Default junk plugin:"
 #~ msgstr "Baztergarrien plugin _lehenetsia:"
 
 #~ msgid "_Use Secure Connection:"
 #~ msgstr "E_rabili konexio segurua:"
 
-#~ msgid "Scanning folders in '%s'"
-#~ msgstr "\"%s\"(e)ngo karpetak eskaneatzen"
-
 #~ msgid "Retrieving quota information for folder '%s'"
 #~ msgstr "'%s' karpetaren kuotaren informazioa eskuratzen"
 
-#~ msgid "Opening store '%s'"
-#~ msgstr "'%s' biltegia irekitzen"
-
 #~ msgid "Local Folders"
 #~ msgstr "Karpeta lokalak"
 
@@ -23700,9 +26104,6 @@ msgstr "Eg_oerarekin"
 #~ msgid "Message retracted successfully"
 #~ msgstr "Mezua ongi zuzendu da"
 
-#~ msgid "Insert Send options"
-#~ msgstr "Txertatu bidaltzeko aukerak"
-
 #~ msgid "The participants will receive the following notification.\n"
 #~ msgstr "Partaideak honako jakinarazpena jasoko dute.\n"