bump version, requirements

2004-07-02  JP Rosevear  <jpr@novell.com>

	* configure.in: bump version, requirements

2004-07-02  JP Rosevaer  <jpr@novell.com>

	* Makefile.am (SUBDIRS): Revert previous error change

svn path=/trunk/; revision=26583

1 files changed, 4162 insertions, 3453 deletions

diff --git a/po/eu.po b/po/eu.po
index c7d7d9a9e6..eec0fd49eb 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"POT-Creation-Date: 2004-06-03 11:14-0400\n"
+"POT-Creation-Date: 2004-07-02 14:48-0400\n"
 "PO-Revision-Date: 2004-04-05 21:04+0200\n"
 "Last-Translator: Hizkuntza Politikarako Sailburuordetza <hizpol@ej-gv.es>\n"
 "Language-Team: basque <itzulpena@euskalgnu.org>\n"
@@ -21,14 +21,6 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution-en helbide-liburua"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontaktu-goiburua: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution-en txarteltxoa"
-
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "uneko helbide-liburuaren karpeta"
@@ -49,34 +41,250 @@ msgstr " txartelak"
 msgid " card"
 msgstr " txartel"
 
-#: addressbook/conduit/address-conduit.c:272
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "kontaktu-goiburua: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution-en txarteltxoa"
+
+#. addressbook:ldap-init primary
+#: addressbook/addressbook-errors.xml.h:2
+#, fuzzy
+msgid "This addressbook could not be opened."
+msgstr "Ezin izan da kurtsorea kargatu\n"
+
+#. addressbook:ldap-init secondary
+#: addressbook/addressbook-errors.xml.h:4
+msgid ""
+"This addressbook server might unreachable or the server name may be "
+"misspelled or your network connection could be down."
+msgstr ""
+
+#. addressbook:ldap-auth primary
+#: addressbook/addressbook-errors.xml.h:6
+#, fuzzy
+msgid "Failed to authenticate with LDAP server."
+msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
+
+#. addressbook:ldap-auth secondary
+#: addressbook/addressbook-errors.xml.h:8
+msgid ""
+"Check to make sure your password is spelled correctly and that you are using "
+"a supported login method. Remember that many passwords are case sensitive; "
+"your caps lock might be on."
+msgstr ""
+
+#. addressbook:ldap-search-base primary
+#: addressbook/addressbook-errors.xml.h:10
+#, fuzzy
+msgid "This addressbook server does not have any suggested search bases."
+msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
+
+#. addressbook:ldap-search-base secondary
+#: addressbook/addressbook-errors.xml.h:12
+msgid ""
+"This LDAP server may use an older version of LDAP, which does not support "
+"this functionality or it may be misconfigured. Ask your administrator for "
+"supported search bases."
+msgstr ""
+
+#. addressbook:ldap-v3-schema primary
+#: addressbook/addressbook-errors.xml.h:14
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information."
+msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
+
+#. addressbook:ldap-get-schema primary
+#: addressbook/addressbook-errors.xml.h:16
+#, fuzzy
+msgid "Could not get schema information for LDAP server."
+msgstr "Ezin izan da wombat zerbitzaria abiarazi"
+
+#. addressbook:ldap-invalid-schema primary
+#: addressbook/addressbook-errors.xml.h:18
+#, fuzzy
+msgid "LDAP server did not respond with valid schema information."
+msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
+
+#. addressbook:remove-addressbook primary
+#: addressbook/addressbook-errors.xml.h:20
+#, fuzzy
+msgid "Could not remove addressbook."
+msgstr "Ezin izan da helbide-liburua kargatu"
+
+#. addressbook:remove-addressbook secondary
+#: addressbook/addressbook-errors.xml.h:22
+#: addressbook/addressbook-errors.xml.h:26
+#: addressbook/addressbook-errors.xml.h:34
+#: addressbook/addressbook-errors.xml.h:38 mail/mail-errors.xml.h:70
+#: mail/mail-errors.xml.h:72 mail/mail-errors.xml.h:74
+#: mail/mail-errors.xml.h:76 mail/mail-errors.xml.h:78
+#: mail/mail-errors.xml.h:80 mail/mail-errors.xml.h:84
+#: mail/mail-errors.xml.h:88
+msgid "{0}"
+msgstr ""
+
+#. addressbook:edit-categories primary
+#: addressbook/addressbook-errors.xml.h:24
+msgid "Category editor not available."
+msgstr "Kategoria-editorea ez dago erabilgarri."
+
+#. addressbook:generic-error secondary
+#: addressbook/addressbook-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
+
+#. addressbook:load-error title
+#: addressbook/addressbook-errors.xml.h:30
+#, fuzzy
+msgid "Unable to open addressbook"
+msgstr "Gorde helbide-liburuan"
+
+#. addressbook:load-error primary
+#: addressbook/addressbook-errors.xml.h:32
+#, fuzzy
+msgid "Error loading addressbook."
+msgstr "Errorea helbide-liburu lehenetsia kargatzean."
+
+#. addressbook:search-error primary
+#: addressbook/addressbook-errors.xml.h:36
+#, fuzzy
+msgid "Unable to perform search."
+msgstr "Errorea bilaketa egitean"
+
+#. addressbook:prompt-save primary
+#: addressbook/addressbook-errors.xml.h:40
+#, fuzzy
+msgid "Would you like to save your changes?"
+msgstr "Aldaketak gorde nahi dituzu?"
+
+#. addressbook:prompt-save secondary
+#: addressbook/addressbook-errors.xml.h:42
+msgid ""
+"You have made modifications to this contact. Do you want to save these "
+"changes?"
+msgstr ""
+
+#: addressbook/addressbook-errors.xml.h:43
+#: addressbook/gui/contact-editor/e-contact-editor.c:2803
+#: addressbook/gui/contact-editor/e-contact-editor.c:2827
+msgid "_Discard"
+msgstr "_Ez"
+
+#. addressbook:prompt-move primary
+#: addressbook/addressbook-errors.xml.h:45
+#, fuzzy
+msgid "Cannot move contact."
+msgstr "eta beste txartel bat."
+
+#. addressbook:prompt-move secondary
+#: addressbook/addressbook-errors.xml.h:47
+msgid ""
+"You are attempting to move a contact from one addressbook to another but it "
+"cannot be removed from the source. Do you want to save a copy instead?"
+msgstr ""
+
+#. addressbook:save-error primary
+#: addressbook/addressbook-errors.xml.h:49
+#, fuzzy
+msgid "Unable to save contact(s)."
+msgstr "Ezin da mezua eskuratu editoretik"
+
+#. addressbook:save-error secondary
+#: addressbook/addressbook-errors.xml.h:51
+#, fuzzy
+msgid "Error saving contacts to {0}: {1}"
+msgstr "Errorea txartela gehitzean"
+
+#. addressbook:backend-died primary
+#: addressbook/addressbook-errors.xml.h:53
+#, fuzzy
+msgid "The Evolution addressbook has quit unexpectedly."
+msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
+
+#. addressbook:backend-died secondary
+#: addressbook/addressbook-errors.xml.h:55
+msgid ""
+"Your contacts for {0} will not be available until Evolution is restarted."
+msgstr ""
+
+#: addressbook/conduit/address-conduit.c:275
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
 
-#: addressbook/conduit/address-conduit.c:1151
-#: addressbook/conduit/address-conduit.c:1152
+#: addressbook/conduit/address-conduit.c:1156
+#: addressbook/conduit/address-conduit.c:1157
 msgid "Could not load addressbook"
 msgstr "Ezin izan da helbide-liburua kargatu"
 
-#: addressbook/conduit/address-conduit.c:1220
-#: addressbook/conduit/address-conduit.c:1223
+#: addressbook/conduit/address-conduit.c:1225
+#: addressbook/conduit/address-conduit.c:1228
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP zerbitzarian anonimoki sartzea"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:173
-#: camel/providers/groupwise/camel-gw-listener.c:378
-msgid "Failed to authenticate.\n"
-msgstr "Huts egin du autentifikatzean.\n"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Osatze automatikoa"
 
-#: addressbook/gui/component/addressbook.c:179
-#: camel/providers/groupwise/camel-gw-listener.c:367
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Ziurtagiria:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfiguratu osatze automatikoa hemen"
+
+#. Create the contacts group
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/addressbook-view.c:1044
+#: calendar/gui/migration.c:373
+msgid "Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution-en helbide-liburua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-en helbide-liburuko helbide-leihoa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuaren osagaia"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+msgid "Manage your S/MIME certificates here"
+msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -109,7 +317,7 @@ msgstr "Kontaktu berria"
 
 #: addressbook/gui/component/addressbook-component.c:110
 #, fuzzy
-msgid "_Contacts Group"
+msgid "Contacts Grou_p"
 msgstr "_Kontaktuak:"
 
 #: addressbook/gui/component/addressbook-component.c:111
@@ -133,15 +341,15 @@ msgid "Migrating `%s':"
 msgstr "'%s' migratzen:"
 
 #. create the local source group
-#: addressbook/gui/component/addressbook-migrate.c:464
+#: addressbook/gui/component/addressbook-migrate.c:489
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
+#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
 #: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr ""
 
 #. Create the default Person addressbook
-#: addressbook/gui/component/addressbook-migrate.c:472
+#: addressbook/gui/component/addressbook-migrate.c:497
 #: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
 #: filter/filter-label.c:123 mail/em-migrate.c:1013 mail/mail-config.c:78
@@ -150,19 +358,19 @@ msgid "Personal"
 msgstr "Pertsonala"
 
 #. Create the LDAP source group
-#: addressbook/gui/component/addressbook-migrate.c:480
+#: addressbook/gui/component/addressbook-migrate.c:505
 msgid "On LDAP Servers"
 msgstr "LDAP zerbitzarian"
 
-#: addressbook/gui/component/addressbook-migrate.c:608
+#: addressbook/gui/component/addressbook-migrate.c:633
 msgid "LDAP Servers"
 msgstr "LDAP zerbitzariak"
 
-#: addressbook/gui/component/addressbook-migrate.c:728
+#: addressbook/gui/component/addressbook-migrate.c:753
 msgid "Autocompletion Settings"
 msgstr "Osatze automatikoaren ezarpenak"
 
-#: addressbook/gui/component/addressbook-migrate.c:1104
+#: addressbook/gui/component/addressbook-migrate.c:1129
 msgid ""
 "The location and hierarchy of the Evolution contact folders has changed "
 "since Evolution 1.x.\n"
@@ -170,57 +378,66 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1118
+#: addressbook/gui/component/addressbook-migrate.c:1143
 msgid ""
 "The format of mailing list contacts has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1127
+#: addressbook/gui/component/addressbook-migrate.c:1152
 msgid ""
 "The way Evolution stores some phone numbers has changed.\n"
 "\n"
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-migrate.c:1137
+#: addressbook/gui/component/addressbook-migrate.c:1162
 msgid ""
 "Evolution's Palm Sync changelog and map files have changed.\n"
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:675
+#: addressbook/gui/component/addressbook-view.c:633
 #, c-format
 msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:754
+#: addressbook/gui/component/addressbook-view.c:714
 msgid "New Address Book"
 msgstr "Helbide-liburu berria"
 
-#: addressbook/gui/component/addressbook-view.c:755
-#: addressbook/gui/widgets/e-addressbook-view.c:1088
+#: addressbook/gui/component/addressbook-view.c:715
+#: addressbook/gui/widgets/e-addressbook-view.c:1119
 #: calendar/gui/calendar-component.c:430 calendar/gui/tasks-component.c:375
-#: ui/evolution-addressbook.xml.h:8 ui/evolution-calendar.xml.h:5
-#: ui/evolution-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:3
+#: mail/em-filter-i18n.h:11 ui/evolution-addressbook.xml.h:8
+#: ui/evolution-calendar.xml.h:5 ui/evolution-comp-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:3
 #: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
 #: ui/evolution-tasks.xml.h:6
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/component/addressbook-view.c:756
+#: addressbook/gui/component/addressbook-view.c:716
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:377
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#. Create the contacts group
-#: addressbook/gui/component/addressbook-view.c:995
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktuak"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP zerbitzarian anonimoki sartzea"
+
+#: addressbook/gui/component/addressbook.c:173
+#: camel/providers/groupwise/camel-gw-listener.c:378
+msgid "Failed to authenticate.\n"
+msgstr "Huts egin du autentifikatzean.\n"
+
+#: addressbook/gui/component/addressbook.c:179
+#: camel/providers/groupwise/camel-gw-listener.c:367
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -240,60 +457,6 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "*Control*F2"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Autocompletion"
-msgstr "Osatze automatikoa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "C_ontacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-msgid "Certificates"
-msgstr "Ziurtagiria:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Configure autocomplete here"
-msgstr "Konfiguratu osatze automatikoa hemen"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook"
-msgstr "Evolution-en helbide-liburua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-en helbide-liburuko helbide-leihoa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution Addressbook component"
-msgstr "Evolution-en helbide-liburuaren osagaia"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
-msgid "Manage your S/MIME certificates here"
-msgstr ""
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/component/select-names/select-names.glade.h:1
 #: addressbook/gui/contact-editor/contact-editor.glade.h:1
@@ -301,7 +464,7 @@ msgstr ""
 #: addressbook/gui/contact-editor/fullname.glade.h:1
 #: addressbook/gui/contact-editor/im.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:3
-#: calendar/gui/dialogs/alarm-options.glade.h:1
+#: calendar/gui/dialogs/alarm-dialog.glade.h:1
 #: calendar/gui/dialogs/calendar-setup.glade.h:1
 #: calendar/gui/dialogs/event-page.glade.h:1
 #: calendar/gui/dialogs/meeting-page.glade.h:1
@@ -310,8 +473,7 @@ msgstr ""
 #: calendar/gui/dialogs/task-page.glade.h:1
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:3
-#: mail/mail-search.glade.h:1 mail/message-tags.glade.h:1
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: mail/mail-dialogs.glade.h:6 mail/message-tags.glade.h:1
 #: widgets/e-timezone-dialog/e-timezone-dialog.glade.h:1
 msgid "*"
 msgstr "*"
@@ -337,6 +499,7 @@ msgid "636"
 msgstr "636"
 
 #: addressbook/gui/component/ldap-config.glade.h:7
+#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
 #, fuzzy
 msgid "<b>Authentication</b>"
 msgstr "Autentifikazioa"
@@ -385,13 +548,11 @@ msgid "Anonymously"
 msgstr "Anonimoki"
 
 #: addressbook/gui/component/ldap-config.glade.h:17
-#: calendar/gui/dialogs/task-editor.c:193
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:18
-#: calendar/gui/dialogs/task-editor.c:200 mail/mail-security.glade.h:3
-#: smime/gui/smime-ui.glade.h:19
+#: mail/mail-dialogs.glade.h:13 smime/gui/smime-ui.glade.h:19
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -657,34 +818,26 @@ msgid "cards"
 msgstr "txartel"
 
 #: addressbook/gui/component/ldap-config.glade.h:60
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:27
+#: calendar/gui/dialogs/calendar-setup.glade.h:14 filter/filter.glade.h:15
 #: mail/mail-config.glade.h:183
 msgid "minutes"
 msgstr "minutu"
 
-#: addressbook/gui/component/select-names/e-select-names.c:503
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Hautatu kontaktuak helbide-liburutik"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution-en helbide-liburuko izenak hautatzeko interfazea"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Kendu denak"
 
-#: addressbook/gui/component/select-names/e-select-names.c:702
 #: addressbook/gui/component/select-names/e-select-names-popup.c:215
+#: addressbook/gui/component/select-names/e-select-names.c:702
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Kendu"
 
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
-#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
-#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
-msgid "Name"
-msgstr "Izena"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Kendu denak"
-
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ikusi kontaktuen zerrenda"
@@ -699,7 +852,7 @@ msgid "Send HTML Mail?"
 msgstr "HTML mezua bidali?"
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:322
-#: addressbook/gui/widgets/eab-popup-control.c:983
+#: addressbook/gui/widgets/eab-popup-control.c:982
 msgid "Add to Contacts"
 msgstr "Gehitu kontaktuei"
 
@@ -707,15 +860,23 @@ msgstr "Gehitu kontaktuei"
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
+#: addressbook/gui/component/select-names/e-select-names-section.etspec.h:1
+#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/gui/contact-editor/e-contact-editor-fullname.c:89
+msgid "Name"
+msgstr "Izena"
+
 #: addressbook/gui/component/select-names/e-select-names-table-model.c:351
 #: addressbook/gui/component/select-names/e-select-names-text-model.c:104
-#: addressbook/gui/widgets/e-addressbook-view.c:224
+#: addressbook/gui/widgets/e-addressbook-view.c:228
 msgid "Source"
 msgstr "Iturburua"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution-en helbide-liburuko izenak hautatzeko interfazea"
+#: addressbook/gui/component/select-names/e-select-names.c:503
+#: addressbook/gui/component/select-names/select-names.glade.h:6
+#, fuzzy
+msgid "Select Contacts from Address Book"
+msgstr "Hautatu kontaktuak helbide-liburutik"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -742,6 +903,11 @@ msgstr "_Kategoria:"
 msgid "_Find"
 msgstr "Bilatu"
 
+#: addressbook/gui/component/select-names/select-names.glade.h:8
+#, fuzzy
+msgid "_Search:"
+msgstr "_Bilatu"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:2
 #, fuzzy
 msgid "<b>Email</b>"
@@ -787,9 +953,8 @@ msgid "<b>Work</b>"
 msgstr "<b>Falta:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:178
-#: addressbook/gui/widgets/eab-contact-display.c:334
-#: addressbook/gui/widgets/eab-contact-display.c:353
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "AIM"
 msgstr ""
 
@@ -814,7 +979,6 @@ msgid "Birthday:"
 msgstr "U_rtebetetzea:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:16
-#: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "E_gutegia:"
@@ -830,15 +994,15 @@ msgid "Company:"
 msgstr "Enpresakoa"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:266
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:164
+#: addressbook/gui/contact-editor/e-contact-editor.c:272
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:169
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
 msgid "Contact"
 msgstr "Kontaktua"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:520
+#: addressbook/gui/contact-editor/e-contact-editor.c:526
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
@@ -948,8 +1112,8 @@ msgstr "_Web orriaren helbidea:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: filter/filter-label.c:122 mail/em-migrate.c:1012 mail/mail-config.c:77
 #: mail/mail-config.glade.h:157
 msgid "Work"
@@ -971,44 +1135,28 @@ msgid "_File under:"
 msgstr "Fitxategi-izena:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:47
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:12
 #, fuzzy
 msgid "_Where:"
 msgstr "_Zerbitzaria:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:315
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ziur zaude kontaktu hauek\n"
-"ezabatu nahi dituzula?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:318
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ziur zaude kontaktu hau\n"
-"ezabatu nahi duzula?"
-
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:343
-#: addressbook/gui/widgets/eab-contact-display.c:364
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#: addressbook/gui/widgets/eab-contact-display.c:365
 msgid "Address"
 msgstr "Helbidea"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:287
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:178
+#: addressbook/gui/contact-editor/e-contact-editor.c:293
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:183
 #: addressbook/gui/widgets/e-addressbook-model.c:309
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:392
-#: addressbook/gui/widgets/e-minicard.c:174
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:474
 #: addressbook/gui/widgets/e-minicard-view-widget.c:119
+#: addressbook/gui/widgets/e-minicard-view.c:498
+#: addressbook/gui/widgets/e-minicard.c:174
 msgid "Editable"
 msgstr "Editagarria"
 
@@ -1987,139 +2135,131 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbawe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:337
-#: addressbook/gui/widgets/eab-contact-display.c:356
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/widgets/eab-contact-display.c:334
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:339
-#: addressbook/gui/widgets/eab-contact-display.c:358
-#, fuzzy
-msgid "Yahoo"
-msgstr "Yoro"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:338
-#: addressbook/gui/widgets/eab-contact-display.c:357
-msgid "MSN"
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:336
-#: addressbook/gui/widgets/eab-contact-display.c:355
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/widgets/eab-contact-display.c:333
 msgid "ICQ"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
 #, fuzzy
-msgid "GroupWise"
-msgstr "Taldea"
+msgid "Service"
+msgstr "Zerbitzua prest"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
+#: calendar/gui/dialogs/cal-prefs-dialog.c:578
+#: calendar/gui/e-cal-list-view.etspec.h:3
+#, fuzzy
+msgid "Location"
+msgstr "Kokalekua:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Erabiltzaile-izena:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 msgid "Home"
 msgstr "Etxekoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:197
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 msgid "Other"
 msgstr "Bestelakoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:252
+#: addressbook/gui/contact-editor/e-contact-editor.c:186
+#: addressbook/gui/widgets/eab-contact-display.c:336
+#, fuzzy
+msgid "Yahoo"
+msgstr "Yoro"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/widgets/eab-contact-display.c:335
+msgid "MSN"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
+#: addressbook/gui/widgets/eab-contact-display.c:332
+#, fuzzy
+msgid "GroupWise"
+msgstr "Taldea"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:258
 #, fuzzy
 msgid "Source Book"
 msgstr "Iturburua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:259
+#: addressbook/gui/contact-editor/e-contact-editor.c:265
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:273
+#: addressbook/gui/contact-editor/e-contact-editor.c:279
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:280
+#: addressbook/gui/contact-editor/e-contact-editor.c:286
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:294
+#: addressbook/gui/contact-editor/e-contact-editor.c:300
 msgid "Changed"
 msgstr "Aldatuta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2352
+#: addressbook/gui/contact-editor/e-contact-editor.c:2428
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
 #. Create the selector
-#: addressbook/gui/contact-editor/e-contact-editor.c:2429
+#: addressbook/gui/contact-editor/e-contact-editor.c:2505
 #, fuzzy
 msgid "Please select an image for this contact"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2433
+#: addressbook/gui/contact-editor/e-contact-editor.c:2509
 #, fuzzy
 msgid "No image"
 msgstr "Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: addressbook/gui/contact-editor/e-contact-editor.c:2712
 #, fuzzy
 msgid ""
 "The contact data is invalid:\n"
 "\n"
 msgstr "Errepikatze-data ez da baliozkoa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2664
+#: addressbook/gui/contact-editor/e-contact-editor.c:2740
 #, fuzzy
 msgid "Invalid contact."
 msgstr "Bilatu kontaktua hemen:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2723
+#: addressbook/gui/contact-editor/e-contact-editor.c:2799
 msgid ""
 "The contact cannot be saved to the selected address book. Do you want to "
 "discard changes?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2727
-#: addressbook/gui/contact-editor/e-contact-editor.c:2751
-msgid "_Discard"
-msgstr "_Ez"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:2746
+#: addressbook/gui/contact-editor/e-contact-editor.c:2822
 msgid ""
 "You are moving the contact from one address book to another, but it cannot "
 "be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Zerbitzua prest"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:127
-#: calendar/gui/dialogs/cal-prefs-dialog.c:578
-#: calendar/gui/e-cal-list-view.etspec.h:2
-#, fuzzy
-msgid "Location"
-msgstr "Kokalekua:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Erabiltzaile-izena:"
-
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
@@ -2137,6 +2277,22 @@ msgstr "_Izen-abizenak:"
 msgid "E-_mail:"
 msgstr "_Helb. el:"
 
+#: addressbook/gui/contact-editor/eab-editor.c:315
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ziur zaude kontaktu hauek\n"
+"ezabatu nahi dituzula?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:318
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ziur zaude kontaktu hau\n"
+"ezabatu nahi duzula?"
+
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. helbidea:"
@@ -2263,49 +2419,70 @@ msgid "\n"
 msgstr "\n"
 
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:4
+msgid "Add an email to the List"
+msgstr ""
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#, fuzzy
+msgid "Insert email adresses from Adress Book"
+msgstr "Hautatu kontaktuak helbide-liburutik"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:706
 msgid "Members"
 msgstr "Kideak"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:5
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#, fuzzy
+msgid "Remove an email address from the List"
+msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:8
+#, fuzzy
+msgid "Select"
+msgstr "Hautatuta"
+
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
 msgid "_Hide addresses when sending mail to this list"
 msgstr "_Ezkutatu helbideak zerrenda honetara mezuak bidaltzean"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:6
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:10
 msgid "_List name:"
 msgstr "_Zerrenda-izena:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:7
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:11
 msgid "_Type an email address or drag a contact into the list below:"
 msgstr ""
 "_Idatzi helbide elektronikoa edo arrastatu kontaktua beheko zerrendara:"
 
-#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:9
-msgid "contact-list-editor"
-msgstr "kontaktu-zerrendaren editorea"
+#: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:13
+#: smime/gui/smime-ui.glade.h:48
+msgid "dialog1"
+msgstr "1 elkarrizketa-koadroa"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:157
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:162
 #: addressbook/gui/widgets/e-addressbook-model.c:295
 #: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:378
-#: addressbook/gui/widgets/e-addressbook-view.c:217
-#: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-addressbook-view.c:221
 #: addressbook/gui/widgets/e-minicard-view-widget.c:105
+#: addressbook/gui/widgets/e-minicard-view.c:484
 msgid "Book"
 msgstr "Liburua"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:171
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:176
 msgid "Is New List"
 msgstr "Zerrenda berria da"
 
-#. Construct the app
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:223
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:845
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:728
+#: calendar/gui/e-meeting-list-view.c:60
+#: calendar/gui/e-meeting-list-view.c:457
+msgid "Required Participants"
+msgstr "Beharrezko partaideak"
+
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:805
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:498
-msgid "Save List as VCard"
-msgstr "Gorde zerrenda VCard gisa"
-
 #: addressbook/gui/merging/eab-contact-commit-duplicate-detected.glade.h:1
 msgid "Changed Contact:"
 msgstr "Aldatutako kontaktua:"
@@ -2344,11 +2521,414 @@ msgstr ""
 "karpeta honetan.  Hala ere gehitu nahi duzu?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:121
+#: addressbook/gui/search/e-addressbook-search-dialog.c:170
 #: widgets/misc/e-filter-bar.c:156
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
+#: addressbook/gui/widgets/e-addressbook-model.c:148
+#, fuzzy
+msgid "No contacts"
+msgstr "Erakutsi kontaktuak"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:151
+#, fuzzy, c-format
+msgid "%d contact"
+msgid_plural "%d contacts"
+msgstr[0] "Bilatu kontaktua hemen:"
+msgstr[1] "Bilatu kontaktua hemen:"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:302
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
+#: addressbook/gui/widgets/e-addressbook-view.c:235
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
+#: addressbook/gui/widgets/e-minicard-view.c:491
+msgid "Query"
+msgstr "Kontsulta"
+
+#: addressbook/gui/widgets/e-addressbook-model.c:445
+msgid "Error getting book view"
+msgstr "Errorea liburu-ikuspegia lortzean"
+
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
+msgid "Model"
+msgstr "Modeloa"
+
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
+msgid "Error modifying card"
+msgstr "Errorea txartela aldatzean"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:167
+msgid "Name begins with"
+msgstr "Izena honela hasten da:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:168
+msgid "Email begins with"
+msgstr "Helb. el. honela hasten da:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:169
+#: calendar/gui/cal-search-bar.c:54
+msgid "Category is"
+msgstr "Kategoria da:"
+
+#. We attach subitems below
+#: addressbook/gui/widgets/e-addressbook-view.c:170
+#: calendar/gui/cal-search-bar.c:49
+msgid "Any field contains"
+msgstr "Edozein eremuk hau dauka:"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:171
+#: addressbook/gui/widgets/e-addressbook-view.c:176
+msgid "Advanced..."
+msgstr "Aurreratua..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:242
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-meeting-list-view.c:227
+#: calendar/gui/e-meeting-time-sel.etspec.h:11
+msgid "Type"
+msgstr "Mota"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:539
+#, fuzzy
+msgid "Address Book"
+msgstr "Helbide-liburua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:883
+#: addressbook/gui/widgets/e-addressbook-view.c:1103
+#: addressbook/gui/widgets/e-addressbook-view.c:2093
+#: ui/evolution-addressbook.xml.h:19
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Gorde VCard gisa"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1090
+msgid "New Contact..."
+msgstr "Kontaktu berria..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1091
+msgid "New Contact List..."
+msgstr "Kontaktuen zerrenda berria..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1094
+msgid "Go to Folder..."
+msgstr "Joan karpeta honetara..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1095
+msgid "Import..."
+msgstr "Inportatu..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1097
+msgid "Search for Contacts..."
+msgstr "Bilatu kontaktuak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1098
+#, fuzzy
+msgid "Address Book Sources..."
+msgstr "Helbide-liburuaren iturburuak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1100
+msgid "Pilot Settings..."
+msgstr "Pilot-aren ezarpenak..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1104
+#: ui/evolution-addressbook.xml.h:10
+msgid "Forward Contact"
+msgstr "Birbidali kontaktua"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1105
+msgid "Send Message to Contact"
+msgstr "Bidali mezua kontaktuari"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1106 calendar/gui/print.c:2480
+#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
+#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
+msgid "Print"
+msgstr "Inprimatu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1108
+msgid "Print Envelope"
+msgstr "Inprimatu gutun-azala"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1112
+#, fuzzy
+msgid "Copy to Address Book..."
+msgstr "Helbide-liburua..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1113
+#, fuzzy
+msgid "Move to Address Book..."
+msgstr "Helbide-liburua..."
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1116
+#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
+msgid "Cut"
+msgstr "Ebaki"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1117
+#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: ui/evolution-tasks.xml.h:2
+msgid "Copy"
+msgstr "Kopiatu"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1118
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
+msgid "Paste"
+msgstr "Itsatsi"
+
+#: addressbook/gui/widgets/e-addressbook-view.c:1123
+#: calendar/gui/e-calendar-view.c:1327
+msgid "Current View"
+msgstr "Uneko ikuspegia"
+
+#. All, unmatched, separator
+#: addressbook/gui/widgets/e-addressbook-view.c:1678
+#: calendar/gui/cal-search-bar.c:358
+msgid "Any Category"
+msgstr "Edozein kategoria"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
+msgid "Assistant"
+msgstr "Laguntzailea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant Phone"
+msgstr "Laguntzailearen telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
+msgid "Business Fax"
+msgstr "Laneko faxa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
+msgid "Business Phone"
+msgstr "Laneko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Business Phone 2"
+msgstr "Laneko 2. telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
+msgid "Callback Phone"
+msgstr "Atzera deitzeko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
+msgid "Car Phone"
+msgstr "Autoko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-calendar-table.etspec.h:3
+msgid "Categories"
+msgstr "Kategoriak"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
+msgid "Company Phone"
+msgstr "Enpresako telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: addressbook/gui/widgets/eab-contact-display.c:545 smime/lib/e-cert.c:826
+msgid "Email"
+msgstr "Helb. el."
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+#: addressbook/gui/widgets/eab-popup-control.c:441
+msgid "Email 2"
+msgstr "2. helb. el."
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+#: addressbook/gui/widgets/eab-popup-control.c:451
+msgid "Email 3"
+msgstr "3. helb. el."
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
+msgid "Family Name"
+msgstr "Deitura"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
+msgid "File As"
+msgstr "Gorde honela"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
+#, fuzzy
+msgid "Given Name"
+msgstr "Eremu-izena"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Home Fax"
+msgstr "Etxeko faxa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
+msgid "Home Phone"
+msgstr "Etxeko telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
+msgid "Home Phone 2"
+msgstr "Etxeko 2. telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#, fuzzy
+msgid "ISDN Phone"
+msgstr "Telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
+#, fuzzy
+msgid "Journal"
+msgstr "Jordania"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
+msgid "Manager"
+msgstr "Zuzendaria"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+#: addressbook/gui/widgets/eab-contact-display.c:364
+msgid "Mobile Phone"
+msgstr "Telefono mugikorra"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
+msgid "Nickname"
+msgstr "Goitizena"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "Note"
+msgstr "Oharra"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Office"
+msgstr "Bulegoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+#: addressbook/gui/widgets/eab-contact-display.c:345
+msgid "Organization"
+msgstr "Erakundea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Other Fax"
+msgstr "Beste fax bat"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
+msgid "Other Phone"
+msgstr "Beste telefono bat"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
+msgid "Pager"
+msgstr "Bilagailua"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
+msgid "Primary Phone"
+msgstr "Telefono nagusia"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
+msgid "Radio"
+msgstr "Irrati-telefonoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-list-view.c:234
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funtzioa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Spouse"
+msgstr "Ezkontidea"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
+#, fuzzy
+msgid "TTYTDD"
+msgstr "Teletipoa"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Telex"
+msgstr "Telex-a"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
+msgid "Title"
+msgstr "Titulua"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
+#, fuzzy
+msgid "Unit"
+msgstr "Unst"
+
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Web Site"
+msgstr "Web gunea"
+
+#: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:137
+msgid "Width"
+msgstr "Zabalera"
+
+#: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:144
+msgid "Height"
+msgstr "Altuera"
+
+#: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:152
+msgid "Has Focus"
+msgstr "Fokua du"
+
+#: addressbook/gui/widgets/e-minicard-label.c:136
+msgid "Field"
+msgstr "Eremua"
+
+#: addressbook/gui/widgets/e-minicard-label.c:143
+msgid "Field Name"
+msgstr "Eremu-izena"
+
+#: addressbook/gui/widgets/e-minicard-label.c:150
+msgid "Text Model"
+msgstr "Testu-eredua"
+
+#: addressbook/gui/widgets/e-minicard-label.c:157
+msgid "Max field name length"
+msgstr "Eremu-izenaren geh. luzera"
+
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Zutabe-zabalera"
+
+#: addressbook/gui/widgets/e-minicard-view.c:164
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view.\n"
+"\n"
+"Double-click here to create a new Contact."
+msgstr ""
+"\n"
+"\n"
+"Ez dago ikuspegi honetan erakusteko elementurik.\n"
+"\n"
+"Egin klik bikoitza hemen kontaktu berria sortzeko."
+
+#: addressbook/gui/widgets/e-minicard-view.c:167
+msgid ""
+"\n"
+"\n"
+"There are no items to show in this view."
+msgstr ""
+"\n"
+"\n"
+"Ez dago ikuspegi honetan erakusteko elementurik."
+
+#: addressbook/gui/widgets/e-minicard-view.c:477
+msgid "Adapter"
+msgstr "Moldagailua"
+
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Hautatuta"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Kurtsorea du"
+
 #: addressbook/gui/widgets/eab-contact-display.c:131
 #: addressbook/gui/widgets/eab-contact-display.c:194
 msgid "(map)"
@@ -2361,117 +2941,90 @@ msgid "map"
 msgstr "Amapala"
 
 #: addressbook/gui/widgets/eab-contact-display.c:259
-#: addressbook/gui/widgets/eab-contact-display.c:525
+#: addressbook/gui/widgets/eab-contact-display.c:526
 #, fuzzy
 msgid "List Members"
 msgstr "Kideak"
 
-#: addressbook/gui/widgets/eab-contact-display.c:321
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:324
 #, fuzzy
 msgid "E-mail"
 msgstr "Helb. el."
 
-#: addressbook/gui/widgets/eab-contact-display.c:332
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Organization"
-msgstr "Erakundea"
-
-#: addressbook/gui/widgets/eab-contact-display.c:333
+#: addressbook/gui/widgets/eab-contact-display.c:346
 #, fuzzy
 msgid "Position"
 msgstr "Boston"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#: addressbook/gui/widgets/eab-contact-display.c:354
-#, fuzzy
-msgid "Groupwise"
-msgstr "Taldea"
-
-#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/eab-contact-display.c:347
 msgid "Video Conferencing"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:341
-#: addressbook/gui/widgets/eab-contact-display.c:362
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:349
 #, fuzzy
 msgid "Fax"
 msgstr "Lan fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:346
+#: addressbook/gui/widgets/eab-contact-display.c:353
 #, fuzzy
 msgid "work"
 msgstr "Lanekoa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:359
+#: addressbook/gui/widgets/eab-contact-display.c:360
 msgid "WWW"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-contact-display.c:360
-#: addressbook/gui/widgets/eab-contact-display.c:579
+#: addressbook/gui/widgets/eab-contact-display.c:361
+#: addressbook/gui/widgets/eab-contact-display.c:580
 #, fuzzy
 msgid "Blog"
 msgstr "Bologna"
 
-#: addressbook/gui/widgets/eab-contact-display.c:363
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
-
-#: addressbook/gui/widgets/eab-contact-display.c:367
+#: addressbook/gui/widgets/eab-contact-display.c:368
 #, fuzzy
 msgid "personal"
 msgstr "Pertsonala"
 
-#: addressbook/gui/widgets/eab-contact-display.c:374
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Note"
-msgstr "Oharra"
-
-#: addressbook/gui/widgets/eab-contact-display.c:540
+#: addressbook/gui/widgets/eab-contact-display.c:541
 #, fuzzy
 msgid "Job Title"
 msgstr "Kar_gua:"
 
-#: addressbook/gui/widgets/eab-contact-display.c:544
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: smime/lib/e-cert.c:826
-msgid "Email"
-msgstr "Helb. el."
-
-#: addressbook/gui/widgets/eab-contact-display.c:571
+#: addressbook/gui/widgets/eab-contact-display.c:572
 #, fuzzy
 msgid "Home page"
 msgstr "Etxeko faxa"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:48
+#: addressbook/gui/widgets/eab-gui-util.c:49
 msgid "Success"
 msgstr "Behar bezala egin da"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:50
+#: addressbook/gui/widgets/eab-gui-util.c:51
 msgid "Backend busy"
 msgstr ""
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 #, fuzzy
 msgid "Address Book does not exist"
 msgstr "Helbide-liburu hori ez dago"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Kontaktuen zerrenda berria"
@@ -2479,74 +3032,74 @@ msgstr "Kontaktuen zerrenda berria"
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:56
+#: addressbook/gui/widgets/eab-gui-util.c:57
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 #, fuzzy
 msgid "Contact not found"
 msgstr "Ez da txartela aurkitu"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 #, fuzzy
 msgid "Contact ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 #: calendar/gui/dialogs/task-details-page.glade.h:3
 #: calendar/gui/e-cal-component-preview.c:233
-#: calendar/gui/e-calendar-table.c:450 calendar/gui/e-cal-model-tasks.c:352
-#: calendar/gui/e-cal-model-tasks.c:655 calendar/gui/print.c:2349
-#: camel/camel-service.c:728 camel/camel-service.c:766
-#: camel/camel-service.c:850 camel/camel-service.c:890
-#: camel/providers/pop3/camel-pop3-store.c:451
-#: camel/providers/pop3/camel-pop3-store.c:532
+#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:655
+#: calendar/gui/e-calendar-table.c:450 calendar/gui/print.c:2349
+#: camel/camel-service.c:724 camel/camel-service.c:762
+#: camel/camel-service.c:846 camel/camel-service.c:886
+#: camel/providers/pop3/camel-pop3-store.c:456
+#: camel/providers/pop3/camel-pop3-store.c:537
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Ezin izan da objektua eguneratu"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "TLS not Available"
 msgstr "TLS ez dago erabilgarri"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:66
+#: addressbook/gui/widgets/eab-gui-util.c:67
 #, fuzzy
 msgid "No such source"
 msgstr "Ez dago horrelako mezurik"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/eab-gui-util.c:90
+#: addressbook/gui/widgets/eab-gui-util.c:91
 msgid ""
 "We were unable to open this addressbook.  Please check that the path exists "
 "and that you have permission to access it."
@@ -2554,7 +3107,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Egiaztatu bide-izena ondo dagoela "
 "eta sarbidea baduzula."
 
-#: addressbook/gui/widgets/eab-gui-util.c:97
+#: addressbook/gui/widgets/eab-gui-util.c:98
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the LDAP server is unreachable."
@@ -2562,7 +3115,7 @@ msgstr ""
 "Ezin izan da helbide-liburu hori ireki.  Horrek esan nahi du okerreko URIa "
 "idatzi duzula, edo LDAP zerbitzaria ezin dela atzitu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: addressbook/gui/widgets/eab-gui-util.c:103
 #, fuzzy
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  If "
@@ -2573,7 +3126,7 @@ msgstr ""
 "erabili nahi baduzu Evolution-en programa konpilatu behar duzu CVS "
 "iturburuetatik beheko estekatik OpenLDAP eskuratuz."
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: addressbook/gui/widgets/eab-gui-util.c:110
 msgid ""
 "We were unable to open this addressbook.  This either means you have entered "
 "an incorrect URI, or the server is unreachable."
@@ -2581,7 +3134,7 @@ 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:129
+#: addressbook/gui/widgets/eab-gui-util.c:130
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2594,7 +3147,7 @@ msgstr ""
 "gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
 "hobespenetan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:135
+#: addressbook/gui/widgets/eab-gui-util.c:136
 msgid ""
 "The time to execute this query exceeded the server limit or the limit\n"
 "you have configured for this addressbook.  Please make your search\n"
@@ -2606,48 +3159,48 @@ msgstr ""
 "edo gehitu denbora-muga, helbide-liburu honen\n"
 "direktorio-zerbitzariaren hobespenetan."
 
-#: addressbook/gui/widgets/eab-gui-util.c:141
+#: addressbook/gui/widgets/eab-gui-util.c:142
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr "Helbide-liburuaren moduluak ezin izan du kontsulta analizatu."
 
-#: addressbook/gui/widgets/eab-gui-util.c:144
+#: addressbook/gui/widgets/eab-gui-util.c:145
 msgid "The backend for this addressbook refused to perform this query."
 msgstr "Helbide-liburuaren moduluak kontsulta ezetsi du."
 
-#: addressbook/gui/widgets/eab-gui-util.c:147
+#: addressbook/gui/widgets/eab-gui-util.c:148
 msgid "This query did not complete successfully."
 msgstr "Kontsulta ez da behar bezala egin."
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
+#: addressbook/gui/widgets/eab-gui-util.c:170
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:169
-#: addressbook/gui/widgets/eab-gui-util.c:580
+#: addressbook/gui/widgets/eab-gui-util.c:170
+#: addressbook/gui/widgets/eab-gui-util.c:581
 #, fuzzy
 msgid "Error adding contact"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:180
+#: addressbook/gui/widgets/eab-gui-util.c:181
 #, fuzzy
 msgid "Error modifying contact"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
+#: addressbook/gui/widgets/eab-gui-util.c:193
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:192
-#: addressbook/gui/widgets/eab-gui-util.c:538
+#: addressbook/gui/widgets/eab-gui-util.c:193
+#: addressbook/gui/widgets/eab-gui-util.c:539
 #, fuzzy
 msgid "Error removing contact"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/eab-gui-util.c:274
+#: addressbook/gui/widgets/eab-gui-util.c:275
 #, fuzzy, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2656,7 +3209,7 @@ msgstr ""
 "%d txartel irekitzen badituzu, %d leiho irekiko dira.\n"
 "Ziur zaude txartel horiek guztiak bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:300
+#: addressbook/gui/widgets/eab-gui-util.c:301
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2665,49 +3218,49 @@ msgstr ""
 "%s badago lehendik\n"
 "Gainidatzi nahi duzu?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:304
+#: addressbook/gui/widgets/eab-gui-util.c:305
 msgid "Overwrite"
 msgstr "Gainidatzi"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:365
+#: addressbook/gui/widgets/eab-gui-util.c:366
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:499
+#: addressbook/gui/widgets/eab-gui-util.c:500
 msgid "list"
 msgstr "zerrenda"
 
-#: addressbook/gui/widgets/eab-gui-util.c:634
+#: addressbook/gui/widgets/eab-gui-util.c:635
 #, fuzzy
 msgid "Move contact to"
 msgstr "Eraman txartela hona:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:636
+#: addressbook/gui/widgets/eab-gui-util.c:637
 #, fuzzy
 msgid "Copy contact to"
 msgstr "Kopiatu txartela hemen:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:639
+#: addressbook/gui/widgets/eab-gui-util.c:640
 #, fuzzy
 msgid "Move contacts to"
 msgstr "Eraman txartelak hona:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:641
+#: addressbook/gui/widgets/eab-gui-util.c:642
 #, fuzzy
 msgid "Copy contacts to"
 msgstr "Kopiatu txartelak hemen:"
 
-#: addressbook/gui/widgets/eab-gui-util.c:644
+#: addressbook/gui/widgets/eab-gui-util.c:645
 #, fuzzy
 msgid "Select target addressbook."
 msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: addressbook/gui/widgets/eab-gui-util.c:867
+#: addressbook/gui/widgets/eab-gui-util.c:868
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/eab-gui-util.c:870
+#: addressbook/gui/widgets/eab-gui-util.c:871
 #, c-format
 msgid "VCard for %s"
 msgstr "%s - VCard-a"
@@ -2717,48 +3270,38 @@ msgstr "%s - VCard-a"
 #. * addresses (and *only* the e-mail addresses) associated with an existing
 #. * contact.
 #.
-#: addressbook/gui/widgets/eab-popup-control.c:199
+#: addressbook/gui/widgets/eab-popup-control.c:198
 msgid "(none)"
 msgstr "(bat ere ez)"
 
-#: addressbook/gui/widgets/eab-popup-control.c:432
+#: addressbook/gui/widgets/eab-popup-control.c:431
 msgid "Primary Email"
 msgstr "Helb. el. nagusia"
 
-#: addressbook/gui/widgets/eab-popup-control.c:442
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-msgid "Email 2"
-msgstr "2. helb. el."
-
-#: addressbook/gui/widgets/eab-popup-control.c:452
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-msgid "Email 3"
-msgstr "3. helb. el."
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
+#: addressbook/gui/widgets/eab-popup-control.c:567
 msgid "Select an Action"
 msgstr "Hautatu ekintza bat"
 
-#: addressbook/gui/widgets/eab-popup-control.c:576
+#: addressbook/gui/widgets/eab-popup-control.c:575
 #, c-format
 msgid "Create a new contact \"%s\""
 msgstr "Sortu \"%s\" kontaktu berria"
 
-#: addressbook/gui/widgets/eab-popup-control.c:592
+#: addressbook/gui/widgets/eab-popup-control.c:591
 #, c-format
 msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen \"%s\" kontaktuari"
 
-#: addressbook/gui/widgets/eab-popup-control.c:870
+#: addressbook/gui/widgets/eab-popup-control.c:869
 #, fuzzy
 msgid "Querying Address Book..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: addressbook/gui/widgets/eab-popup-control.c:953
+#: addressbook/gui/widgets/eab-popup-control.c:952
 msgid "Edit Contact Info"
 msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/widgets/eab-popup-control.c:1008
+#: addressbook/gui/widgets/eab-popup-control.c:1007
 msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
@@ -2784,377 +3327,6 @@ msgstr "Gorde kontaktua VCard gisa"
 msgid "Save in addressbook"
 msgstr "Gorde helbide-liburuan"
 
-#: addressbook/gui/widgets/e-addressbook-model.c:148
-#, fuzzy
-msgid "No contacts"
-msgstr "Erakutsi kontaktuak"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:151
-#, fuzzy, c-format
-msgid "%d contact"
-msgid_plural "%d contacts"
-msgstr[0] "Bilatu kontaktua hemen:"
-msgstr[1] "Bilatu kontaktua hemen:"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:302
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:385
-#: addressbook/gui/widgets/e-addressbook-view.c:231
-#: addressbook/gui/widgets/e-minicard-view.c:467
-#: addressbook/gui/widgets/e-minicard-view-widget.c:112
-msgid "Query"
-msgstr "Kontsulta"
-
-#: addressbook/gui/widgets/e-addressbook-model.c:445
-msgid "Error getting book view"
-msgstr "Errorea liburu-ikuspegia lortzean"
-
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:399
-msgid "Model"
-msgstr "Modeloa"
-
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:103
-msgid "Error modifying card"
-msgstr "Errorea txartela aldatzean"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:163
-msgid "Name begins with"
-msgstr "Izena honela hasten da:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:164
-msgid "Email begins with"
-msgstr "Helb. el. honela hasten da:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:165
-#: calendar/gui/cal-search-bar.c:54
-msgid "Category is"
-msgstr "Kategoria da:"
-
-#. We attach subitems below
-#: addressbook/gui/widgets/e-addressbook-view.c:166
-#: calendar/gui/cal-search-bar.c:49
-msgid "Any field contains"
-msgstr "Edozein eremuk hau dauka:"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:167
-#: addressbook/gui/widgets/e-addressbook-view.c:172
-msgid "Advanced..."
-msgstr "Aurreratua..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:238
-#: calendar/gui/dialogs/meeting-page.etspec.h:11
-#: calendar/gui/e-calendar-table.etspec.h:12
-#: calendar/gui/e-meeting-list-view.c:227
-#: calendar/gui/e-meeting-time-sel.etspec.h:11
-msgid "Type"
-msgstr "Mota"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:508
-#, fuzzy
-msgid "Address Book"
-msgstr "Helbide-liburua"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:852
-#: addressbook/gui/widgets/e-addressbook-view.c:1072
-#: addressbook/gui/widgets/e-addressbook-view.c:2080
-#: ui/evolution-addressbook.xml.h:19
-#, fuzzy
-msgid "Save as VCard..."
-msgstr "Gorde VCard gisa"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1059
-msgid "New Contact..."
-msgstr "Kontaktu berria..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1060
-msgid "New Contact List..."
-msgstr "Kontaktuen zerrenda berria..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1063
-msgid "Go to Folder..."
-msgstr "Joan karpeta honetara..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1064
-msgid "Import..."
-msgstr "Inportatu..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1066
-msgid "Search for Contacts..."
-msgstr "Bilatu kontaktuak..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1067
-#, fuzzy
-msgid "Address Book Sources..."
-msgstr "Helbide-liburuaren iturburuak..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1069
-msgid "Pilot Settings..."
-msgstr "Pilot-aren ezarpenak..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1073
-#: ui/evolution-addressbook.xml.h:10
-msgid "Forward Contact"
-msgstr "Birbidali kontaktua"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1074
-msgid "Send Message to Contact"
-msgstr "Bidali mezua kontaktuari"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1075 calendar/gui/print.c:2480
-#: ui/evolution-addressbook.xml.h:16 ui/evolution-calendar.xml.h:19
-#: ui/evolution-comp-editor.xml.h:8 ui/evolution-contact-editor.xml.h:5
-#: ui/evolution-mail-message.xml.h:80 ui/evolution-tasks.xml.h:14
-msgid "Print"
-msgstr "Inprimatu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1077
-msgid "Print Envelope"
-msgstr "Inprimatu gutun-azala"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1081
-#, fuzzy
-msgid "Copy to Address Book..."
-msgstr "Helbide-liburua..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1082
-#, fuzzy
-msgid "Move to Address Book..."
-msgstr "Helbide-liburua..."
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1085
-#: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
-msgid "Cut"
-msgstr "Ebaki"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:373
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
-#: ui/evolution-tasks.xml.h:2
-msgid "Copy"
-msgstr "Kopiatu"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1087
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:11
-msgid "Paste"
-msgstr "Itsatsi"
-
-#: addressbook/gui/widgets/e-addressbook-view.c:1092
-#: calendar/gui/e-calendar-view.c:1280
-msgid "Current View"
-msgstr "Uneko ikuspegia"
-
-#. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1665
-#: calendar/gui/cal-search-bar.c:358
-msgid "Any Category"
-msgstr "Edozein kategoria"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:1
-msgid "Assistant"
-msgstr "Laguntzailea"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant Phone"
-msgstr "Laguntzailearen telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:3
-msgid "Business Fax"
-msgstr "Laneko faxa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:4
-msgid "Business Phone"
-msgstr "Laneko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Business Phone 2"
-msgstr "Laneko 2. telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-msgid "Callback Phone"
-msgstr "Atzera deitzeko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:7
-msgid "Car Phone"
-msgstr "Autoko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:8
-msgid "Categories"
-msgstr "Kategoriak"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:9
-msgid "Company Phone"
-msgstr "Enpresako telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
-msgid "Family Name"
-msgstr "Deitura"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:14
-msgid "File As"
-msgstr "Gorde honela"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:16
-#, fuzzy
-msgid "Given Name"
-msgstr "Eremu-izena"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Home Fax"
-msgstr "Etxeko faxa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:18
-msgid "Home Phone"
-msgstr "Etxeko telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:19
-msgid "Home Phone 2"
-msgstr "Etxeko 2. telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#, fuzzy
-msgid "ISDN Phone"
-msgstr "Telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:21
-#, fuzzy
-msgid "Journal"
-msgstr "Jordania"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:22
-msgid "Manager"
-msgstr "Zuzendaria"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
-msgid "Nickname"
-msgstr "Goitizena"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Office"
-msgstr "Bulegoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Other Fax"
-msgstr "Beste fax bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:29
-msgid "Other Phone"
-msgstr "Beste telefono bat"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:30
-msgid "Pager"
-msgstr "Bilagailua"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:31
-msgid "Primary Phone"
-msgstr "Telefono nagusia"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:32
-msgid "Radio"
-msgstr "Irrati-telefonoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:33
-#: calendar/gui/dialogs/meeting-page.etspec.h:9
-#: calendar/gui/e-meeting-list-view.c:234
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funtzioa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Spouse"
-msgstr "Ezkontidea"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:35
-#, fuzzy
-msgid "TTYTDD"
-msgstr "Teletipoa"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Telex"
-msgstr "Telex-a"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:37
-msgid "Title"
-msgstr "Titulua"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#, fuzzy
-msgid "Unit"
-msgstr "Unst"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Web Site"
-msgstr "Web gunea"
-
-#: addressbook/gui/widgets/e-minicard.c:137
-#: addressbook/gui/widgets/e-minicard-label.c:115
-msgid "Width"
-msgstr "Zabalera"
-
-#: addressbook/gui/widgets/e-minicard.c:144
-#: addressbook/gui/widgets/e-minicard-label.c:122
-msgid "Height"
-msgstr "Altuera"
-
-#: addressbook/gui/widgets/e-minicard.c:152
-#: addressbook/gui/widgets/e-minicard-label.c:129
-msgid "Has Focus"
-msgstr "Fokua du"
-
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Hautatuta"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Kurtsorea du"
-
-#: addressbook/gui/widgets/e-minicard-label.c:136
-msgid "Field"
-msgstr "Eremua"
-
-#: addressbook/gui/widgets/e-minicard-label.c:143
-msgid "Field Name"
-msgstr "Eremu-izena"
-
-#: addressbook/gui/widgets/e-minicard-label.c:150
-msgid "Text Model"
-msgstr "Testu-eredua"
-
-#: addressbook/gui/widgets/e-minicard-label.c:157
-msgid "Max field name length"
-msgstr "Eremu-izenaren geh. luzera"
-
-#: addressbook/gui/widgets/e-minicard-view.c:142
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view.\n"
-"\n"
-"Double-click here to create a new Contact."
-msgstr ""
-"\n"
-"\n"
-"Ez dago ikuspegi honetan erakusteko elementurik.\n"
-"\n"
-"Egin klik bikoitza hemen kontaktu berria sortzeko."
-
-#: addressbook/gui/widgets/e-minicard-view.c:145
-msgid ""
-"\n"
-"\n"
-"There are no items to show in this view."
-msgstr ""
-"\n"
-"\n"
-"Ez dago ikuspegi honetan erakusteko elementurik."
-
-#: addressbook/gui/widgets/e-minicard-view.c:453
-msgid "Adapter"
-msgstr "Moldagailua"
-
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Zutabe-zabalera"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Txartelen ikuspegia"
@@ -3197,6 +3369,11 @@ msgstr "Evolution-en Vcard inportatzailea"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Inprimatu gutun-azala"
+
 #: addressbook/printing/e-contact-print.c:1000
 #, fuzzy
 msgid "Print contacts"
@@ -3208,11 +3385,6 @@ msgstr "Inprimatu hautatutako kontaktuak"
 msgid "Print contact"
 msgstr "Inprimatu hautatutako kontaktuak"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Inprimatu gutun-azala"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3399,6 +3571,23 @@ msgstr "K_ontaktuen zerrenda"
 msgid "This should test the contact print code"
 msgstr ""
 
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
+#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
+#, fuzzy
+msgid "Can not open file"
+msgstr "Ezin da mezua ireki"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
+#, fuzzy
+msgid "Couldn't get list of addressbooks"
+msgstr "Ezin izan da helbide-liburua kargatu"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
+#, fuzzy
+msgid "failed to open book"
+msgstr "Ezin da helbide-liburua ireki"
+
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3456,23 +3645,6 @@ msgstr ""
 msgid "Impossible internal error."
 msgstr "Barne-errorea"
 
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:657
-#: addressbook/tools/evolution-addressbook-export-list-cards.c:693
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:49
-#, fuzzy
-msgid "Can not open file"
-msgstr "Ezin da mezua ireki"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:43
-#, fuzzy
-msgid "Couldn't get list of addressbooks"
-msgstr "Ezin izan da helbide-liburua kargatu"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:71
-#, fuzzy
-msgid "failed to open book"
-msgstr "Ezin da helbide-liburua ireki"
-
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Errorea helbide-liburu lehenetsia kargatzean."
@@ -3489,40 +3661,367 @@ msgstr "Ez da fitxategi-izenik eman."
 msgid "Unnamed List"
 msgstr "Zerrenda izengabea"
 
+#. calendar:prompt-cancel-meeting primary
+#: calendar/calendar-errors.xml.h:2 calendar/calendar-errors.xml.h:12
+msgid "Would you like to send all the participants a cancellation notice?"
+msgstr ""
+
+#. calendar:prompt-cancel-meeting secondary
+#: calendar/calendar-errors.xml.h:4
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the meeting is canceled."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:5 calendar/calendar-errors.xml.h:15
+#: calendar/calendar-errors.xml.h:25 calendar/calendar-errors.xml.h:79
+#: calendar/calendar-errors.xml.h:85 calendar/calendar-errors.xml.h:91
+#: calendar/calendar-errors.xml.h:97
+#, fuzzy
+msgid "Don't Send"
+msgstr "Ez ezabatu"
+
+#: calendar/calendar-errors.xml.h:6 calendar/calendar-errors.xml.h:16
+#: calendar/calendar-errors.xml.h:26
+#, fuzzy
+msgid "Send Notice"
+msgstr "Bidali honi:"
+
+#. calendar:prompt-delete-meeting primary
+#: calendar/calendar-errors.xml.h:8
+#, fuzzy
+msgid "Are you sure you want to delete this meeting?"
+msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-meeting secondary
+#: calendar/calendar-errors.xml.h:10
+msgid ""
+"All information on this meeting will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-task secondary
+#: calendar/calendar-errors.xml.h:14
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the task has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-task primary
+#: calendar/calendar-errors.xml.h:18 calendar/calendar-errors.xml.h:44
+#, fuzzy
+msgid "Are you sure you want to delete this task?"
+msgstr "Ziur zaude %d zeregin ezabatu nahi dituzula?"
+
+#. calendar:prompt-delete-task secondary
+#: calendar/calendar-errors.xml.h:20 calendar/calendar-errors.xml.h:42
+#: calendar/calendar-errors.xml.h:46
+msgid "All information on this task will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-cancel-journal primary
+#: calendar/calendar-errors.xml.h:22
+#, fuzzy
+msgid "Would you like to send a cancellation notice for this journal entry?"
+msgstr ""
+"Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi duzula?"
+
+#. calendar:prompt-cancel-journal secondary
+#: calendar/calendar-errors.xml.h:24
+msgid ""
+"If you don't send a cancellation notice, the other participants may not know "
+"the journal has been deleted."
+msgstr ""
+
+#. calendar:prompt-delete-journal primary
+#: calendar/calendar-errors.xml.h:28 calendar/calendar-errors.xml.h:52
+#, fuzzy
+msgid "Are you sure you want to delete this journal entry?"
+msgstr "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
+
+#. calendar:prompt-delete-journal secondary
+#: calendar/calendar-errors.xml.h:30
+msgid ""
+"All information on this journal entry will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-titled-appointment primary
+#: calendar/calendar-errors.xml.h:32
+#, fuzzy
+msgid "Are you sure you want to delete the appointment titled '{0}'?"
+msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-titled-appointment secondary
+#: calendar/calendar-errors.xml.h:34 calendar/calendar-errors.xml.h:38
+msgid ""
+"All information on this appointment will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointment primary
+#: calendar/calendar-errors.xml.h:36
+#, fuzzy
+msgid "Are you sure you want to delete this appointment?"
+msgstr "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
+
+#. calendar:prompt-delete-named-task primary
+#: calendar/calendar-errors.xml.h:40
+#, fuzzy
+msgid "Are you sure you want to delete the '{0}' task?"
+msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-named-journal primary
+#: calendar/calendar-errors.xml.h:48
+#, fuzzy
+msgid "Are you sure you want to delete the journal entry '{0}'?"
+msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-named-journal secondary
+#: calendar/calendar-errors.xml.h:50 calendar/calendar-errors.xml.h:54
+msgid ""
+"All information in this journal will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-appointments primary
+#: calendar/calendar-errors.xml.h:56
+#, fuzzy
+msgid "Are you sure you want to delete these {0} appointments?"
+msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-appointments secondary
+#: calendar/calendar-errors.xml.h:58
+msgid ""
+"All information on these appointments will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-delete-tasks primary
+#: calendar/calendar-errors.xml.h:60
+#, fuzzy
+msgid "Are you sure you want to delete these {0} tasks?"
+msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-tasks secondary
+#: calendar/calendar-errors.xml.h:62
+msgid "All information on these tasks will be deleted and can not be restored."
+msgstr ""
+
+#. calendar:prompt-delete-journals primary
+#: calendar/calendar-errors.xml.h:64
+#, fuzzy
+msgid "Are you sure you want to delete these {0} journal entries?"
+msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
+
+#. calendar:prompt-delete-journals secondary
+#: calendar/calendar-errors.xml.h:66
+msgid ""
+"All information in these journal entries will be deleted and can not be "
+"restored."
+msgstr ""
+
+#. calendar:prompt-save-appointment title
+#: calendar/calendar-errors.xml.h:68
+#, fuzzy
+msgid "Save Appointment"
+msgstr "Hitzordua"
+
+#. calendar:prompt-save-appointment primary
+#: calendar/calendar-errors.xml.h:70
+#, fuzzy
+msgid "Would you like to save your changes to this appointment?"
+msgstr "Aldaketak gorde nahi dituzu?"
+
+#. calendar:prompt-save-appointment secondary
+#: calendar/calendar-errors.xml.h:72
+#, fuzzy
+msgid "You have made changes to this appointment, but not yet saved them."
+msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
+
+#: calendar/calendar-errors.xml.h:73 composer/mail-composer-errors.xml.h:33
+#, fuzzy
+msgid "Discard Changes"
+msgstr "_Ez gorde"
+
+#: calendar/calendar-errors.xml.h:74
+#, fuzzy
+msgid "Save Changes"
+msgstr "Lake Charles"
+
+#. calendar:prompt-meeting-invite primary
+#: calendar/calendar-errors.xml.h:76
+msgid "Would you like to send meeting invitations to participants?"
+msgstr ""
+
+#. calendar:prompt-meeting-invite secondary
+#: calendar/calendar-errors.xml.h:78
+msgid ""
+"Email invitations will be sent to all participants and allow them to RSVP."
+msgstr ""
+
+#: calendar/calendar-errors.xml.h:80 calendar/calendar-errors.xml.h:86
+#: calendar/calendar-errors.xml.h:92 calendar/calendar-errors.xml.h:98
+#: ui/evolution-message-composer.xml.h:24
+msgid "Send"
+msgstr "Bidali"
+
+#. calendar:prompt-send-updated-meeting-info primary
+#: calendar/calendar-errors.xml.h:82
+msgid "Would you like to send updated meeting information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-meeting-info secondary
+#: calendar/calendar-errors.xml.h:84
+msgid ""
+"Sending updated information allows other participants to keep their "
+"calendars up to date."
+msgstr ""
+
+#. calendar:prompt-send-task primary
+#: calendar/calendar-errors.xml.h:88
+msgid "Would you like to send this task to participants?"
+msgstr ""
+
+#. calendar:prompt-send-task secondary
+#: calendar/calendar-errors.xml.h:90
+msgid ""
+"Email invitations will be sent to all participants and allow them to accept "
+"this task."
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info primary
+#: calendar/calendar-errors.xml.h:94
+msgid "Would you like to send updated task information to participants?"
+msgstr ""
+
+#. calendar:prompt-send-updated-task-info secondary
+#: calendar/calendar-errors.xml.h:96
+msgid ""
+"Sending updated information allows other participants to keep their task "
+"lists up to date."
+msgstr ""
+
+#. calendar:tasks-crashed primary
+#: calendar/calendar-errors.xml.h:100
+msgid "The Evolution tasks have quit unexpectedly."
+msgstr ""
+
+#. calendar:tasks-crashed secondary
+#: calendar/calendar-errors.xml.h:102
+msgid "Your tasks will not be available until Evolution is restarted."
+msgstr ""
+
+#. calendar:calendar-crashed primary
+#: calendar/calendar-errors.xml.h:104
+#, fuzzy
+msgid "The Evolution calendar has quit unexpectedly."
+msgstr "Evolution-en egutegiaren fitxategi lokalaren modulua"
+
+#. calendar:calendar-crashed secondary
+#: calendar/calendar-errors.xml.h:106
+msgid "Your calendars will not be available until Evolution is restarted."
+msgstr ""
+
 #: calendar/common/authentication.c:44 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
 
-#: calendar/conduits/calendar/calendar-conduit.c:206
+#: calendar/conduits/calendar/calendar-conduit.c:223
 msgid "Split Multi-Day Events:"
 msgstr "Zatitu egun anitzeko gertaerak:"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1313
-#: calendar/conduits/todo/todo-conduit.c:849
-msgid "Could not start wombat server"
+#: calendar/conduits/calendar/calendar-conduit.c:1330
+#: calendar/conduits/calendar/calendar-conduit.c:1331
+#: calendar/conduits/todo/todo-conduit.c:852
+#: calendar/conduits/todo/todo-conduit.c:853
+#, fuzzy
+msgid "Could not start evolution-data-server"
 msgstr "Ezin izan da wombat zerbitzaria abiarazi"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1314
-#: calendar/conduits/todo/todo-conduit.c:850
-msgid "Could not start wombat"
-msgstr "Ezin izan da wombat abiarazi"
-
-#: calendar/conduits/calendar/calendar-conduit.c:1422
-#: calendar/conduits/calendar/calendar-conduit.c:1425
+#: calendar/conduits/calendar/calendar-conduit.c:1439
+#: calendar/conduits/calendar/calendar-conduit.c:1442
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren egutegiaren aplikazio-blokea irakurri"
 
-#: calendar/conduits/todo/todo-conduit.c:206
+#: calendar/conduits/todo/todo-conduit.c:209
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: calendar/conduits/todo/todo-conduit.c:929
 #: calendar/conduits/todo/todo-conduit.c:932
+#: calendar/conduits/todo/todo-conduit.c:935
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokea irakurri"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Egutegia eta zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/calendar-component.c:1060
+#, fuzzy
+msgid "Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfiguratu hemen zure ordu-zona, egutegia eta zereginen zerrenda "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution-en egutegia eta zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-en egutegia konfiguratzeko kontrola"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiko antolaketako mezuen ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en egutegiaren/zereginen editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution-en egutegiaren eta zereginen osagaia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution-en probaren osagaia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
+#: calendar/gui/e-tasks.c:1088 calendar/gui/print.c:1819
+#: calendar/gui/tasks-component.c:412 calendar/gui/tasks-component.c:874
+#: calendar/gui/tasks-control.c:405 calendar/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zereginak"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
+
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Hasi:"
@@ -3618,10 +4117,6 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
-
 #: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
@@ -3770,9 +4265,30 @@ msgstr ""
 msgid "Whether to show week numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Laburpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Iruzkinak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:53
+#, fuzzy
+msgid "Location contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
+msgid "Unmatched"
+msgstr "Sailkatu gabeak"
+
 #: calendar/gui/calendar-commands.c:117 calendar/gui/calendar-component.c:552
-#: calendar/gui/dialogs/select-source-dialog.c:92
-#: calendar/gui/gnome-cal.c:1705
+#: calendar/gui/dialogs/select-source-dialog.c:108
+#: calendar/gui/gnome-cal.c:1827
 #: camel/providers/groupwise/camel-gw-listener.c:311
 #: camel/providers/groupwise/camel-gw-listener.c:334
 msgid "Calendar"
@@ -3796,8 +4312,8 @@ msgid "Purge events older than"
 msgstr "hau baino txikiagoa ematen du"
 
 #: calendar/gui/calendar-commands.c:363
-#: calendar/gui/dialogs/alarm-options.glade.h:10
-#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:12 filter/filter.glade.h:13
 msgid "days"
 msgstr "egun"
 
@@ -3808,7 +4324,7 @@ 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.
 #: calendar/gui/calendar-commands.c:435 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1588 calendar/gui/e-day-view-top-item.c:694
+#: calendar/gui/e-day-view-top-item.c:694 calendar/gui/e-day-view.c:1588
 #: calendar/gui/e-week-view-main-item.c:329
 msgid "%a %d %b"
 msgstr "%a, %b %d"
@@ -3858,66 +4374,54 @@ msgstr ""
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:963
-msgid ""
-"Selected calendar is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Calendars"
-msgstr "Egutegia"
-
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1224
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1225
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:1236
+#: calendar/gui/calendar-component.c:1226
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1232
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1233
 msgid "M_eeting"
 msgstr "_Bilera"
 
-#: calendar/gui/calendar-component.c:1244
+#: calendar/gui/calendar-component.c:1234
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1240
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1241
 msgid "All _Day Appointment"
 msgstr "Egun _osoko hitzordua"
 
-#: calendar/gui/calendar-component.c:1252
+#: calendar/gui/calendar-component.c:1242
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1258
+#: calendar/gui/calendar-component.c:1248
 #, fuzzy
 msgid "New calendar"
 msgstr "Kaledonia Berria"
 
-#: calendar/gui/calendar-component.c:1259
+#: calendar/gui/calendar-component.c:1249
 #, fuzzy
-msgid "C_alendar"
-msgstr "E_gutegia:"
+msgid "Cale_ndar"
+msgstr "Egutegia"
 
-#: calendar/gui/calendar-component.c:1260
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Sortu karpeta berria"
@@ -3948,27 +4452,6 @@ msgstr "Asteko ikuspegia"
 msgid "Month View"
 msgstr "Hileko ikuspegia"
 
-#: calendar/gui/cal-search-bar.c:50
-msgid "Summary contains"
-msgstr "Laburpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Description contains"
-msgstr "Azalpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Comment contains"
-msgstr "Iruzkinak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:53
-#, fuzzy
-msgid "Location contains"
-msgstr "Azalpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:362 camel/camel-vee-store.c:327
-msgid "Unmatched"
-msgstr "Sailkatu gabeak"
-
 #: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegia irekitzean"
@@ -3986,223 +4469,132 @@ msgstr "Egutegia irekitzeko baimena ukatu egin da"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-options.c:467
-msgid "Audio Alarm Options"
-msgstr "Audio alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:476
-msgid "Message Alarm Options"
-msgstr "Mezu-alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:485
-msgid "Email Alarm Options"
-msgstr "Posta elektronikoaren alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:494
-msgid "Program Alarm Options"
-msgstr "Programa-alarmaren aukerak"
-
-#: calendar/gui/dialogs/alarm-options.c:510
-msgid "Unknown Alarm Options"
-msgstr "Alarma ezezagunen aukerak"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:2
-msgid "Alarm Repeat"
-msgstr "Alarma-errepikapena"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:3
-msgid "Message to Display:"
-msgstr "Bistaratuko den mezua:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:4
-msgid "Message to Send"
-msgstr "Bidali beharreko mezua"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:5
-msgid "Play sound:"
-msgstr "Jo soinua:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:6
-msgid "Repeat the alarm"
-msgstr "Errepikatu alarma"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:7
-msgid "Run program:"
-msgstr "Ireki programa:"
-
-#: calendar/gui/dialogs/alarm-options.glade.h:8
-msgid "Send To:"
-msgstr "Bidali honi:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:2
+#, fuzzy
+msgid "<b>Alarm</b>\t"
+msgstr "<b>Falta:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:9
-msgid "With these arguments:"
-msgstr "Argumentu hauekin:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:3
+#, fuzzy
+msgid "<b>Options</b>"
+msgstr "Ordu-zonak"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:11 smime/gui/smime-ui.glade.h:48
-msgid "dialog1"
-msgstr "1 elkarrizketa-koadroa"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:4
+#, fuzzy
+msgid "<b>Repeat</b>"
+msgstr "<b>Falta:</b> "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:12
-msgid "extra times every"
-msgstr "bider, maiztasun honekin:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:5
+#, fuzzy
+msgid "Add Alarm"
+msgstr "Alarmak"
 
-#: calendar/gui/dialogs/alarm-options.glade.h:13
-#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:16
-msgid "hours"
-msgstr "ordu"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:6
+#, fuzzy
+msgid "Custom _message"
+msgstr "Prestatu mezua"
 
-#: calendar/gui/dialogs/alarm-page.c:802
-msgid "Action/Trigger"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:7
+msgid "Custom alarm sound"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:1
-#: calendar/gui/dialogs/recurrence-page.glade.h:1
-msgid "A_dd"
-msgstr "_Gehitu"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:2
-#: calendar/gui/dialogs/recurrence-page.glade.h:2
-msgid "Basics"
-msgstr "Oinarriak"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:3
-#: calendar/gui/dialogs/recurrence-page.glade.h:3
-msgid "Date/Time:"
-msgstr "Data/Ordua:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:8
+#, fuzzy
+msgid "Mes_sage:"
+msgstr "Mezuak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:444
+#: calendar/gui/dialogs/alarm-dialog.glade.h:9 calendar/gui/e-alarm-list.c:444
 msgid "Play a sound"
 msgstr "Jo soinua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+#: calendar/gui/dialogs/alarm-dialog.glade.h:10
+#: calendar/gui/e-alarm-list.c:448
 msgid "Pop up an alert"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6
-msgid "Reminders"
-msgstr "Oroigarriak"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:7 calendar/gui/e-alarm-list.c:456
+#: calendar/gui/dialogs/alarm-dialog.glade.h:11
+#: calendar/gui/e-alarm-list.c:456
 msgid "Run a program"
 msgstr "Exekutatu programa"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:8 calendar/gui/e-alarm-list.c:452
+#: calendar/gui/dialogs/alarm-dialog.glade.h:12
+msgid "Send To:"
+msgstr "Bidali honi:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:13
+#: calendar/gui/e-alarm-list.c:452
 msgid "Send an email"
 msgstr "Bidali mezua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:9
-#: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:187
-#: calendar/gui/e-itip-control.c:920 calendar/gui/e-itip-control.glade.h:11
-msgid "Summary:"
-msgstr "Laburpena:"
+#: calendar/gui/dialogs/alarm-dialog.glade.h:14
+#, fuzzy
+msgid "_Arguments:"
+msgstr "K_ontua:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:10
-msgid "_Options..."
-msgstr "_Aukerak..."
+#: calendar/gui/dialogs/alarm-dialog.glade.h:15
+#, fuzzy
+msgid "_Program:"
+msgstr "Ireki programa:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:11
+#: calendar/gui/dialogs/alarm-dialog.glade.h:16
+#, fuzzy
+msgid "_Repeat the alarm"
+msgstr "Errepikatu alarma"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:17
+#, fuzzy
+msgid "_Sound:"
+msgstr "Southend"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:18
 msgid "after"
 msgstr "geroago"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:12
+#: calendar/gui/dialogs/alarm-dialog.glade.h:19
 msgid "before"
 msgstr "lehenago"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:13
-#: calendar/gui/dialogs/recurrence-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:7
 msgid "day(s)"
 msgstr "egun"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:14
+#: calendar/gui/dialogs/alarm-dialog.glade.h:22
 msgid "end of appointment"
 msgstr "hitzordu-amaiera baino"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:15
+#: calendar/gui/dialogs/alarm-dialog.glade.h:23
+msgid "extra times every"
+msgstr "bider, maiztasun honekin:"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:24
 msgid "hour(s)"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:16
+#: calendar/gui/dialogs/alarm-dialog.glade.h:25
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 filter/filter.glade.h:14
+msgid "hours"
+msgstr "ordu"
+
+#: calendar/gui/dialogs/alarm-dialog.glade.h:26
 msgid "minute(s)"
 msgstr "minutu"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:17
+#: calendar/gui/dialogs/alarm-dialog.glade.h:28
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
-#: calendar/gui/dialogs/calendar-setup.c:172
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Fitxategi-izen bat zehaztu behar duzu."
-
-#: calendar/gui/dialogs/calendar-setup.c:180
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "`%s' kargatzeko behar den metodoa ez da onartzen"
-
-#: calendar/gui/dialogs/calendar-setup.c:195
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:275
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:288
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
+#: calendar/gui/dialogs/alarm-list-dialog.c:192
+msgid "Action/Trigger"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Kaledonia Berria"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Zereginen zerrenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Koloreak"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
-msgid "Pick a color"
-msgstr "Aukeratu kolorea"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:6
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Kaledonia Berria"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#, fuzzy
-msgid "_Add Group"
-msgstr "_Gehitu taldea..."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:9
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Freskatu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:10
-#, fuzzy
-msgid "_Type:"
-msgstr "Mota:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_URL:"
-msgstr "_URLa:"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:1
+msgid "A_dd"
+msgstr "_Gehitu"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "aste"
+#: calendar/gui/dialogs/alarm-list-dialog.glade.h:2
+msgid "Alarms"
+msgstr "Alarmak"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
@@ -4320,7 +4712,7 @@ msgid "Free/Busy Publishing"
 msgstr "Libre/okupatuta eskaera"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
-#: calendar/gui/dialogs/recurrence-page.c:1048
+#: calendar/gui/dialogs/recurrence-page.c:1038
 #: calendar/gui/e-itip-control.c:556
 msgid "Friday"
 msgstr "Ostirala"
@@ -4334,7 +4726,7 @@ msgid "Minutes"
 msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
-#: calendar/gui/dialogs/recurrence-page.c:1044
+#: calendar/gui/dialogs/recurrence-page.c:1034
 #: calendar/gui/e-itip-control.c:552
 msgid "Monday"
 msgstr "Astelehena"
@@ -4344,7 +4736,7 @@ msgid "S_un"
 msgstr "_ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/recurrence-page.c:1049
+#: calendar/gui/dialogs/recurrence-page.c:1039
 #: calendar/gui/e-itip-control.c:557
 msgid "Saturday"
 msgstr "Larunbata"
@@ -4358,7 +4750,7 @@ msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
-#: calendar/gui/dialogs/recurrence-page.c:1050
+#: calendar/gui/dialogs/recurrence-page.c:1040
 #: calendar/gui/e-itip-control.c:551
 msgid "Sunday"
 msgstr "Igandea"
@@ -4372,7 +4764,7 @@ msgid "T_hu"
 msgstr "o_g."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/recurrence-page.c:1047
+#: calendar/gui/dialogs/recurrence-page.c:1037
 #: calendar/gui/e-itip-control.c:555
 msgid "Thursday"
 msgstr "Osteguna"
@@ -4386,7 +4778,7 @@ msgid "Time format:"
 msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
-#: calendar/gui/dialogs/recurrence-page.c:1045
+#: calendar/gui/dialogs/recurrence-page.c:1035
 #: calendar/gui/e-itip-control.c:553
 msgid "Tuesday"
 msgstr "Asteartea"
@@ -4396,7 +4788,7 @@ msgid "W_eek starts:"
 msgstr "Astearen _hasiera:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-#: calendar/gui/dialogs/recurrence-page.c:1046
+#: calendar/gui/dialogs/recurrence-page.c:1036
 #: calendar/gui/e-itip-control.c:554
 msgid "Wednesday"
 msgstr "Asteazkena"
@@ -4430,7 +4822,8 @@ msgstr "_Konprimatu asteburuak hileko ikuspegian"
 msgid "_Day begins:"
 msgstr "_Egunaren hasiera:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44 filter/filter.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
+#: calendar/gui/dialogs/recurrence-page.glade.h:6 filter/filter.glade.h:10
 #: mail/mail-config.glade.h:162 ui/evolution-addressbook.xml.h:34
 #: ui/evolution-calendar.xml.h:41 ui/evolution-composer-entries.xml.h:8
 #: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
@@ -4480,6 +4873,80 @@ msgstr "a_z."
 msgid "before every appointment"
 msgstr "lehenago"
 
+#: calendar/gui/dialogs/calendar-setup.c:172
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Fitxategi-izen bat zehaztu behar duzu."
+
+#: calendar/gui/dialogs/calendar-setup.c:180
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "`%s' kargatzeko behar den metodoa ez da onartzen"
+
+#: calendar/gui/dialogs/calendar-setup.c:195
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:275
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:288
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Kaledonia Berria"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Zereginen zerrenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+msgid "C_olor:"
+msgstr "_Koloreak"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:5 mail/mail-config.glade.h:110
+msgid "Pick a color"
+msgstr "Aukeratu kolorea"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Kaledonia Berria"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7
+#, fuzzy
+msgid "_Add Group"
+msgstr "_Gehitu taldea..."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:9
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Freskatu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:10
+#, fuzzy
+msgid "_Type:"
+msgstr "Mota:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_URL:"
+msgstr "_URLa:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15 filter/filter.glade.h:20
+msgid "weeks"
+msgstr "aste"
+
 #: calendar/gui/dialogs/changed-comp.c:60
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
@@ -4524,81 +4991,75 @@ msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: calendar/gui/dialogs/comp-editor.c:430
+#: calendar/gui/dialogs/comp-editor-page.c:464
+#, c-format
+msgid "Validation error: %s"
+msgstr "Balidazio-errorea: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Falta: "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Falta: "
+
+#: calendar/gui/dialogs/comp-editor.c:264
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: calendar/gui/dialogs/comp-editor.c:903
-#: calendar/gui/dialogs/comp-editor.c:940
+#: calendar/gui/dialogs/comp-editor.c:878
+#: calendar/gui/dialogs/comp-editor.c:915
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:908
-#: calendar/gui/dialogs/comp-editor.c:945
+#: calendar/gui/dialogs/comp-editor.c:883
+#: calendar/gui/dialogs/comp-editor.c:920
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:911
-#: calendar/gui/dialogs/comp-editor.c:948
+#: calendar/gui/dialogs/comp-editor.c:886
+#: calendar/gui/dialogs/comp-editor.c:923
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:914
-#: calendar/gui/dialogs/comp-editor.c:951
+#: calendar/gui/dialogs/comp-editor.c:889
+#: calendar/gui/dialogs/comp-editor.c:926
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:925
-#: calendar/gui/dialogs/comp-editor.c:961
+#: calendar/gui/dialogs/comp-editor.c:900
+#: calendar/gui/dialogs/comp-editor.c:936
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1038
-#: composer/e-msg-composer.c:1193
-msgid "Save as..."
-msgstr "Gorde honela..."
-
-#: calendar/gui/dialogs/comp-editor.c:1479
-#: calendar/gui/dialogs/comp-editor.c:1514
-#: calendar/gui/dialogs/comp-editor.c:1540
+#: calendar/gui/dialogs/comp-editor.c:1302
+#: calendar/gui/dialogs/comp-editor.c:1337
+#: calendar/gui/dialogs/comp-editor.c:1363
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: calendar/gui/dialogs/comp-editor.c:1576
+#: calendar/gui/dialogs/comp-editor.c:1387
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Balidazio-errorea: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Falta: "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Falta: "
-
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4668,8 +5129,9 @@ msgid "The item could not be deleted due to an error"
 msgstr "Elementua ezin izan da ezabatu, corba errore bat gertatu delako"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:1
-msgid "Addressbook..."
-msgstr "Helbide-liburua..."
+#, fuzzy
+msgid "Contacts..."
+msgstr "Kontaktuak"
 
 #: calendar/gui/dialogs/e-delegate-dialog.glade.h:2
 msgid "Delegate To:"
@@ -4679,161 +5141,222 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:153 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:208
-msgid "Reminder"
-msgstr "Oroigarria"
-
-#: calendar/gui/dialogs/event-editor.c:215
+#: calendar/gui/dialogs/event-editor.c:162
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:222
-#: calendar/gui/dialogs/event-editor.c:295
-#: calendar/gui/dialogs/event-editor.c:439
+#: calendar/gui/dialogs/event-editor.c:169
+#: calendar/gui/dialogs/event-editor.c:239
+#: calendar/gui/dialogs/event-editor.c:381
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:229
-#: calendar/gui/dialogs/event-editor.c:298
-#: calendar/gui/dialogs/event-editor.c:442 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:176
+#, fuzzy
+msgid "Invitations"
+msgstr "Informazioa"
+
+#: calendar/gui/dialogs/event-editor.c:242
+#: calendar/gui/dialogs/event-editor.c:384 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.c:460
+#: calendar/gui/dialogs/event-page.c:692
 #, fuzzy
 msgid "Event with no start date"
 msgstr "Mugaeguna hasiera-eguna baino lehenagokoa da!"
 
-#: calendar/gui/dialogs/event-page.c:463
+#: calendar/gui/dialogs/event-page.c:695
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
+#: calendar/gui/dialogs/event-page.c:855 calendar/gui/dialogs/task-page.c:523
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:627
+#: calendar/gui/dialogs/event-page.c:865
 msgid "End date is wrong"
 msgstr "Amaierako data gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:650
+#: calendar/gui/dialogs/event-page.c:888
 msgid "Start time is wrong"
 msgstr "Hasierako ordua gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:657
+#: calendar/gui/dialogs/event-page.c:895
 msgid "End time is wrong"
 msgstr "Amaierako ordua gaizki dago"
 
-#: calendar/gui/dialogs/event-page.c:1264
+#: calendar/gui/dialogs/event-page.c:1605
 #, fuzzy, c-format
 msgid "Unable to open the calendar '%s'."
 msgstr "Egutegia irekitzeko baimena ukatu egin da"
 
+#: calendar/gui/dialogs/event-page.c:1799
+#, fuzzy, c-format
+msgid "%d day before appointment"
+msgid_plural "%d days before appointment"
+msgstr[0] "lehenago"
+msgstr[1] "lehenago"
+
+#: calendar/gui/dialogs/event-page.c:1807
+#, fuzzy, c-format
+msgid "%d hour before appointment"
+msgid_plural "%d hours before appointment"
+msgstr[0] "hitzordu-amaiera baino"
+msgstr[1] "hitzordu-amaiera baino"
+
+#: calendar/gui/dialogs/event-page.c:1815
+#, fuzzy, c-format
+msgid "%d minute before appointement"
+msgid_plural "%d minutes before appointment"
+msgstr[0] "lehenago"
+msgstr[1] "lehenago"
+
 #: calendar/gui/dialogs/event-page.glade.h:2
-msgid "A_ll day event"
-msgstr "E_gun osoko gertaera"
+#, fuzzy
+msgid "1 day before appointment"
+msgstr "lehenago"
 
 #: calendar/gui/dialogs/event-page.glade.h:3
-msgid "B_usy"
-msgstr "_Okupatuta"
+#, fuzzy
+msgid "1 hour before appointment"
+msgstr "lehenago"
 
 #: calendar/gui/dialogs/event-page.glade.h:4
-#: calendar/gui/dialogs/task-page.glade.h:2
-msgid "Ca_tegories..."
-msgstr "Ka_tegoriak..."
+#, fuzzy
+msgid "15 minutes before appointment"
+msgstr "lehenago"
+
+#: calendar/gui/dialogs/event-page.glade.h:5
+#, fuzzy
+msgid "<b>Basics</b>"
+msgstr "Zereginen zerrenda"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#: calendar/gui/dialogs/task-page.glade.h:3
-msgid "Classification"
-msgstr "Sailkapena"
+#, fuzzy
+msgid "<b>Date and Time</b>"
+msgstr "<b>Falta:</b> "
 
 #: calendar/gui/dialogs/event-page.glade.h:7
-msgid "Co_nfidential"
-msgstr "_Konfidentziala"
+msgid "A_ll day event"
+msgstr "E_gun osoko gertaera"
 
 #: calendar/gui/dialogs/event-page.glade.h:8
-#: calendar/gui/dialogs/task-page.glade.h:5
-msgid "Date & Time"
-msgstr "Data eta ordua"
+#, fuzzy
+msgid "C_ustomize..."
+msgstr "Gorde ikuspegi pertsonalizatua..."
 
 #: calendar/gui/dialogs/event-page.glade.h:9
-msgid "F_ree"
-msgstr "L_ibre"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Ca_tegories..."
+msgstr "Ka_tegoriak..."
 
 #: calendar/gui/dialogs/event-page.glade.h:10
-msgid "L_ocation:"
-msgstr "K_okalekua:"
+#, fuzzy
+msgid "Cale_ndar:"
+msgstr "E_gutegia:"
 
 #: calendar/gui/dialogs/event-page.glade.h:11
-#: calendar/gui/dialogs/task-page.glade.h:8
-msgid "Pri_vate"
-msgstr "Pri_batua"
+#: calendar/gui/dialogs/task-page.glade.h:5
+#, fuzzy
+msgid "Classi_fication:"
+msgstr "Sailkapena"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
-#: calendar/gui/dialogs/task-page.glade.h:9
-msgid "Pu_blic"
-msgstr "_Publikoa"
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-cal-list-view.c:259
+#: calendar/gui/e-cal-model.c:332 calendar/gui/e-calendar-table.c:354
+msgid "Confidential"
+msgstr "Konfidentziala"
 
 #: calendar/gui/dialogs/event-page.glade.h:13
-msgid "Show Time As"
-msgstr "Erakutsi ordua honela"
+msgid "L_ocation:"
+msgstr "K_okalekua:"
 
 #: calendar/gui/dialogs/event-page.glade.h:14
+#: calendar/gui/dialogs/task-page.glade.h:8 calendar/gui/e-cal-list-view.c:258
+#: calendar/gui/e-cal-model.c:330 calendar/gui/e-calendar-table.c:353
+msgid "Private"
+msgstr "Pribatua"
+
+#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/task-page.glade.h:9 calendar/gui/e-cal-list-view.c:257
+#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
+#: calendar/gui/e-calendar-table.c:352
+msgid "Public"
+msgstr "Publikoa"
+
+#: calendar/gui/dialogs/event-page.glade.h:16
+#, fuzzy
+msgid "Show time as _busy"
+msgstr "Erakutsi ordua honela"
+
+#: calendar/gui/dialogs/event-page.glade.h:17
 #: calendar/gui/dialogs/task-page.glade.h:11
 msgid "Su_mmary:"
 msgstr "Labu_rpena:"
 
-#: calendar/gui/dialogs/event-page.glade.h:15
+#: calendar/gui/dialogs/event-page.glade.h:18
+msgid "This appointment has customized alarms"
+msgstr ""
+
+#: calendar/gui/dialogs/event-page.glade.h:19
+#, fuzzy
+msgid "_Alarm"
+msgstr "Alarmak"
+
+#: calendar/gui/dialogs/event-page.glade.h:20
+#, fuzzy
+msgid "_Description:"
+msgstr "Azalpena:"
+
+#: calendar/gui/dialogs/event-page.glade.h:21
+#: calendar/gui/e-meeting-time-sel.c:613
 msgid "_End time:"
 msgstr "_Amaiera:"
 
-#: calendar/gui/dialogs/event-page.glade.h:16
+#: calendar/gui/dialogs/event-page.glade.h:22
+#: calendar/gui/e-meeting-time-sel.c:594
 msgid "_Start time:"
 msgstr "_Hasiera:"
 
 #. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: filter/filter-rule.c:877 mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1571
-#: mail/mail-account-gui.c:1967 mail/mail-config.glade.h:103
+#: calendar/gui/dialogs/meeting-page.c:313
+#: calendar/gui/dialogs/meeting-page.glade.h:6
+#: calendar/gui/e-cal-model-tasks.c:647 calendar/gui/e-itip-control.c:928
+#: composer/e-msg-composer.c:2112 filter/filter-rule.c:877
+#: mail/em-account-prefs.c:427 mail/em-folder-view.c:932
+#: mail/mail-account-gui.c:1571 mail/mail-account-gui.c:1967
+#: mail/mail-config.glade.h:103
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
 #: widgets/misc/e-dateedit.c:1480 widgets/misc/e-dateedit.c:1595
 msgid "None"
 msgstr "Bat ere ez"
 
-#: calendar/gui/dialogs/meeting-page.c:420
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "The organizer selected no longer has an account."
 msgstr "Hautatutako antolatzaileak ez du konturik orain."
 
-#: calendar/gui/dialogs/meeting-page.c:426
+#: calendar/gui/dialogs/meeting-page.c:449
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:441
+#: calendar/gui/dialogs/meeting-page.c:464
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:651
+#: calendar/gui/dialogs/meeting-page.c:753
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
-#. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:655
-#: calendar/gui/e-calendar-table.c:1042 calendar/gui/e-calendar-table.c:1060
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
-#: mail/em-folder-tree.c:2548 mail/em-folder-view.c:919
-#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
-msgid "_Delete"
-msgstr "E_zabatu"
+#: calendar/gui/dialogs/meeting-page.c:757
+#: composer/e-msg-composer-attachment-bar.c:453
+msgid "_Remove"
+msgstr "_Kendu"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:1
 #: calendar/gui/e-meeting-list-view.c:218
@@ -4872,36 +5395,45 @@ msgid "Member"
 msgstr "Kidea"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:8
-#: calendar/gui/e-itip-control.c:1047 calendar/gui/e-meeting-list-view.c:241
+#: calendar/gui/e-itip-control.c:1060 calendar/gui/e-meeting-list-view.c:241
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
 
 #: calendar/gui/dialogs/meeting-page.etspec.h:10
-#: calendar/gui/e-calendar-table.etspec.h:9
+#: calendar/gui/dialogs/task-editor.c:158
+#: calendar/gui/e-calendar-table.etspec.h:10
 #: calendar/gui/e-meeting-list-view.c:248
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/message-list.etspec.h:12
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 mail/em-filter-i18n.h:62
+#: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Egoera"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:2
 #, fuzzy
-msgid "Add A_ttendee"
-msgstr "Partaidea"
+msgid "<b>Attendees</b>"
+msgstr "<b>Falta:</b> "
 
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #, fuzzy
-msgid "Add attendees from addressbook."
-msgstr "Gehitu bidaltzailea helbide-liburuan"
+msgid "<b>Organizer</b>"
+msgstr "<b>Falta:</b> "
+
+#: calendar/gui/dialogs/meeting-page.glade.h:4
+#, fuzzy
+msgid "Change Or_ganizer"
+msgstr "_Aldatu antolatzailea"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-itip-control.glade.h:9
-msgid "Organizer:"
-msgstr "Antolatzailea:"
+#: calendar/gui/e-meeting-time-sel.c:415
+#, fuzzy
+msgid "Con_tacts..."
+msgstr "Kontaktuak"
 
-#: calendar/gui/dialogs/meeting-page.glade.h:6
-msgid "_Change Organizer"
-msgstr "_Aldatu antolatzailea"
+#: calendar/gui/dialogs/meeting-page.glade.h:7
+#, fuzzy
+msgid "_Organizer:"
+msgstr "Antolatzailea:"
 
 #: calendar/gui/dialogs/new-calendar.glade.h:2
 #, fuzzy
@@ -4978,148 +5510,143 @@ msgstr "Instantzia hau eta ondorengoak"
 msgid "All Instances"
 msgstr "Instantzia guztiak"
 
-#: calendar/gui/dialogs/recurrence-page.c:542
+#: calendar/gui/dialogs/recurrence-page.c:511
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Evolution-ek editatu ezin dituen errepikapenak dauzka hitzordu honek."
 
-#: calendar/gui/dialogs/recurrence-page.c:816
+#: calendar/gui/dialogs/recurrence-page.c:806
 msgid "Recurrence date is invalid"
 msgstr "Errepikatze-data ez da baliozkoa"
 
-#: calendar/gui/dialogs/recurrence-page.c:927
+#: calendar/gui/dialogs/recurrence-page.c:917
 msgid "on"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:988
+#: calendar/gui/dialogs/recurrence-page.c:978
 msgid "first"
 msgstr "lehen"
 
-#: calendar/gui/dialogs/recurrence-page.c:989
+#: calendar/gui/dialogs/recurrence-page.c:979
 msgid "second"
 msgstr "bigarren"
 
-#: calendar/gui/dialogs/recurrence-page.c:990
+#: calendar/gui/dialogs/recurrence-page.c:980
 msgid "third"
 msgstr "hirugarren"
 
-#: calendar/gui/dialogs/recurrence-page.c:991
+#: calendar/gui/dialogs/recurrence-page.c:981
 msgid "fourth"
 msgstr "laugarren"
 
-#: calendar/gui/dialogs/recurrence-page.c:992
+#: calendar/gui/dialogs/recurrence-page.c:982
 msgid "last"
 msgstr "azken"
 
-#: calendar/gui/dialogs/recurrence-page.c:1015
+#: calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Other Date"
 msgstr "Beste data bat"
 
-#: calendar/gui/dialogs/recurrence-page.c:1043
+#: calendar/gui/dialogs/recurrence-page.c:1033
 msgid "day"
 msgstr "eguna"
 
-#: calendar/gui/dialogs/recurrence-page.c:1180
+#: calendar/gui/dialogs/recurrence-page.c:1170
 msgid "on the"
 msgstr "-"
 
-#: calendar/gui/dialogs/recurrence-page.c:1366
+#: calendar/gui/dialogs/recurrence-page.c:1356
 msgid "occurrences"
 msgstr "aldiz"
 
-#: calendar/gui/dialogs/recurrence-page.c:2336
+#: calendar/gui/dialogs/recurrence-page.c:2309
 #, fuzzy
 msgid "Date/Time"
 msgstr "Data/Ordua:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:4
-msgid "Every"
-msgstr "Errepikatze-aldia"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:5
-msgid "Exceptions"
+#: calendar/gui/dialogs/recurrence-page.glade.h:1
+#, fuzzy
+msgid "<b>Exceptions</b>"
 msgstr "Salbuespenak"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:6
-msgid "Preview"
+#: calendar/gui/dialogs/recurrence-page.glade.h:2 mail/mail-config.glade.h:4
+#, fuzzy
+msgid "<b>Preview</b>"
 msgstr "Aurrebista"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:7
-msgid "Recurrence Rule"
-msgstr "Errepikatze-araua"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:9
-msgid "_Custom recurrence"
-msgstr "_Errepikapen pertsonalizatua"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:10
-msgid "_Modify"
-msgstr "_Aldatu"
-
-#: calendar/gui/dialogs/recurrence-page.glade.h:11
-msgid "_No recurrence"
-msgstr "E_rrepikapenik ez"
+#: calendar/gui/dialogs/recurrence-page.glade.h:3
+#, fuzzy
+msgid "<b>Recurrence</b>"
+msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:12
-#: composer/e-msg-composer-attachment-bar.c:453
-msgid "_Remove"
-msgstr "_Kendu"
+#: calendar/gui/dialogs/recurrence-page.glade.h:4
+msgid "Every"
+msgstr "Errepikatze-aldia"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:13
-msgid "_Simple recurrence"
-msgstr "Errepikapen _soila"
+#: calendar/gui/dialogs/recurrence-page.glade.h:5
+#, fuzzy
+msgid "This appointment rec_urs"
+msgstr "_Editatu hitzordua"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:15
+#: calendar/gui/dialogs/recurrence-page.glade.h:8
 msgid "for"
 msgstr "errepikatu arte"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:16
+#: calendar/gui/dialogs/recurrence-page.glade.h:9
 msgid "forever"
 msgstr "betiko"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:17
+#: calendar/gui/dialogs/recurrence-page.glade.h:10
 msgid "month(s)"
 msgstr "hilabete"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:18
+#: calendar/gui/dialogs/recurrence-page.glade.h:11
 msgid "until"
 msgstr "data hau arte:"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:19
+#: calendar/gui/dialogs/recurrence-page.glade.h:12
 msgid "week(s)"
 msgstr "aste"
 
-#: calendar/gui/dialogs/recurrence-page.glade.h:20
+#: calendar/gui/dialogs/recurrence-page.glade.h:13
 msgid "year(s)"
 msgstr "urte"
 
-#: calendar/gui/dialogs/select-source-dialog.c:69
+#: calendar/gui/dialogs/select-source-dialog.c:84
 #, fuzzy
 msgid "Select destination"
 msgstr "Bidalketa-helburua"
 
-#: calendar/gui/dialogs/select-source-dialog.c:90
+#: calendar/gui/dialogs/select-source-dialog.c:106
 #, fuzzy
 msgid "_Destination"
 msgstr "Ezabatu karpeta hau"
 
-#: calendar/gui/dialogs/select-source-dialog.c:92
+#: calendar/gui/dialogs/select-source-dialog.c:108
 msgid "Task List"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/dialogs/task-details-page.c:406
+#: calendar/gui/dialogs/task-details-page.c:427
 msgid "Completed date is wrong"
 msgstr "Osatze-data gaizki dago"
 
+#: calendar/gui/dialogs/task-details-page.glade.h:1
+#, fuzzy
+msgid "<span weight=\"bold\">Miscellaneous\t</span>"
+msgstr "Mezu berrien jakinarazpena"
+
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
-msgstr "Osatuta %"
+#, fuzzy
+msgid "<span weight=\"bold\">Status</span>"
+msgstr "Bidalitako mezuak eta zirriborroak"
 
+#. Pass TRUE as is_utc, so it gets converted to the current
+#. timezone.
 #: calendar/gui/dialogs/task-details-page.glade.h:4
 #: calendar/gui/e-cal-component-preview.c:230
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-cal-model-tasks.c:350
-#: calendar/gui/e-cal-model-tasks.c:653 calendar/gui/e-meeting-store.c:187
-#: calendar/gui/e-meeting-store.c:210 calendar/gui/print.c:2346
+#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:653
+#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-itip-control.c:720
+#: calendar/gui/e-meeting-store.c:187 calendar/gui/e-meeting-store.c:210
+#: calendar/gui/print.c:2346
 msgid "Completed"
 msgstr "Eginda"
 
@@ -5131,8 +5658,8 @@ msgstr "Handia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
 #: calendar/gui/e-cal-component-preview.c:227
-#: calendar/gui/e-calendar-table.c:448 calendar/gui/e-cal-model-tasks.c:348
-#: calendar/gui/e-cal-model-tasks.c:651 calendar/gui/e-cal-model-tasks.c:726
+#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:651
+#: calendar/gui/e-cal-model-tasks.c:726 calendar/gui/e-calendar-table.c:448
 #: calendar/gui/print.c:2343
 msgid "In Progress"
 msgstr "Egiten ari da"
@@ -5144,22 +5671,22 @@ msgid "Low"
 msgstr "Txikia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-component-preview.c:251
-#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
-#: mail/message-list.c:959
+#: calendar/gui/e-cal-component-preview.c:251 calendar/gui/e-cal-model.c:909
+#: calendar/gui/e-calendar-table.c:375 mail/message-list.c:959
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
 #: calendar/gui/e-cal-component-preview.c:237
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/e-cal-model-tasks.c:346
-#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:649
+#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Ez da hasi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:10
-msgid "Progress"
-msgstr "Lanean"
+#, fuzzy
+msgid "P_ercent complete:"
+msgstr "Osatutako ehunekoa: %i"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:11
 #: calendar/gui/e-calendar-table.c:377
@@ -5184,37 +5711,42 @@ msgstr "_Egoera:"
 msgid "_Web Page:"
 msgstr "_Web orriaren helbidea:"
 
-#: calendar/gui/dialogs/task-editor.c:207
-#: calendar/gui/dialogs/task-editor.c:270
-#: calendar/gui/dialogs/task-editor.c:407
+#: calendar/gui/dialogs/task-editor.c:149 calendar/gui/print.c:2297
+msgid "Task"
+msgstr "Zeregina"
+
+#: calendar/gui/dialogs/task-editor.c:165
+#: calendar/gui/dialogs/task-editor.c:225
+#: calendar/gui/dialogs/task-editor.c:361
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:486
+#: calendar/gui/dialogs/task-page.c:496
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: calendar/gui/dialogs/task-page.c:823
+#: calendar/gui/dialogs/task-page.c:831
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin da helbide-liburua ireki"
 
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidentziala"
+#: calendar/gui/dialogs/task-page.glade.h:2
+#, fuzzy
+msgid "<span weight=\"bold\">Basics</span>"
+msgstr "Mezu berrien jakinarazpena"
 
-#: calendar/gui/dialogs/task-page.glade.h:6
+#: calendar/gui/dialogs/task-page.glade.h:3
+#, fuzzy
+msgid "<span weight=\"bold\">Date and Time</span>"
+msgstr "Bidalitako mezuak eta zirriborroak"
+
+#: calendar/gui/dialogs/task-page.glade.h:7
 #: calendar/gui/e-cal-component-preview.c:268
-#: calendar/gui/e-itip-control.c:975 calendar/gui/e-itip-control.glade.h:6
+#: calendar/gui/e-itip-control.c:988 calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:71
 msgid "Description:"
 msgstr "Azalpena:"
 
-#: calendar/gui/dialogs/task-page.glade.h:7
-#, fuzzy
-msgid "Folder:"
-msgstr "Kar_peta:"
-
 #: calendar/gui/dialogs/task-page.glade.h:10
 #, fuzzy
 msgid "Sta_rt date:"
@@ -5225,60 +5757,58 @@ msgstr "Ha_siera-data:"
 msgid "_Due date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:2
+#: calendar/gui/dialogs/task-page.glade.h:13
 #, fuzzy
-msgid "Authentication Credentials for HTTP Server"
-msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
+msgid "_Group:"
+msgstr "Taldea:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:3
-msgid "Calendars selected for publishing"
-msgstr ""
+#, fuzzy
+msgid "<b>Free/Busy C_alendars</b>"
+msgstr "Egutegi-informazioa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:4
-#, fuzzy
-msgid "Daily"
-msgstr "Eguna"
+msgid "<b>Publishing Frequency</b>"
+msgstr ""
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:5
 #, fuzzy
-msgid "Free/Busy Editor"
+msgid "<b>Publishing _Location</b>"
 msgstr "Libre/okupatuta informazioa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:6
 #, fuzzy
-msgid "Free/Busy Publishing Location"
+msgid "Free/Busy Editor"
 msgstr "Libre/okupatuta informazioa"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:7
 #, fuzzy
-msgid "Login name:"
-msgstr "_Zerrenda-izena:"
+msgid "_Daily"
+msgstr "Eguna"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:8
 #, fuzzy
-msgid "Password:"
-msgstr "Pasahitza"
+msgid "_Manual"
+msgstr "Managua"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:9
-msgid "Publishing Frequency"
-msgstr ""
+#, fuzzy
+msgid "_Password:"
+msgstr "Pasahitza"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:10
 #, fuzzy
-msgid "Remember password"
+msgid "_Remember password"
 msgstr "Gogoratu pasahitz hau"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:11
-msgid "URL:"
-msgstr "URLa:"
+#, fuzzy
+msgid "_Username:"
+msgstr "_Erabiltzaile-izena:"
 
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:12
-msgid "User Publishes"
-msgstr ""
-
-#: calendar/gui/dialogs/url-editor-dialog.glade.h:13
 #, fuzzy
-msgid "Weekly"
+msgid "_Weekly"
 msgstr "Astea"
 
 #: calendar/gui/e-alarm-list.c:395
@@ -5360,7 +5890,7 @@ msgstr "%s - %s"
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2382
 #, fuzzy, c-format
 msgid "Click to open %s"
 msgstr "Egin klik zeregina gehitzeko"
@@ -5369,6 +5899,11 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Untitled"
 msgstr "Izengabea"
 
+#: calendar/gui/e-cal-component-preview.c:187
+#: calendar/gui/e-itip-control.c:932 calendar/gui/e-itip-control.glade.h:11
+msgid "Summary:"
+msgstr "Laburpena:"
+
 #: calendar/gui/e-cal-component-preview.c:194
 #: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
@@ -5382,7 +5917,7 @@ msgstr "_Mugaeguna:"
 
 #. write status
 #: calendar/gui/e-cal-component-preview.c:223
-#: calendar/gui/e-itip-control.c:943
+#: calendar/gui/e-itip-control.c:956
 msgid "Status:"
 msgstr "Egoera:"
 
@@ -5396,20 +5931,93 @@ msgstr "_Lehentasuna:"
 msgid "Web Page:"
 msgstr "_Web orriaren helbidea:"
 
-#: calendar/gui/e-calendar-table.c:352 calendar/gui/e-cal-list-view.c:257
-#: calendar/gui/e-cal-model.c:321 calendar/gui/e-cal-model.c:328
-msgid "Public"
-msgstr "Publikoa"
+#: calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Amaiera-eguna"
 
-#: calendar/gui/e-calendar-table.c:353 calendar/gui/e-cal-list-view.c:258
-#: calendar/gui/e-cal-model.c:330
-msgid "Private"
-msgstr "Pribatua"
+#: calendar/gui/e-cal-list-view.etspec.h:4
+msgid "Start Date"
+msgstr "Hasiera-data"
 
-#: calendar/gui/e-calendar-table.c:354 calendar/gui/e-cal-list-view.c:259
-#: calendar/gui/e-cal-model.c:332
-msgid "Confidential"
-msgstr "Konfidentziala"
+#: calendar/gui/e-cal-list-view.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:11 mail/mail-dialogs.glade.h:22
+msgid "Summary"
+msgstr "Laburpena"
+
+#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-meeting-time-sel.c:399
+msgid "Busy"
+msgstr "Okupatuta"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "H"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "M"
+
+#: calendar/gui/e-cal-model-tasks.c:601
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
+msgstr ""
+"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
+"\n"
+"45.436845,125.862501"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
+#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
+msgid "Yes"
+msgstr "Bai"
+
+#: calendar/gui/e-cal-model-tasks.c:1012 calendar/gui/e-cal-model.c:915
+#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Ez"
+
+#. This is the default filename used for temporary file creation
+#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
+#: calendar/gui/e-itip-control.c:973 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-meeting-list-view.c:122
+#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
+#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
+#: camel/camel-gpg-context.c:1705 camel/camel-gpg-context.c:1756
+#: camel/camel-tcp-stream-openssl.c:631
+#: camel/providers/imap4/camel-imap4-engine.c:1379
+#: camel/providers/imap4/camel-imap4-engine.c:1406
+#: camel/providers/imap4/camel-imap4-engine.c:1436
+#: camel/providers/imap4/camel-imap4-engine.c:1476
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#: camel/providers/imap4/camel-imap4-utils.c:457
+#: camel/providers/smtp/camel-smtp-transport.c:172
+#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1120
+#: shell/e-component-registry.c:207 shell/e-component-registry.c:211
+#: widgets/misc/e-charset-picker.c:62
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Errepikatua"
+
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+msgstr "Esleitua"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5455,96 +6063,102 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-calendar-table.c:427 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Okupatuta"
-
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
+#: calendar/gui/e-calendar-table.c:680 calendar/gui/e-calendar-view.c:647
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:750
+#: calendar/gui/e-calendar-table.c:843 calendar/gui/e-calendar-view.c:751
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1373
-#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
+#: calendar/gui/e-calendar-table.c:1019 calendar/gui/e-calendar-table.c:1060
+#: calendar/gui/e-calendar-view.c:1340 calendar/gui/e-calendar-view.c:1420
+#: mail/em-folder-view.c:898 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:1023
+#: calendar/gui/e-calendar-table.c:1020
 #, fuzzy
 msgid "Open _Web Page"
 msgstr "_Ireki mezua"
 
-#: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1294 calendar/gui/e-calendar-view.c:1379
-#: mail/em-folder-view.c:896 mail/em-popup.c:691 mail/em-popup.c:807
+#: calendar/gui/e-calendar-table.c:1021 calendar/gui/e-calendar-table.c:1066
+#: calendar/gui/e-calendar-view.c:1341 calendar/gui/e-calendar-view.c:1426
+#: mail/em-folder-view.c:900 mail/em-popup.c:691 mail/em-popup.c:807
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1272 calendar/gui/e-calendar-view.c:1295
-#: calendar/gui/e-calendar-view.c:1377 ui/evolution-addressbook.xml.h:40
+#: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1064
+#: calendar/gui/e-calendar-view.c:1319 calendar/gui/e-calendar-view.c:1342
+#: calendar/gui/e-calendar-view.c:1424 ui/evolution-addressbook.xml.h:40
 #: ui/evolution-calendar.xml.h:44 ui/evolution-comp-editor.xml.h:19
 #: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "I_nprimatu..."
 
-#: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1343
+#: calendar/gui/e-calendar-table.c:1026 calendar/gui/e-calendar-table.c:1055
+#: calendar/gui/e-calendar-view.c:1347 calendar/gui/e-calendar-view.c:1390
 #: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "E_baki"
 
-#: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1301 calendar/gui/e-calendar-view.c:1341
-#: mail/em-folder-tree.c:952 mail/em-folder-tree.c:2541
-#: mail/message-list.c:1650 ui/evolution-addressbook.xml.h:31
-#: ui/evolution-calendar.xml.h:39 ui/evolution-composer-entries.xml.h:7
-#: ui/evolution-mail-message.xml.h:109 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:1027 calendar/gui/e-calendar-table.c:1053
+#: calendar/gui/e-calendar-view.c:1348 calendar/gui/e-calendar-view.c:1388
+#: mail/em-folder-tree.c:965 mail/message-list.c:1650
+#: ui/evolution-addressbook.xml.h:31 ui/evolution-calendar.xml.h:39
+#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:109
+#: ui/evolution-tasks.xml.h:20
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1276 calendar/gui/e-calendar-view.c:1302
-#: calendar/gui/e-calendar-view.c:1375 ui/evolution-addressbook.xml.h:38
+#: calendar/gui/e-calendar-table.c:1028 calendar/gui/e-calendar-table.c:1062
+#: calendar/gui/e-calendar-view.c:1323 calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1422 ui/evolution-addressbook.xml.h:38
 #: ui/evolution-calendar.xml.h:43 ui/evolution-composer-entries.xml.h:9
 #: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:1035
+#: calendar/gui/e-calendar-table.c:1032
 msgid "_Assign Task"
 msgstr "Esleitu _zeregina"
 
-#: calendar/gui/e-calendar-table.c:1036
+#: calendar/gui/e-calendar-table.c:1033
 msgid "_Forward as iCalendar"
 msgstr "_Birbidali iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:1037
+#: calendar/gui/e-calendar-table.c:1034
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta'"
 
-#: calendar/gui/e-calendar-table.c:1038
+#: calendar/gui/e-calendar-table.c:1035
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu hautatutako zereginak 'Osatuta'"
 
-#: calendar/gui/e-calendar-table.c:1043 calendar/gui/e-calendar-table.c:1061
+#. FIXME: need to disable for undeletable folders
+#: calendar/gui/e-calendar-table.c:1039 calendar/gui/e-calendar-table.c:1057
+#: calendar/gui/e-calendar-view.c:1360 calendar/gui/e-calendar-view.c:1392
+#: mail/em-folder-tree.c:2615 mail/em-folder-view.c:923
+#: ui/evolution-addressbook.xml.h:33 ui/evolution-calendar.xml.h:40
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
+#: ui/evolution-mail-message.xml.h:112 ui/evolution-tasks.xml.h:21
+msgid "_Delete"
+msgstr "E_zabatu"
+
+#: calendar/gui/e-calendar-table.c:1040 calendar/gui/e-calendar-table.c:1058
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1353
-#: calendar/gui/e-calendar-table.etspec.h:3
+#: calendar/gui/e-calendar-table.c:1172 calendar/gui/e-calendar-view.c:1053
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
+msgstr "Gorde honela..."
+
+#: calendar/gui/e-calendar-table.c:1350
+#: calendar/gui/e-calendar-table.etspec.h:4
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
 
@@ -5553,181 +6167,112 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "% Complete"
 msgstr "Osatuta %"
 
-#: calendar/gui/e-calendar-table.etspec.h:4 camel/camel-filter-driver.c:1167
-#: camel/camel-filter-driver.c:1259 mail/mail-send-recv.c:615
+#: calendar/gui/e-calendar-table.etspec.h:5 camel/camel-filter-driver.c:1178
+#: camel/camel-filter-driver.c:1270 mail/mail-send-recv.c:615
 msgid "Complete"
 msgstr "Eginda"
 
-#: calendar/gui/e-calendar-table.etspec.h:5
+#: calendar/gui/e-calendar-table.etspec.h:6
 #, fuzzy
 msgid "Completion date"
 msgstr "Egite-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:6
+#: calendar/gui/e-calendar-table.etspec.h:7
 #, fuzzy
 msgid "Due date"
 msgstr "Mugaeguna"
 
-#: calendar/gui/e-calendar-table.etspec.h:7
+#: calendar/gui/e-calendar-table.etspec.h:8
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: calendar/gui/e-calendar-table.etspec.h:8
+#: calendar/gui/e-calendar-table.etspec.h:9
 #, fuzzy
 msgid "Start date"
 msgstr "Hasiera-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:10
-#: calendar/gui/e-cal-list-view.etspec.h:4 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Laburpena"
-
-#: calendar/gui/e-calendar-table.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:12
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1353
+#: calendar/gui/e-calendar-view.c:1156
+#, fuzzy
+msgid "Moving items"
+msgstr "Mezuak lekuz aldatzen"
+
+#: calendar/gui/e-calendar-view.c:1158
+#, fuzzy
+msgid "Copying items"
+msgstr "Mezuak kopiatzen"
+
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1400
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1358
+#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1405
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1363
+#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1410
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-calendar-view.c:1268 calendar/gui/e-calendar-view.c:1368
+#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1415
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-calendar-view.c:1282 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1329 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Hautatu _haria"
 
-#: calendar/gui/e-calendar-view.c:1283
+#: calendar/gui/e-calendar-view.c:1330
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1287 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1334 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1353
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1354
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman karpeta honetara..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1355
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu Bilera..."
 
-#: calendar/gui/e-calendar-view.c:1309
+#: calendar/gui/e-calendar-view.c:1356
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1361 calendar/gui/e-calendar-view.c:1393
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-calendar-view.c:1315 calendar/gui/e-calendar-view.c:1347
+#: calendar/gui/e-calendar-view.c:1362 calendar/gui/e-calendar-view.c:1394
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-calendar-view.c:1349
+#: calendar/gui/e-calendar-view.c:1396
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-calendar-view.c:1351
+#: calendar/gui/e-calendar-view.c:1398
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1381 ui/evolution.xml.h:35
+#: calendar/gui/e-calendar-view.c:1428 ui/evolution.xml.h:35
 msgid "_Settings..."
 msgstr "_Ezarpenak..."
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Amaiera-eguna"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Hasiera-data"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:334 calendar/gui/e-cal-model.c:337
-#: calendar/gui/e-itip-control.c:960 calendar/gui/e-itip-control.c:1162
-#: calendar/gui/e-meeting-list-view.c:122
-#: calendar/gui/e-meeting-list-view.c:136 calendar/gui/e-meeting-store.c:115
-#: calendar/gui/e-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1703 camel/camel-gpg-context.c:1754
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/imap4/camel-imap4-engine.c:1534
-#: camel/providers/imap4/camel-imap4-engine.c:1561
-#: camel/providers/imap4/camel-imap4-engine.c:1591
-#: camel/providers/imap4/camel-imap4-engine.c:1631
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#: camel/providers/imap4/camel-imap4-utils.c:292
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:1115
-#: shell/e-component-registry.c:186 shell/e-component-registry.c:190
-#: widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: calendar/gui/e-cal-model.c:911
-msgid "Recurring"
-msgstr "Errepikatua"
-
-#: calendar/gui/e-cal-model.c:913
-msgid "Assigned"
-msgstr "Esleitua"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:146 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
-msgstr "Bai"
-
-#: calendar/gui/e-cal-model.c:915 calendar/gui/e-cal-model-tasks.c:1012
-#: calendar/gui/e-meeting-list-view.c:147 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ez"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "I"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "H"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:681
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "M"
-
-#: calendar/gui/e-cal-model-tasks.c:601
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
-"\n"
-"45.436845,125.862501"
-
 #. strftime format of a weekday, a date and a time, 24-hour.
 #: calendar/gui/e-cell-date-edit-text.c:117 e-util/e-time-utils.c:180
 #: e-util/e-time-utils.c:393
@@ -5751,36 +6296,36 @@ msgstr ""
 "\n"
 "%s"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutu-zatiketa"
 
 #. strftime format %A = full weekday name, %d = day of month,
 #. %B = full month name. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1571 calendar/gui/e-day-view-top-item.c:690
+#: calendar/gui/e-day-view-top-item.c:690 calendar/gui/e-day-view.c:1571
 #: calendar/gui/e-week-view-main-item.c:320 calendar/gui/print.c:1514
 msgid "%A %d %B"
 msgstr "%A, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view.c:1604 calendar/gui/e-day-view-top-item.c:698
+#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1604
 #: calendar/gui/e-week-view-main-item.c:343
 msgid "%d %b"
 msgstr "%b %d"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutu-zatiketa"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:573
+#: calendar/gui/print.c:838
+msgid "am"
+msgstr "am"
+
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:576
+#: calendar/gui/print.c:840
+msgid "pm"
+msgstr "pm"
 
 #: calendar/gui/e-itip-control.c:585
 msgid "Yes. (Complex Recurrence)"
@@ -5847,342 +6392,321 @@ msgid ", ending on "
 msgstr ", data honetan amaituta: "
 
 #: calendar/gui/e-itip-control.c:686
-msgid "<b>Starts:</b> "
-msgstr "<b>Hasiera:</b> "
-
-#: calendar/gui/e-itip-control.c:696
-msgid "<b>Ends:</b> "
-msgstr "<b>Amaiera:</b> "
+#, fuzzy
+msgid "Starts"
+msgstr "Egoera"
 
-#: calendar/gui/e-itip-control.c:716
-msgid "<b>Completed:</b> "
-msgstr "<b>Eginda:</b> "
+#: calendar/gui/e-itip-control.c:699
+#, fuzzy
+msgid "Ends"
+msgstr "Enid"
 
-#: calendar/gui/e-itip-control.c:726
-msgid "<b>Due:</b> "
-msgstr "<b>Falta:</b> "
+#: calendar/gui/e-itip-control.c:733
+#, fuzzy
+msgid "Due"
+msgstr "Falta: "
 
-#: calendar/gui/e-itip-control.c:764 calendar/gui/e-itip-control.c:820
+#: calendar/gui/e-itip-control.c:773 calendar/gui/e-itip-control.c:830
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:781
+#: calendar/gui/e-itip-control.c:790
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:852 calendar/gui/e-itip-control.c:868
-#: calendar/gui/e-itip-control.c:879 calendar/gui/e-itip-control.c:896
+#: calendar/gui/e-itip-control.c:862 calendar/gui/e-itip-control.c:878
+#: calendar/gui/e-itip-control.c:889 calendar/gui/e-itip-control.c:906
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:903
+#: calendar/gui/e-itip-control.c:913
 msgid ""
 "<br> Please review the following information, and then select an action from "
 "the menu below."
 msgstr ""
 "<br> Aztertu ondorengo informazioa, eta hautatu ekintza bat beheko menuan."
 
-#: calendar/gui/e-itip-control.c:918
-msgid "<i>None</i>"
-msgstr "<i>Bat ere ez</i>"
-
-#: calendar/gui/e-itip-control.c:929
+#: calendar/gui/e-itip-control.c:942
 msgid "Location:"
 msgstr "Kokalekua:"
 
-#: calendar/gui/e-itip-control.c:948 calendar/gui/e-meeting-list-view.c:158
+#: calendar/gui/e-itip-control.c:961 calendar/gui/e-meeting-list-view.c:158
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:952 calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:965 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:956 calendar/gui/e-meeting-list-view.c:159
+#: calendar/gui/e-itip-control.c:969 calendar/gui/e-meeting-list-view.c:159
 #: calendar/gui/e-meeting-store.c:181 calendar/gui/e-meeting-store.c:204
 #: calendar/gui/itip-utils.c:428 calendar/gui/itip-utils.c:454
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:1015 calendar/gui/e-itip-control.c:1043
-#: calendar/gui/e-itip-control.c:1069 calendar/gui/e-itip-control.c:1082
-#: calendar/gui/e-itip-control.c:1095 calendar/gui/e-itip-control.c:1108
+#: calendar/gui/e-itip-control.c:1028 calendar/gui/e-itip-control.c:1056
+#: calendar/gui/e-itip-control.c:1082 calendar/gui/e-itip-control.c:1095
+#: calendar/gui/e-itip-control.c:1108 calendar/gui/e-itip-control.c:1121
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1016
+#: calendar/gui/e-itip-control.c:1029
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:1017 calendar/gui/e-itip-control.c:1048
-#: calendar/gui/e-itip-control.c:1071 calendar/gui/e-itip-control.c:1084
-#: calendar/gui/e-itip-control.c:1097 calendar/gui/e-itip-control.c:1110
-#: shell/e-shell.c:1141 widgets/misc/e-cell-date-edit.c:265
+#: calendar/gui/e-itip-control.c:1030 calendar/gui/e-itip-control.c:1061
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/e-itip-control.c:1097
+#: calendar/gui/e-itip-control.c:1110 calendar/gui/e-itip-control.c:1123
+#: shell/e-shell.c:1129 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1044
+#: calendar/gui/e-itip-control.c:1057
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1045
+#: calendar/gui/e-itip-control.c:1058
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1046
+#: calendar/gui/e-itip-control.c:1059
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1070
+#: calendar/gui/e-itip-control.c:1083
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1083
+#: calendar/gui/e-itip-control.c:1096
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1096
+#: calendar/gui/e-itip-control.c:1109
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1109 calendar/gui/itip-utils.c:442
+#: calendar/gui/e-itip-control.c:1122 calendar/gui/itip-utils.c:442
 #: mail/mail-send-recv.c:410 mail/mail-send-recv.c:464
 #: ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1198
 #, c-format
 msgid "<b>%s</b> has published meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1186
+#: calendar/gui/e-itip-control.c:1199
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1191
+#: calendar/gui/e-itip-control.c:1204
 #, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dio %s(r)i."
 
-#: calendar/gui/e-itip-control.c:1193
+#: calendar/gui/e-itip-control.c:1206
 #, c-format
 msgid "<b>%s</b> requests your presence at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1194
+#: calendar/gui/e-itip-control.c:1207
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1211
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing meeting."
 msgstr "<b>%s</b>(e)k bilera batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1199
+#: calendar/gui/e-itip-control.c:1212
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1203
+#: calendar/gui/e-itip-control.c:1216
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest meeting information."
 msgstr "<b>%s</b>(e)k bilera-informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1204
+#: calendar/gui/e-itip-control.c:1217
 msgid "Meeting Update Request"
 msgstr "Bilera eguneratzeko eskaera"
 
-#: calendar/gui/e-itip-control.c:1211
+#: calendar/gui/e-itip-control.c:1224
 #, c-format
 msgid "<b>%s</b> has replied to a meeting request."
 msgstr "<b>%s</b>(e)k bilera-eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1225
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1219
+#: calendar/gui/e-itip-control.c:1232
 #, c-format
 msgid "<b>%s</b> has cancelled a meeting."
 msgstr "<b>%s</b>(e)k bilera bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1220
+#: calendar/gui/e-itip-control.c:1233
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1295
-#: calendar/gui/e-itip-control.c:1330
+#: calendar/gui/e-itip-control.c:1240 calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1343
 #, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
 msgstr "<b>%s</b>(e)k mezu ulertezina bidali du."
 
-#: calendar/gui/e-itip-control.c:1228
+#: calendar/gui/e-itip-control.c:1241
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1253
+#: calendar/gui/e-itip-control.c:1266
 #, c-format
 msgid "<b>%s</b> has published task information."
 msgstr "<b>%s</b>(e)k zeregin-informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1254
+#: calendar/gui/e-itip-control.c:1267
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1259
+#: calendar/gui/e-itip-control.c:1272
 #, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dio %s(r)i."
 
-#: calendar/gui/e-itip-control.c:1261
+#: calendar/gui/e-itip-control.c:1274
 #, c-format
 msgid "<b>%s</b> requests you perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1262
+#: calendar/gui/e-itip-control.c:1275
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1266
+#: calendar/gui/e-itip-control.c:1279
 #, c-format
 msgid "<b>%s</b> wishes to add to an existing task."
 msgstr "<b>%s</b>(e)k zeregin batean sartu nahi du."
 
-#: calendar/gui/e-itip-control.c:1267
+#: calendar/gui/e-itip-control.c:1280
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1271
+#: calendar/gui/e-itip-control.c:1284
 #, c-format
 msgid "<b>%s</b> wishes to receive the latest task information."
 msgstr "<b>%s</b>(e)k zereginaren informazio berria jaso nahi du."
 
-#: calendar/gui/e-itip-control.c:1272
+#: calendar/gui/e-itip-control.c:1285
 msgid "Task Update Request"
 msgstr "Zeregina eguneratzeko eskaera"
 
-#: calendar/gui/e-itip-control.c:1279
+#: calendar/gui/e-itip-control.c:1292
 #, c-format
 msgid "<b>%s</b> has replied to a task assignment."
 msgstr "<b>%s</b>(e)k zeregin-esleipenari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1280
+#: calendar/gui/e-itip-control.c:1293
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1287
+#: calendar/gui/e-itip-control.c:1300
 #, c-format
 msgid "<b>%s</b> has cancelled a task."
 msgstr "<b>%s</b>(e)k zeregina bertan behera utzi du."
 
-#: calendar/gui/e-itip-control.c:1288
+#: calendar/gui/e-itip-control.c:1301
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1296
+#: calendar/gui/e-itip-control.c:1309
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1315
+#: calendar/gui/e-itip-control.c:1328
 #, c-format
 msgid "<b>%s</b> has published free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa argitaratu du."
 
-#: calendar/gui/e-itip-control.c:1316
+#: calendar/gui/e-itip-control.c:1329
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1320
+#: calendar/gui/e-itip-control.c:1333
 #, c-format
 msgid "<b>%s</b> requests your free/busy information."
 msgstr "<b>%s</b>(e)k libre/okupatuta informazioa eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1321
+#: calendar/gui/e-itip-control.c:1334
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1325
+#: calendar/gui/e-itip-control.c:1338
 #, c-format
 msgid "<b>%s</b> has replied to a free/busy request."
 msgstr "<b>%s</b>(e)k libre/okupatuta eskaerari erantzun dio."
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1339
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1331
+#: calendar/gui/e-itip-control.c:1344
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1406
+#: calendar/gui/e-itip-control.c:1419
 msgid "The message does not appear to be properly formed"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: calendar/gui/e-itip-control.c:1465
+#: calendar/gui/e-itip-control.c:1478
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1496
+#: calendar/gui/e-itip-control.c:1509
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1528
+#: calendar/gui/e-itip-control.c:1541
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1762
+#: calendar/gui/e-itip-control.c:1775
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1792 calendar/gui/e-itip-control.c:1864
-msgid "Attendee status can not be updated because the item no longer exists"
-msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
-
-#: calendar/gui/e-itip-control.c:1808 calendar/gui/e-itip-control.c:1846
+#: calendar/gui/e-itip-control.c:1803
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektua ez da baliozkoa eta ezin da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1818
+#: calendar/gui/e-itip-control.c:1813
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Erantzun hau ez da uneko partaide batena.  Partaide gisa gehitu?"
 
-#: calendar/gui/e-itip-control.c:1830
+#: calendar/gui/e-itip-control.c:1825
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea delako\n"
 
-#: calendar/gui/e-itip-control.c:1849
-msgid "There was an error on the CORBA system\n"
-msgstr "Errorea izan da CORBA sisteman\n"
-
-#: calendar/gui/e-itip-control.c:1852
-msgid "Object could not be found\n"
-msgstr "Objektua ezin izan da aurkitu\n"
-
-#: calendar/gui/e-itip-control.c:1855
-msgid "You don't have the right permissions to update the calendar\n"
-msgstr "Ez dauzkazu egutegia eguneratzeko behar diren baimenak\n"
-
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1842
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1861
-msgid "Attendee status could not be updated!\n"
-msgstr "Partaidearen egoera ezin izan da eguneratu\n"
+#: calendar/gui/e-itip-control.c:1845
+msgid "Attendee status can not be updated because the item no longer exists"
+msgstr "Partaidearen egoera ezin da eguneratu elementua ez dagoelako"
 
-#: calendar/gui/e-itip-control.c:1892
+#: calendar/gui/e-itip-control.c:1872
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:1963
+#: calendar/gui/e-itip-control.c:1895 calendar/gui/e-itip-control.c:1943
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1917 calendar/gui/e-itip-control.c:1967
+#: calendar/gui/e-itip-control.c:1897 calendar/gui/e-itip-control.c:1947
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
@@ -6211,6 +6735,10 @@ msgstr "Egutegia kargatzen"
 msgid "Loading calendar..."
 msgstr "Egutegia kargatzen ari da..."
 
+#: calendar/gui/e-itip-control.glade.h:9
+msgid "Organizer:"
+msgstr "Antolatzailea:"
+
 #: calendar/gui/e-itip-control.glade.h:10
 msgid "Server Message:"
 msgstr "Zerbitzariaren mezua:"
@@ -6227,11 +6755,6 @@ msgstr "data-hasiera"
 msgid "Chair Persons"
 msgstr "Mahaiburuak"
 
-#: calendar/gui/e-meeting-list-view.c:60
-#: calendar/gui/e-meeting-list-view.c:457
-msgid "Required Participants"
-msgstr "Beharrezko partaideak"
-
 #: calendar/gui/e-meeting-list-view.c:61
 msgid "Optional Participants"
 msgstr "Aukerako partaideak"
@@ -6299,6 +6822,28 @@ msgstr "Delegatua"
 msgid "In Process"
 msgstr "Egiten ari da"
 
+#. This is a strftime() format string %A = full weekday name,
+#. %B = full month name, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:452
+#: calendar/gui/e-meeting-time-sel.c:2053
+msgid "%A, %B %d, %Y"
+msgstr "%A, %Y.eko %Bren %da"
+
+#. This is a strftime() format string %a = abbreviated weekday
+#. name, %m = month number, %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:456
+#: calendar/gui/e-meeting-time-sel.c:2086 e-util/e-time-utils.c:203
+#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
+msgid "%a %m/%d/%Y"
+msgstr "%a, %Y/%m/%d"
+
+#. This is a strftime() format string %m = month number,
+#. %d = month day, %Y = full year.
+#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
+#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
@@ -6307,98 +6852,64 @@ msgstr "Bulegotik kanpo"
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: calendar/gui/e-meeting-time-sel.c:417
+#: calendar/gui/e-meeting-time-sel.c:432
 #, fuzzy
-msgid "Add attendees from addressbook"
-msgstr "Gehitu bidaltzailea helbide-liburuan"
-
-#: calendar/gui/e-meeting-time-sel.c:440
-msgid "_Options"
-msgstr "Au_kerak"
+msgid "O_ptions"
+msgstr "Aukerak"
 
-#: calendar/gui/e-meeting-time-sel.c:457
+#: calendar/gui/e-meeting-time-sel.c:449
 #, fuzzy
 msgid "Show _only working hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: calendar/gui/e-meeting-time-sel.c:467
+#: calendar/gui/e-meeting-time-sel.c:459
 #, fuzzy
 msgid "Show _zoomed out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: calendar/gui/e-meeting-time-sel.c:482
+#: calendar/gui/e-meeting-time-sel.c:474
 #, fuzzy
 msgid "_Update free/busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: calendar/gui/e-meeting-time-sel.c:497
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:515
+#: calendar/gui/e-meeting-time-sel.c:507
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: calendar/gui/e-meeting-time-sel.c:530
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:547
+#: calendar/gui/e-meeting-time-sel.c:539
 #, fuzzy
 msgid "_All people and resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: calendar/gui/e-meeting-time-sel.c:556
+#: calendar/gui/e-meeting-time-sel.c:548
 #, fuzzy
 msgid "All _people and one resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:565
+#: calendar/gui/e-meeting-time-sel.c:557
 #, fuzzy
 msgid "_Required people"
 msgstr "_Beharrezko pertsonak"
 
-#: calendar/gui/e-meeting-time-sel.c:574
+#: calendar/gui/e-meeting-time-sel.c:566
 #, fuzzy
 msgid "Required people and _one resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:593
-msgid "Meeting _start time:"
-msgstr "Bilera _hasteko ordua:"
-
-#: calendar/gui/e-meeting-time-sel.c:613
-msgid "Meeting _end time:"
-msgstr "Bilera amai_tzeko ordua:"
-
-#. This is a strftime() format string %A = full weekday name,
-#. %B = full month name, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2060
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y.eko %Bren %da"
-
-#. This is a strftime() format string %a = abbreviated weekday name,
-#. %m = month number, %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel.c:2093
-#: calendar/gui/e-meeting-time-sel-item.c:456 e-util/e-time-utils.c:203
-#: e-util/e-time-utils.c:296 e-util/e-time-utils.c:384
-msgid "%a %m/%d/%Y"
-msgstr "%a, %Y/%m/%d"
-
-#. This is a strftime() format string %m = month number,
-#. %d = month day, %Y = full year.
-#: calendar/gui/e-meeting-time-sel-item.c:460 e-util/e-time-utils.c:238
-#: e-util/e-time-utils.c:299 widgets/misc/e-dateedit.c:1604
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
 #: calendar/gui/e-pub-utils.c:300
 #, fuzzy, c-format
 msgid "Enter the password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: calendar/gui/e-tasks.c:706 calendar/gui/gnome-cal.c:2020
+#: calendar/gui/e-tasks.c:709 calendar/gui/gnome-cal.c:2159
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6407,120 +6918,53 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#. FIXME Loading should be async
-#. FIXME With no event handling here the status message never actually changes
-#: calendar/gui/e-tasks.c:801
-#, c-format
-msgid "Opening tasks at %s"
-msgstr "%s - zereginak irekitzen"
-
-#: calendar/gui/e-tasks.c:824
-#, fuzzy, c-format
-msgid ""
-"Error opening %s:\n"
-"%s"
-msgstr ""
-"Errorea %s(e)n:\n"
-" %s"
-
-#: calendar/gui/e-tasks.c:845
+#: calendar/gui/e-tasks.c:755
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Irudi-kargatzea"
 
-#: calendar/gui/e-tasks.c:949
+#: calendar/gui/e-tasks.c:846
+#, c-format
+msgid "Opening tasks at %s"
+msgstr "%s - zereginak irekitzen"
+
+#: calendar/gui/e-tasks.c:962
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: calendar/gui/e-tasks.c:972
+#: calendar/gui/e-tasks.c:985
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: calendar/gui/e-tasks.c:999
+#: calendar/gui/e-tasks.c:1012
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/e-tasks.c:1075
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:412
-#: calendar/gui/tasks-component.c:884 calendar/gui/tasks-control.c:405
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zereginak"
+#: calendar/gui/gnome-cal.c:704
+#, fuzzy
+msgid "Updating query"
+msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/gnome-cal.c:1878
+#: calendar/gui/gnome-cal.c:2006
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Hitzordurik ez."
 
-#: calendar/gui/gnome-cal.c:1897
+#: calendar/gui/gnome-cal.c:2025
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/gnome-cal.c:1920
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Ireki honekin: %s..."
 
-#: calendar/gui/gnome-cal.c:2906
+#: calendar/gui/gnome-cal.c:3003
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "*Control*F3"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "*Control*F4"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Calendar and Tasks"
-msgstr "Egutegia eta zereginak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfiguratu hemen zure ordu-zona, egutegia eta zereginen zerrenda "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution-en egutegia eta zereginak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution-en egutegia konfiguratzeko kontrola"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-en egutegiko antolaketako mezuen ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-en egutegiaren/zereginen editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution-en egutegiaren eta zereginen osagaia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution-en probaren osagaia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
-#, fuzzy
-msgid "_Calendars"
-msgstr "Egutegia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zereginak"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -6860,10 +7304,6 @@ msgstr "Hautatutako hilabetea (%Y %b)"
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2297
-msgid "Task"
-msgstr "Zeregina"
-
 #: calendar/gui/print.c:2356
 #, c-format
 msgid "Status: %s"
@@ -6894,7 +7334,7 @@ msgid "Contacts: "
 msgstr "Kontaktuak: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:178
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
@@ -6923,7 +7363,7 @@ msgid_plural "%d tasks"
 msgstr[0] "Zereginik ez"
 msgstr[1] "Zereginik ez"
 
-#: calendar/gui/tasks-component.c:410 mail/mail-component.c:500
+#: calendar/gui/tasks-component.c:410 mail/mail-component.c:498
 #, fuzzy, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6944,35 +7384,29 @@ msgstr ""
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:799
-msgid ""
-"Selected task list is read-only, events cannot be created. Please select a "
-"read-write calendar."
-msgstr ""
-
-#: calendar/gui/tasks-component.c:1040
+#: calendar/gui/tasks-component.c:1030
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:1041
+#: calendar/gui/tasks-component.c:1031
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/tasks-component.c:1042
+#: calendar/gui/tasks-component.c:1032
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:1048
+#: calendar/gui/tasks-component.c:1038
 #, fuzzy
 msgid "New tasks group"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:1049
+#: calendar/gui/tasks-component.c:1039
 #, fuzzy
-msgid "_Tasks Group"
+msgid "Tasks Gro_up"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:1050
+#: calendar/gui/tasks-component.c:1040
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sortu zeregin berria"
@@ -8651,69 +9085,69 @@ msgstr "'%s' karpeta prestatzen lineaz kanpo erabiltzeko"
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
-#: camel/camel-filter-driver.c:667 camel/camel-filter-search.c:513
+#: camel/camel-filter-driver.c:669 camel/camel-filter-search.c:513
 #: camel/camel-process.c:48
 #, c-format
 msgid "Failed to create pipe to '%s': %s"
 msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
 
-#: camel/camel-filter-driver.c:711 camel/camel-filter-search.c:549
+#: camel/camel-filter-driver.c:713 camel/camel-filter-search.c:549
 #: camel/camel-process.c:90
 #, c-format
 msgid "Failed to create create child process '%s': %s"
 msgstr "Huts egin du `%s' prozesu umea sortzean: %s"
 
-#: camel/camel-filter-driver.c:754
+#: camel/camel-filter-driver.c:756
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Baliogabeko mezu-korrontea jaso da %s(e)tik: %s"
 
-#: camel/camel-filter-driver.c:934 camel/camel-filter-driver.c:943
+#: camel/camel-filter-driver.c:945 camel/camel-filter-driver.c:954
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1032 camel/camel-filter-driver.c:1405
+#: camel/camel-filter-driver.c:1043 camel/camel-filter-driver.c:1420
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1041 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1052 camel/camel-filter-driver.c:1426
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1108
+#: camel/camel-filter-driver.c:1119
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:1117
+#: camel/camel-filter-driver.c:1128
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:1132
+#: camel/camel-filter-driver.c:1143
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:1136
+#: camel/camel-filter-driver.c:1147
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:1137 camel/camel-filter-driver.c:1149
+#: camel/camel-filter-driver.c:1148 camel/camel-filter-driver.c:1160
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:1163 camel/camel-filter-driver.c:1254
+#: camel/camel-filter-driver.c:1174 camel/camel-filter-driver.c:1265
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1224
+#: camel/camel-filter-driver.c:1235
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1239
+#: camel/camel-filter-driver.c:1250
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
@@ -8735,43 +9169,6 @@ msgstr "Argumentu baliogabeak: (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder.c:653
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
-
-#: camel/camel-folder.c:1262
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1302
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1416
-msgid "Moving messages"
-msgstr "Mezuak lekuz aldatzen"
-
-#: camel/camel-folder.c:1416
-msgid "Copying messages"
-msgstr "Mezuak kopiatzen"
-
-#: camel/camel-folder.c:1665
-#, fuzzy
-msgid "Learning junk"
-msgstr "Lansing"
-
-#: camel/camel-folder.c:1682
-msgid "Learning non-junk"
-msgstr ""
-
-#: camel/camel-folder.c:1701
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d mezu eskuratzen"
-
 #: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
@@ -8817,7 +9214,44 @@ msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburu ezezagunean: %s"
 
-#: camel/camel-gpg-context.c:720
+#: camel/camel-folder.c:653
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
+
+#: camel/camel-folder.c:1262
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1302
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1416
+msgid "Moving messages"
+msgstr "Mezuak lekuz aldatzen"
+
+#: camel/camel-folder.c:1416
+msgid "Copying messages"
+msgstr "Mezuak kopiatzen"
+
+#: camel/camel-folder.c:1665
+#, fuzzy
+msgid "Learning junk"
+msgstr "Lansing"
+
+#: camel/camel-folder.c:1682
+msgid "Learning non-junk"
+msgstr ""
+
+#: camel/camel-folder.c:1701
+#, fuzzy
+msgid "Filtering new message(s)"
+msgstr "%d mezu eskuratzen"
+
+#: camel/camel-gpg-context.c:722
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8828,15 +9262,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:734
+#: camel/camel-gpg-context.c:736
 msgid "Failed to parse gpg userid hint."
 msgstr "Huts egin du gpg erabiltzaile-IDaren aholkua analizatzean."
 
-#: camel/camel-gpg-context.c:758
+#: camel/camel-gpg-context.c:760
 msgid "Failed to parse gpg passphrase request."
 msgstr "Errorea gpg pasaesaldi-eskaera analizatzean."
 
-#: camel/camel-gpg-context.c:772
+#: camel/camel-gpg-context.c:774
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8845,29 +9279,29 @@ msgstr ""
 "Pasaesaldia behar da erabiltzaile honen gakoa \n"
 "desblokeatzeko: \"%s\""
 
-#: camel/camel-gpg-context.c:789 camel/camel-gpg-context.c:1280
-#: camel/camel-gpg-context.c:1438 camel/camel-gpg-context.c:1530
-#: camel/camel-gpg-context.c:1637 camel/providers/nntp/camel-nntp-store.c:1231
+#: camel/camel-gpg-context.c:791 camel/camel-gpg-context.c:1283
+#: camel/camel-gpg-context.c:1441 camel/camel-gpg-context.c:1532
+#: camel/camel-gpg-context.c:1639 camel/providers/nntp/camel-nntp-store.c:1231
 #: camel/providers/nntp/camel-nntp-store.c:1329 mail/mail-ops.c:705
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:807
+#: camel/camel-gpg-context.c:809
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Huts egin du gako sekretua desblokeatzean: 3 pasaesaldi oker eman dira."
 
-#: camel/camel-gpg-context.c:813
+#: camel/camel-gpg-context.c:815
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna GnuPG-tik: %s"
 
-#: camel/camel-gpg-context.c:864
+#: camel/camel-gpg-context.c:867
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Huts egin du enkriptatzean: Ez da baliozko hartzailerik zehaztu."
 
-#: camel/camel-gpg-context.c:1141
+#: camel/camel-gpg-context.c:1144
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8878,69 +9312,89 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1146
+#: camel/camel-gpg-context.c:1149
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Huts egin du GPG ezartzean %s mezuan: %s\n"
 
-#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1262 camel/camel-smime-context.c:419
 #, fuzzy, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
-#: camel/camel-gpg-context.c:1753
+#: camel/camel-gpg-context.c:1276 camel/camel-gpg-context.c:1704
+#: camel/camel-gpg-context.c:1755
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Huts egin du gpg exekutatzean: %s"
 
-#: camel/camel-gpg-context.c:1297 camel/camel-gpg-context.c:1430
-#: camel/camel-gpg-context.c:1523 camel/camel-gpg-context.c:1546
-#: camel/camel-gpg-context.c:1630 camel/camel-gpg-context.c:1654
-#: camel/camel-gpg-context.c:1724 camel/camel-gpg-context.c:1775
+#: camel/camel-gpg-context.c:1300 camel/camel-gpg-context.c:1434
+#: camel/camel-gpg-context.c:1525 camel/camel-gpg-context.c:1548
+#: camel/camel-gpg-context.c:1632 camel/camel-gpg-context.c:1656
+#: camel/camel-gpg-context.c:1726 camel/camel-gpg-context.c:1777
 msgid "Failed to execute gpg."
 msgstr "Huts egin du gpg exekutatzean."
 
-#: camel/camel-gpg-context.c:1316
+#: camel/camel-gpg-context.c:1319
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:721 camel/camel-smime-context.c:732
-#: camel/camel-smime-context.c:739
+#: camel/camel-gpg-context.c:1400 camel/camel-gpg-context.c:1406
+#: camel/camel-gpg-context.c:1412 camel/camel-smime-context.c:721
+#: camel/camel-smime-context.c:732 camel/camel-smime-context.c:739
 #, fuzzy
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr ""
 "Ezin da egiaztatu mezuaren sinadura: ezin izan da aldi baterako fitxategia "
 "sortu: %s"
 
-#: camel/camel-gpg-context.c:1413
+#: camel/camel-gpg-context.c:1420
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da egiaztatu mezuaren sinadura: ezin izan da aldi baterako fitxategia "
 "sortu: %s"
 
-#: camel/camel-gpg-context.c:1506
+#: camel/camel-gpg-context.c:1508
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1564
+#: camel/camel-gpg-context.c:1566
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
+#: camel/camel-gpg-context.c:1663 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indexatu gorputzaren edukia"
 
-#: camel/camel-gpg-context.c:1680
+#: camel/camel-gpg-context.c:1682
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Ezin da mezua eskuratu editoretik"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik sortu: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
+
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#, c-format
+msgid "Could not lock '%s': protocol error with lock-helper"
+msgstr "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ezin izan da '%s' blokeatu"
+
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8963,26 +9417,6 @@ msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik sortu: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
-
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
-#, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
-msgstr "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ezin izan da '%s' blokeatu"
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9241,7 +9675,7 @@ msgstr "Erreferentziatutako kredentzialak iraungita daude."
 #: camel/camel-sasl-gssapi.c:189 camel/camel-sasl-gssapi.c:238
 #: camel/camel-sasl-gssapi.c:274 camel/camel-sasl-gssapi.c:289
 #: camel/camel-sasl-kerberos4.c:219
-#: camel/providers/imap/camel-imap-store.c:1240
+#: camel/providers/imap/camel-imap-store.c:1236
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -9327,55 +9761,55 @@ msgstr "POP Before SMTP auth using a non-pop source"
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
 
-#: camel/camel-service.c:275
+#: camel/camel-service.c:271
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: camel/camel-service.c:279
+#: camel/camel-service.c:275
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: camel/camel-service.c:283
+#: camel/camel-service.c:279
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:733
+#: camel/camel-service.c:729
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:764 camel/camel-service.c:888
+#: camel/camel-service.c:760 camel/camel-service.c:884
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:785 camel/camel-service.c:909
+#: camel/camel-service.c:781 camel/camel-service.c:905
 #, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Ostalari-bilaketak huts egin du: haria ezin da sortu: %s"
 
-#: camel/camel-service.c:798
+#: camel/camel-service.c:794
 #, c-format
 msgid "Host lookup failed: %s: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:801
+#: camel/camel-service.c:797
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:855
+#: camel/camel-service.c:851
 msgid "Resolving address"
 msgstr "Helbidea ebazten"
 
-#: camel/camel-service.c:924
+#: camel/camel-service.c:920
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:927
+#: camel/camel-service.c:923
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: arrazoi ezezaguna"
 
@@ -9451,7 +9885,7 @@ msgstr "_Ziurtagiri-IDa:"
 msgid "Cannot add CMS SignerInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:430
+#: camel/camel-smime-context.c:430 camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Cannot create encoder context"
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
@@ -9547,7 +9981,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:635
 #, fuzzy
-msgid "Can't find signature digests"
+msgid "Cannot find signature digests"
 msgstr "Editatu sinadura"
 
 #: camel/camel-smime-context.c:651
@@ -9562,49 +9996,48 @@ msgstr "IMAP komandoak huts egin du: %s"
 
 #: camel/camel-smime-context.c:804
 #, fuzzy, c-format
-msgid "Can't find certificate for `%s'"
+msgid "Cannot find certificate for `%s'"
 msgstr "Huts egin du \"%s\"(r)en ziurtagiria aurkitzean."
 
 #: camel/camel-smime-context.c:811
 #, fuzzy
-msgid "Can't find common bulk encryption algorithm"
+msgid "Cannot find common bulk encryption algorithm"
 msgstr "Huts egin du handizkako algoritmo arrunta aurkitzean."
 
 #. PORT_GetError(); ??
 #: camel/camel-smime-context.c:820
-msgid "Can't allocate slot for encryption bulk key"
+msgid "Cannot allocate slot for encryption bulk key"
 msgstr ""
 
 #: camel/camel-smime-context.c:831
 #, fuzzy
-msgid "Can't create CMS Message"
-msgstr "Sortu _araua mezutik"
+msgid "Cannot create CMS Message"
+msgstr "Ezin da mezua ireki"
 
 #: camel/camel-smime-context.c:837
-msgid "Can't create CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS EnvelopedData"
+msgstr "Ezin da mezua ireki"
 
 #: camel/camel-smime-context.c:843
-msgid "Can't attach CMS EnvelopedData"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS EnvelopedData"
+msgstr "Ezin da %s fitxategia erantsi: %s"
 
 #: camel/camel-smime-context.c:849
-msgid "Can't attach CMS data object"
-msgstr ""
+#, fuzzy
+msgid "Cannot attach CMS data object"
+msgstr "Ezin da %s fitxategia erantsi: %s"
 
 #: camel/camel-smime-context.c:858
-msgid "Can't create CMS RecipientInfo"
-msgstr ""
+#, fuzzy
+msgid "Cannot create CMS RecipientInfo"
+msgstr "Ezin da mezua ireki"
 
 #: camel/camel-smime-context.c:863
-msgid "Can't add CMS RecipientInfo"
+msgid "Cannot add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:877
-#, fuzzy
-msgid "Can't create encoder context"
-msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
-
 #: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
@@ -9651,7 +10084,8 @@ msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
 
-#: camel/camel-store.c:439 camel/camel-vee-store.c:387
+#: camel/camel-store.c:439 camel/camel-vee-store.c:388
+#: camel/providers/local/camel-maildir-store.c:232
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
@@ -9660,8 +10094,8 @@ msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: camel/camel-store.c:779 mail/mail-config.glade.h:95
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:779 mail/em-filter-i18n.h:35
+#: mail/mail-config.glade.h:95 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
 msgstr "ekaina"
@@ -9782,7 +10216,7 @@ msgstr "Gako-erabilerak ez du onartzen ziurtagiri-sinatzea"
 msgid "Error in application verification"
 msgstr "Errorea aplikazioa egiaztatzean"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:826
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9795,11 +10229,11 @@ msgstr ""
 "Hatz-marka:       %s\n"
 "Sinadura:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:832
 msgid "BAD"
 msgstr "TXARRA"
 
@@ -9823,7 +10257,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:835
+#: camel/camel-tcp-stream-ssl.c:836
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9838,7 +10272,7 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: camel/camel-tcp-stream-ssl.c:879
+#: camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9847,7 +10281,7 @@ msgstr ""
 "Ziurtagiri-arazoa: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:931
+#: camel/camel-tcp-stream-ssl.c:932
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9856,7 +10290,7 @@ msgstr ""
 "Ziurtagiri-domeinu txarra: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:949
+#: camel/camel-tcp-stream-ssl.c:950
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9865,7 +10299,7 @@ msgstr ""
 "Ziurtagiria iraungita: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:966
+#: camel/camel-tcp-stream-ssl.c:967
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9874,7 +10308,7 @@ msgstr ""
 "Ziurtagiri-errebokatzeen zerrenda iraungita: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-url.c:290
+#: camel/camel-url.c:292
 #, c-format
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
@@ -9898,7 +10332,7 @@ msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:395
+#: camel/camel-vee-store.c:396
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
@@ -9919,8 +10353,8 @@ msgid "Checking for new mail"
 msgstr "Begiratu mezu berririk dagoen"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:55
-#: camel/providers/imap4/camel-imap4-provider.c:37
 #: camel/providers/imap/camel-imap-provider.c:45
+#: camel/providers/imap4/camel-imap4-provider.c:37
 msgid "Check for new messages in all folders"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
@@ -9952,8 +10386,8 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:100
-#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imap/camel-imap-provider.c:93
+#: camel/providers/imap4/camel-imap4-provider.c:70
 #: camel/providers/imapp/camel-imapp-provider.c:65
 #: camel/providers/nntp/camel-nntp-provider.c:71
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:108
@@ -9974,332 +10408,28 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lainobera itxia"
 
-#: camel/providers/imap4/camel-imap4-command.c:629
-#, fuzzy, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:415
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-engine.c:421
-#, fuzzy, c-format
-msgid "Cannot select folder `%s': Bad command"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1144
-#: camel/providers/imap4/camel-imap4-engine.c:1533
-#: camel/providers/imap4/camel-imap4-engine.c:1560
-#: camel/providers/imap4/camel-imap4-engine.c:1590
-#: camel/providers/imap4/camel-imap4-engine.c:1630
-#, fuzzy, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
-
-#: camel/providers/imap4/camel-imap4-engine.c:1145
-msgid "Got BYE response"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-folder.c:335
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Unknown"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:341
-#, fuzzy, c-format
-msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:476
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Unknown"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:481
-#, fuzzy, c-format
-msgid "Cannot expunge folder `%s': Bad command"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:616
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': No such message"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:621
-#, fuzzy, c-format
-msgid "Cannot get message %s from folder `%s': Bad command"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:746
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Unknown error"
-msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:775
-#, fuzzy, c-format
-msgid "Cannot append message to folder `%s': Bad command"
-msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:854
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:858
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:866
-#, fuzzy, c-format
-msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-folder.c:870
-#, fuzzy, c-format
-msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
-
-#: camel/providers/imap4/camel-imap4-provider.c:40
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Karpetak"
-
-#: camel/providers/imap4/camel-imap4-provider.c:42
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Erakutsi harpidetutako karpetak soilik"
-
-#: camel/providers/imap4/camel-imap4-provider.c:44
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Gainidatzi zerbitzariak emandako karpetaren izen-lekua"
-
-#: camel/providers/imap4/camel-imap4-provider.c:46
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Izen-lekua"
-
-#: camel/providers/imap4/camel-imap4-provider.c:53
-#, fuzzy
-msgid "IMAPv4rev1"
-msgstr "IMAPv4 "
-
-#: camel/providers/imap4/camel-imap4-provider.c:55
-#, fuzzy
-msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
-msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
-
-#: camel/providers/imap4/camel-imap4-provider.c:72
-#, fuzzy
-msgid ""
-"This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
-"pasahitzaren bidez."
-
-#: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:428
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP zerbitzaria"
-
-#: camel/providers/imap4/camel-imap4-store.c:167
-#: camel/providers/imap/camel-imap-store.c:430
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP zerbitzua:  %s - %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:208
-#: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:551
-#: camel/providers/imap/camel-imap-store.c:571
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:209
-#: camel/providers/pop3/camel-pop3-store.c:175
-#: camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/smtp/camel-smtp-transport.c:285
-#, c-format
-msgid "Could not connect to %s (port %d): %s"
-msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:553
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS ez dago erabilgarri"
-
-#: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:568
-#: camel/providers/imap/camel-imap-store.c:845
-#: camel/providers/imapp/camel-imapp-store.c:228
-#: camel/providers/nntp/camel-nntp-store.c:206
-#: camel/providers/nntp/camel-nntp-store.c:224
-#: camel/providers/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Konexioa etenda"
-
-#: camel/providers/imap4/camel-imap4-store.c:261
-#, fuzzy, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:679
-#: camel/providers/imap/camel-imap-store.c:710
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:287
-#: camel/providers/imap/camel-imap-command.c:303
-#: camel/providers/imap/camel-imap-command.c:400
-#: camel/providers/pop3/camel-pop3-store.c:538
-#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1151
-msgid "Unknown error"
-msgstr "Errore ezezaguna"
-
-#: camel/providers/imap4/camel-imap4-store.c:373
-#, fuzzy, c-format
-msgid ""
-"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
-"mekanismoa onartzen."
-
-#: camel/providers/imap4/camel-imap4-store.c:418
-#, fuzzy, c-format
-msgid "%sPlease enter the IMAP password for %s on host %s"
-msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
-
-#: camel/providers/imap4/camel-imap4-store.c:492
-#, fuzzy, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:723
-#, fuzzy, c-format
-msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
-msgstr "Ezin da karpeta atzitu: %s: %s"
-
-#: camel/providers/imap4/camel-imap4-store.c:782
-#: camel/providers/imap/camel-imap-store.c:1885
-#: camel/providers/imap/camel-imap-store.c:2263
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
-
-#: camel/providers/imap4/camel-imap4-store.c:826
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:831
-#, fuzzy, c-format
-msgid "Cannot create folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:859
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Special folder"
-msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
-
-#: camel/providers/imap4/camel-imap4-store.c:891
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:896
-#, fuzzy, c-format
-msgid "Cannot delete folder `%s': Bad command"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1037
-#, c-format
-msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr ""
-
-#: camel/providers/imap4/camel-imap4-store.c:1039
-#, fuzzy
-msgid "Bad command"
-msgstr "Shell komandoa"
-
-#: camel/providers/imap4/camel-imap4-store.c:1100
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1105
-#, fuzzy, c-format
-msgid "Cannot subscribe to folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-store.c:1149
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
-
-#: camel/providers/imap4/camel-imap4-store.c:1154
-#, fuzzy, c-format
-msgid "Cannot unsubscribe from folder `%s': Bad command"
-msgstr ""
-"Ezin izan da `%s' karpeta sortu:\n"
-"%s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:85
-#, fuzzy, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
-
-#: camel/providers/imap4/camel-imap4-utils.c:108
-#, fuzzy
-msgid "No data"
-msgstr "Zereginik ez"
-
-#: camel/providers/imap4/camel-imap4-utils.c:291
-#, fuzzy, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
-
 #: camel/providers/imap/camel-imap-command.c:218
 #: camel/providers/imap/camel-imap-command.c:257
 #: camel/providers/imap/camel-imap-command.c:447
-#: camel/providers/imap/camel-imap-store.c:3194
+#: camel/providers/imap/camel-imap-store.c:3190
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3197
+#: camel/providers/imap/camel-imap-store.c:3193
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
 
+#: camel/providers/imap/camel-imap-command.c:303
+#: camel/providers/imap/camel-imap-command.c:400
+#: camel/providers/imap4/camel-imap4-store.c:297
+#: camel/providers/pop3/camel-pop3-store.c:543
+#: camel/providers/pop3/camel-pop3-store.c:550
+#: camel/providers/pop3/camel-pop3-store.c:556 shell/e-shell.c:1139
+msgid "Unknown error"
+msgstr "Errore ezezaguna"
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10368,7 +10498,7 @@ msgstr ""
 "  %s"
 
 #: camel/providers/imap/camel-imap-folder.c:1977
-#: camel/providers/local/camel-maildir-folder.c:213
+#: camel/providers/local/camel-maildir-folder.c:244
 #: camel/providers/local/camel-mbox-folder.c:418
 #: camel/providers/local/camel-mh-folder.c:202
 msgid "No such message"
@@ -10443,6 +10573,27 @@ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 msgid "Command:"
 msgstr "Shell komandoa"
 
+#: camel/providers/imap/camel-imap-provider.c:55
+#: camel/providers/imap4/camel-imap4-provider.c:40
+#: camel/providers/nntp/camel-nntp-provider.c:41
+msgid "Folders"
+msgstr "Karpetak"
+
+#: camel/providers/imap/camel-imap-provider.c:57
+#: camel/providers/imap4/camel-imap4-provider.c:42
+msgid "Show only subscribed folders"
+msgstr "Erakutsi harpidetutako karpetak soilik"
+
+#: camel/providers/imap/camel-imap-provider.c:59
+#: camel/providers/imap4/camel-imap4-provider.c:44
+msgid "Override server-supplied folder namespace"
+msgstr "Gainidatzi zerbitzariak emandako karpetaren izen-lekua"
+
+#: camel/providers/imap/camel-imap-provider.c:61
+#: camel/providers/imap4/camel-imap4-provider.c:46
+msgid "Namespace"
+msgstr "Izen-lekua"
+
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
@@ -10465,44 +10616,94 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-store.c:680
-#: camel/providers/pop3/camel-pop3-store.c:228
+#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap4/camel-imap4-store.c:175
+#, c-format
+msgid "IMAP server %s"
+msgstr "%s IMAP zerbitzaria"
+
+#: camel/providers/imap/camel-imap-store.c:426
+#: camel/providers/imap4/camel-imap4-store.c:177
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP zerbitzua:  %s - %s"
+
+#: camel/providers/imap/camel-imap-store.c:547
+#: camel/providers/imap/camel-imap-store.c:567
+#: camel/providers/imap4/camel-imap4-store.c:218
+#: camel/providers/imap4/camel-imap4-store.c:235
+#: camel/providers/imapp/camel-imapp-store.c:231
+#: camel/providers/nntp/camel-nntp-store.c:209
+#: camel/providers/pop3/camel-pop3-store.c:175
+#: camel/providers/smtp/camel-smtp-transport.c:269
+#: camel/providers/smtp/camel-smtp-transport.c:285
+#, c-format
+msgid "Could not connect to %s (port %d): %s"
+msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
+
+#: camel/providers/imap/camel-imap-store.c:549
+#: camel/providers/imap4/camel-imap4-store.c:220
+#: camel/providers/pop3/camel-pop3-store.c:177
+#: camel/providers/smtp/camel-smtp-transport.c:271
+#, fuzzy
+msgid "SSL unavailable"
+msgstr "TLS ez dago erabilgarri"
+
+#: camel/providers/imap/camel-imap-store.c:564
+#: camel/providers/imap/camel-imap-store.c:841
+#: camel/providers/imap4/camel-imap4-store.c:232
+#: camel/providers/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:206
+#: camel/providers/nntp/camel-nntp-store.c:224
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Konexioa etenda"
+
+#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:706
+#: camel/providers/imap4/camel-imap4-store.c:296
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
+
+#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/pop3/camel-pop3-store.c:233
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS hedapena ez da onartzen."
 
-#: camel/providers/imap/camel-imap-store.c:711
-#: camel/providers/pop3/camel-pop3-store.c:269
+#: camel/providers/imap/camel-imap-store.c:707
+#: camel/providers/pop3/camel-pop3-store.c:274
 msgid "SSL negotiations failed"
 msgstr "SSL negoziazioek huts egin dute"
 
-#: camel/providers/imap/camel-imap-store.c:848
+#: camel/providers/imap/camel-imap-store.c:844
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ezin da %s(r)ekin konektatu (%d ataka): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1272
+#: camel/providers/imap/camel-imap-store.c:1268
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "%s IMAP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/imap/camel-imap-store.c:1282
+#: camel/providers/imap/camel-imap-store.c:1278
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:1305
+#: camel/providers/imap/camel-imap-store.c:1301
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en IMAP pasahitza"
 
-#: camel/providers/imap/camel-imap-store.c:1319
+#: camel/providers/imap/camel-imap-store.c:1315
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1348
+#: camel/providers/imap/camel-imap-store.c:1344
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10513,30 +10714,292 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1867
-#: camel/providers/imap/camel-imap-store.c:2057
+#: camel/providers/imap/camel-imap-store.c:1863
+#: camel/providers/imap/camel-imap-store.c:2053
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1943
-#: camel/providers/imap/camel-imap-store.c:2324
+#: camel/providers/imap/camel-imap-store.c:1881
+#: camel/providers/imap/camel-imap-store.c:2259
+#: camel/providers/imap4/camel-imap4-store.c:796
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
+
+#: camel/providers/imap/camel-imap-store.c:1939
+#: camel/providers/imap/camel-imap-store.c:2320
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
-#: camel/providers/imap/camel-imap-store.c:1998
-#: camel/providers/local/camel-maildir-store.c:137
+#: camel/providers/imap/camel-imap-store.c:1994
+#: camel/providers/local/camel-maildir-store.c:139
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
 #, fuzzy, c-format
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/providers/imap/camel-imap-store.c:2274
+#: camel/providers/imap/camel-imap-store.c:2270
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Karpeta guraso ezezaguna: %s"
 
+#: camel/providers/imap4/camel-imap4-command.c:550
+#: camel/providers/imap4/camel-imap4-command.c:557
+#, fuzzy, c-format
+msgid "Failed sending command to IMAP server %s: %s"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-command.c:656
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:232
+#, fuzzy, c-format
+msgid "Unexpected greeting from IMAP server %s."
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:416
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-engine.c:422
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:997
+#: camel/providers/imap4/camel-imap4-engine.c:1378
+#: camel/providers/imap4/camel-imap4-engine.c:1405
+#: camel/providers/imap4/camel-imap4-engine.c:1435
+#: camel/providers/imap4/camel-imap4-engine.c:1475
+#, fuzzy, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:998
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:359
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:365
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:502
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:507
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:697
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:702
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:827
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:856
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:935
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:939
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:947
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:951
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "IMAP zerbitzarietako posta irakurri eta gordetzeko."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
+"pasahitzaren bidez."
+
+#: camel/providers/imap4/camel-imap4-store.c:271
+#, fuzzy, c-format
+msgid ""
+"Failed to connect to IMAP server %s in secure mode: Server does not support "
+"STARTTLS"
+msgstr "Huts egin du %s IMAP zerbitzariarekin modu seguruan konektatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:383
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
+"mekanismoa onartzen."
+
+#: camel/providers/imap4/camel-imap4-store.c:428
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
+
+#: camel/providers/imap4/camel-imap4-store.c:502
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:733
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:847
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:853
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:884
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+
+#: camel/providers/imap4/camel-imap4-store.c:943
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:948
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:968
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Special folder"
+msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+
+#: camel/providers/imap4/camel-imap4-store.c:1000
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1005
+#, fuzzy, c-format
+msgid "Cannot rename folder `%s' to `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1253
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1255
+#, fuzzy
+msgid "Bad command"
+msgstr "Shell komandoa"
+
+#: camel/providers/imap4/camel-imap4-store.c:1331
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1336
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1396
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1401
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:250
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:273
+#, fuzzy
+msgid "No data"
+msgstr "Zereginik ez"
+
+#: camel/providers/imap4/camel-imap4-utils.c:456
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %s"
+
 #: camel/providers/imapp/camel-imapp-provider.c:39
 #: camel/providers/pop3/camel-pop3-provider.c:38
 msgid "Message storage"
@@ -10703,18 +11166,26 @@ msgstr "Ezin izan da laburpena gorde: %s: %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
-#: camel/providers/local/camel-maildir-folder.c:183
+#. Inbox is always first
+#: camel/providers/local/camel-maildir-folder.c:74
+#: camel/providers/local/camel-maildir-store.c:232
+#: camel/providers/local/camel-maildir-store.c:248
+#: mail/em-folder-tree-model.c:212 mail/em-folder-tree-model.c:214
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: camel/providers/local/camel-maildir-folder.c:214
 msgid "Maildir append message cancelled"
 msgstr "Maildir mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-maildir-folder.c:186
+#: camel/providers/local/camel-maildir-folder.c:217
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: %s"
 
-#: camel/providers/local/camel-maildir-folder.c:212
-#: camel/providers/local/camel-maildir-folder.c:226
-#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-maildir-folder.c:243
+#: camel/providers/local/camel-maildir-folder.c:257
+#: camel/providers/local/camel-maildir-folder.c:266
 #: camel/providers/local/camel-mbox-folder.c:417
 #: camel/providers/local/camel-mbox-folder.c:436
 #: camel/providers/local/camel-mbox-folder.c:467
@@ -10730,25 +11201,25 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-maildir-folder.c:236
+#: camel/providers/local/camel-maildir-folder.c:267
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
-#: camel/providers/local/camel-maildir-store.c:107
+#: camel/providers/local/camel-maildir-store.c:109
 #: camel/providers/local/camel-mbox-store.c:154
 #: camel/providers/local/camel-mh-store.c:204
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': %s"
 msgstr "Ezin da karpeta atzitu: %s: %s"
 
-#: camel/providers/local/camel-maildir-store.c:111
+#: camel/providers/local/camel-maildir-store.c:113
 #: camel/providers/local/camel-mbox-store.c:162
 #: camel/providers/local/camel-mh-store.c:211
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': folder does not exist."
 msgstr "`%s' karpeta ez dago."
 
-#: camel/providers/local/camel-maildir-store.c:119
+#: camel/providers/local/camel-maildir-store.c:121
 #: camel/providers/local/camel-mbox-store.c:184
 #: camel/providers/local/camel-mbox-store.c:196
 #, fuzzy, c-format
@@ -10757,23 +11228,23 @@ msgstr ""
 "Ezin izan da `%s' karpeta sortu:\n"
 "%s"
 
-#: camel/providers/local/camel-maildir-store.c:134
+#: camel/providers/local/camel-maildir-store.c:136
 #, fuzzy, c-format
 msgid "Cannot get folder `%s': not a maildir directory."
 msgstr "`%s' ez da maildir direktorioa."
 
-#: camel/providers/local/camel-maildir-store.c:173
-#: camel/providers/local/camel-maildir-store.c:211
+#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:213
 #: camel/providers/local/camel-mh-store.c:260
 #, c-format
 msgid "Could not delete folder `%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: camel/providers/local/camel-maildir-store.c:175
+#: camel/providers/local/camel-maildir-store.c:177
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: camel/providers/local/camel-maildir-store.c:340
+#: camel/providers/local/camel-maildir-store.c:355
 #: camel/providers/local/camel-spool-store.c:284
 #: camel/providers/local/camel-spool-store.c:314
 #, c-format
@@ -11372,20 +11843,25 @@ msgstr ""
 msgid "Could not connect to POP server %s (port %d): %s"
 msgstr "Ezin da %s POP zerbitzariarekin konektatu (%d ataka): %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:227
-#: camel/providers/pop3/camel-pop3-store.c:256
-#: camel/providers/pop3/camel-pop3-store.c:268
+#: camel/providers/pop3/camel-pop3-store.c:214
+#, fuzzy, c-format
+msgid "Failed to read a valid greeting from POP server %s (port %d)"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:232
+#: camel/providers/pop3/camel-pop3-store.c:261
+#: camel/providers/pop3/camel-pop3-store.c:273
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Huts egin du %s POP zerbitzariarekin modu seguruan konektatzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:366
+#: camel/providers/pop3/camel-pop3-store.c:371
 #, c-format
 msgid "Could not connect to POP server %s"
 msgstr "Ezin izan da %s POP zerbitzariarekin konektatu"
 
-#: camel/providers/pop3/camel-pop3-store.c:407
-#: camel/providers/pop3/camel-pop3-store.c:521
+#: camel/providers/pop3/camel-pop3-store.c:412
+#: camel/providers/pop3/camel-pop3-store.c:526
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -11394,28 +11870,28 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
 "mekanismoa onartzen."
 
-#: camel/providers/pop3/camel-pop3-store.c:423
+#: camel/providers/pop3/camel-pop3-store.c:428
 #, c-format
 msgid "SASL `%s' Login failed for POP server %s: %s"
 msgstr "SASL `%s' saio-hasierak huts egin du %s POP zerbitzarian: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:435
+#: camel/providers/pop3/camel-pop3-store.c:440
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ezin da %s POP zerbitzarian saioa hasi: SASL protokolo-errorea"
 
-#: camel/providers/pop3/camel-pop3-store.c:454
+#: camel/providers/pop3/camel-pop3-store.c:459
 #, c-format
 msgid "Failed to authenticate on POP server %s: %s"
 msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:480
+#: camel/providers/pop3/camel-pop3-store.c:485
 #, fuzzy, c-format
 msgid "%sPlease enter the POP password for %s on host %s"
 msgstr "%sIdatzi %s@%s(r)en POP pasahitza"
 
-#: camel/providers/pop3/camel-pop3-store.c:535
-#: camel/providers/pop3/camel-pop3-store.c:542
+#: camel/providers/pop3/camel-pop3-store.c:540
+#: camel/providers/pop3/camel-pop3-store.c:553
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -11424,7 +11900,16 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: camel/providers/pop3/camel-pop3-store.c:641
+#: camel/providers/pop3/camel-pop3-store.c:547
+#, fuzzy, c-format
+msgid ""
+"Unable to connect to POP server %s.\n"
+"Error sending username: %s"
+msgstr ""
+"Ezin da %s POP zerbitzariarekin konektatu.\n"
+"Errorea pasahitza bidaltzean: %s"
+
+#: camel/providers/pop3/camel-pop3-store.c:652
 #, c-format
 msgid "No such folder `%s'."
 msgstr "`%s' karpeta ez dago."
@@ -11639,97 +12124,97 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:666
+#: camel/providers/smtp/camel-smtp-transport.c:657
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:668
+#: camel/providers/smtp/camel-smtp-transport.c:659
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:686
+#: camel/providers/smtp/camel-smtp-transport.c:677
 #, fuzzy
 msgid "Cannot send message: service not connected."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:692
+#: camel/providers/smtp/camel-smtp-transport.c:683
 msgid "Cannot send message: sender address not valid."
 msgstr "Ezin da mezua bidali: bidaltzailearen helbidea ez da baliozkoa."
 
-#: camel/providers/smtp/camel-smtp-transport.c:696
+#: camel/providers/smtp/camel-smtp-transport.c:687
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:711
+#: camel/providers/smtp/camel-smtp-transport.c:702
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:722
+#: camel/providers/smtp/camel-smtp-transport.c:713
 msgid "Cannot send message: one or more invalid recipients"
 msgstr "Ezin da mezua bidali: erabiltzaile bat edo gehiago baliogabeak dira"
 
-#: camel/providers/smtp/camel-smtp-transport.c:894
+#: camel/providers/smtp/camel-smtp-transport.c:885
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:943
+#: camel/providers/smtp/camel-smtp-transport.c:934
 #, fuzzy, c-format
 msgid "HELO command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:960
+#: camel/providers/smtp/camel-smtp-transport.c:951
 #, fuzzy
 msgid "HELO command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1026
+#: camel/providers/smtp/camel-smtp-transport.c:1017
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1032
+#: camel/providers/smtp/camel-smtp-transport.c:1023
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1049
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1040
+#: camel/providers/smtp/camel-smtp-transport.c:1051
 #, fuzzy, c-format
 msgid "AUTH command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1066
+#: camel/providers/smtp/camel-smtp-transport.c:1057
 #, fuzzy
 msgid "AUTH command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1128
+#: camel/providers/smtp/camel-smtp-transport.c:1119
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1153
+#: camel/providers/smtp/camel-smtp-transport.c:1144
 #, fuzzy, c-format
 msgid "MAIL FROM command failed: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1170
+#: camel/providers/smtp/camel-smtp-transport.c:1161
 #, fuzzy
 msgid "MAIL FROM command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1194
+#: camel/providers/smtp/camel-smtp-transport.c:1185
 #, fuzzy, c-format
 msgid "RCPT TO command failed: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1213
+#: camel/providers/smtp/camel-smtp-transport.c:1204
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> eskaerak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1252
-#: camel/providers/smtp/camel-smtp-transport.c:1310
-#: camel/providers/smtp/camel-smtp-transport.c:1329
+#: camel/providers/smtp/camel-smtp-transport.c:1243
+#: camel/providers/smtp/camel-smtp-transport.c:1301
+#: camel/providers/smtp/camel-smtp-transport.c:1320
 #, fuzzy, c-format
 msgid "DATA command failed: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -11737,28 +12222,28 @@ msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
 #. we should have gotten instructions on how to use the DATA command:
 #. * 354 Enter mail, end with "." on a line by itself
 #.
-#: camel/providers/smtp/camel-smtp-transport.c:1269
-#: camel/providers/smtp/camel-smtp-transport.c:1345
+#: camel/providers/smtp/camel-smtp-transport.c:1260
+#: camel/providers/smtp/camel-smtp-transport.c:1336
 #, fuzzy
 msgid "DATA command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1368
+#: camel/providers/smtp/camel-smtp-transport.c:1359
 #, fuzzy, c-format
 msgid "RSET command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1384
+#: camel/providers/smtp/camel-smtp-transport.c:1375
 #, fuzzy
 msgid "RSET command failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1407
+#: camel/providers/smtp/camel-smtp-transport.c:1398
 #, fuzzy, c-format
 msgid "QUIT command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1412
 #, fuzzy
 msgid "QUIT command failed"
 msgstr "IMAP komandoak huts egin du: %s"
@@ -11822,98 +12307,6 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer.c:704
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
-
-#: composer/e-msg-composer.c:711
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for this "
-"account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
-
-#: composer/e-msg-composer.c:1283
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ezin da mezua ireki"
-
-#: composer/e-msg-composer.c:1291
-msgid "Unable to retrieve message from editor"
-msgstr "Ezin da mezua eskuratu editoretik"
-
-#: composer/e-msg-composer.c:1561
-msgid "Untitled Message"
-msgstr "Mezu izengabea"
-
-#: composer/e-msg-composer.c:1591
-msgid "Open file"
-msgstr "Ireki fitxategia"
-
-#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
-msgid "Autogenerated"
-msgstr "Automatikoki sortua"
-
-#: composer/e-msg-composer.c:2097
-msgid "Signature:"
-msgstr "Sinadura:"
-
-#: composer/e-msg-composer.c:2298
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2327
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
-#: composer/e-msg-composer.c:3114
-msgid "Compose a message"
-msgstr "Prestatu mezua"
-
-#: composer/e-msg-composer.c:3147
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da helbidea hautatzeko kontrola aktibatu."
-
-#: composer/e-msg-composer.c:3175
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component.\n"
-"Please make sure you have the correct version\n"
-"of gtkhtml and libgtkhtml installed.\n"
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da HTML editorearen osagaia aktibatu.\n"
-"Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
-"bertsio zuzena duzula instalatuta.\n"
-
-#: composer/e-msg-composer.c:3279
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da HTML editorearen osagaia aktibatu."
-
-#: composer/e-msg-composer.c:4284
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak).<b>"
-
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Bidalketa-helburua"
@@ -11996,17 +12389,89 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategia(k)"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ezin da mezua ireki"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ezin da mezua eskuratu editoretik"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Mezu izengabea"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Ireki fitxategia"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1491
+msgid "Autogenerated"
+msgstr "Automatikoki sortua"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Sinadura:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] ""
+msgstr[1] ""
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3286
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3178
+#: composer/e-msg-composer.c:3179
+msgid "Compose a message"
+msgstr "Prestatu mezua"
+
+#: composer/e-msg-composer.c:2649
+#, fuzzy, c-format
+msgid "Attached message - %s"
+msgstr "Birbidalitako mezua - %s"
+
+#. translators, this count will always be >1
+#: composer/e-msg-composer.c:2654 composer/e-msg-composer.c:2798
+#, fuzzy, c-format
+msgid "Attached message"
+msgid_plural "%d attached messages"
+msgstr[0] "Erantsi jatorrizko mezua"
+msgstr[1] "Erantsi jatorrizko mezua"
+
+#: composer/e-msg-composer.c:4332
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak).<b>"
+
 #. mail-composer:no-attach primary
 #: composer/mail-composer-errors.xml.h:2
 #, fuzzy
 msgid "You cannot attach the file `{0}' to this message."
 msgstr "Erantsi fitxategi bat mezuari"
 
-#. mail-composer:no-attach secondary
-#: composer/mail-composer-errors.xml.h:4 mail/mail-errors.xml.h:92
-msgid "{1}"
-msgstr ""
-
 #. mail-composer:attach-notfile primary
 #: composer/mail-composer-errors.xml.h:6
 msgid "The file `{0}' is not a regular file and cannot be sent in a message."
@@ -12024,54 +12489,68 @@ msgid ""
 "directory individually, or create an archive of the directory and attach it."
 msgstr ""
 
-#. mail-composer:recover-autosave title
+#. mail-composer:attach-nomessages primary
 #: composer/mail-composer-errors.xml.h:12
 #, fuzzy
+msgid "Could not retrieve messages to attach from {0}."
+msgstr "Ezin izan da kanalizaziorik sortu: %s"
+
+#. mail-composer:attach-nomessages secondary
+#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:42 mail/mail-errors.xml.h:100
+#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
+#: widgets/misc/e-system-errors.xml.h:15
+msgid "Because \"{1}\"."
+msgstr ""
+
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:16
+#, fuzzy
 msgid "Unfinished messages found"
 msgstr "Hurrengo _irakurri gabeko mezua"
 
 #. mail-composer:recover-autosave primary
-#: composer/mail-composer-errors.xml.h:14
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
 msgid "Do you want to recover unfinished messages?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
 #. mail-composer:recover-autosave secondary
-#: composer/mail-composer-errors.xml.h:16
+#: composer/mail-composer-errors.xml.h:20
 msgid ""
 "Evolution quit unexpectedly while you were composing a new message. "
 "Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:17
+#: composer/mail-composer-errors.xml.h:21
 #, fuzzy
 msgid "Don't Recover"
 msgstr "Ez inportatu"
 
-#: composer/mail-composer-errors.xml.h:18
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Recover"
 msgstr "Kendu"
 
 #. mail-composer:no-autosave primary
-#: composer/mail-composer-errors.xml.h:20
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
 #. mail-composer:no-autosave secondary
-#: composer/mail-composer-errors.xml.h:22
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Errorea lasterbideak gordetzean."
 
 #. mail-composer:exit-unsaved title
-#: composer/mail-composer-errors.xml.h:24
+#: composer/mail-composer-errors.xml.h:28
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
 #. mail-composer:exit-unsaved primary
-#: composer/mail-composer-errors.xml.h:26
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
@@ -12079,57 +12558,74 @@ msgid ""
 msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
 
 #. mail-composer:exit-unsaved secondary
-#: composer/mail-composer-errors.xml.h:28
+#: composer/mail-composer-errors.xml.h:32
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.h:29
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Ez gorde"
-
-#: composer/mail-composer-errors.xml.h:30
+#: composer/mail-composer-errors.xml.h:34
 #, fuzzy
 msgid "Save Message"
 msgstr "Gorde mezua honela..."
 
 #. mail-composer:no-build-message primary
-#: composer/mail-composer-errors.xml.h:32
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
 msgid "Could not create message."
 msgstr "Ezin izan da kanalizaziorik sortu: %s"
 
 #. mail-composer:no-build-message secondary
-#: composer/mail-composer-errors.xml.h:34
+#: composer/mail-composer-errors.xml.h:38
 msgid "Because \"{0}\", you may need to select different mail options."
 msgstr ""
 
 #. mail-composer:no-sig-file primary
-#: composer/mail-composer-errors.xml.h:36
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
 msgid "Could not read signature file \"{0}\"."
 msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
-#. mail-composer:no-sig-file secondary
-#: composer/mail-composer-errors.xml.h:38 mail/mail-errors.xml.h:100
-#: mail/mail-errors.xml.h:112 widgets/misc/e-system-errors.xml.h:11
-#: widgets/misc/e-system-errors.xml.h:15
-msgid "Because \"{1}\"."
-msgstr ""
-
 #. mail-composer:all-accounts-deleted primary
-#: composer/mail-composer-errors.xml.h:40
+#: composer/mail-composer-errors.xml.h:44
 msgid "All accounts have been removed."
 msgstr ""
 
 #. mail-composer:all-accounts-deleted secondary
-#: composer/mail-composer-errors.xml.h:42
+#: composer/mail-composer-errors.xml.h:46
 msgid "You need to configure an account before you can compose mail."
 msgstr "Kontu bat konfiguratu behar duzu mezuak idatzi ahal izateko."
 
+#. mail-composer:no-address-control primary
+#: composer/mail-composer-errors.xml.h:48
+#: composer/mail-composer-errors.xml.h:52
+#, fuzzy
+msgid "Could not create composer window."
+msgstr "Ezin izan da kanalizaziorik sortu: %s"
+
+#. mail-composer:no-address-control secondary
+#: composer/mail-composer-errors.xml.h:50
+#, fuzzy
+msgid "Unable to activate the address selector control."
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da helbidea hautatzeko kontrola aktibatu."
+
+#. mail-composer:no-editor-control secondary
+#: composer/mail-composer-errors.xml.h:54
+#, fuzzy
+msgid ""
+"Unable to activate the HTML editor control.\n"
+"\n"
+"Please make sure that you have the correct version of gtkhtml and libgtkhtml "
+"installed."
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da HTML editorearen osagaia aktibatu.\n"
+"Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
+"bertsio zuzena duzula instalatuta.\n"
+
 #: data/evolution.desktop.in.in.h:1
 #, fuzzy
 msgid "The Ximian Evolution Groupware Suite"
@@ -12433,11 +12929,6 @@ msgstr "%Y-%b-%d"
 msgid "Select a time to compare against"
 msgstr "Hautatu ordua"
 
-#: filter/filter-editor.c:147
-#, fuzzy
-msgid "_Filter Rules"
-msgstr "Iragazteko arauak"
-
 #. filter:no-date primary
 #: filter/filter-errors.xml.h:2
 #, fuzzy
@@ -12466,19 +12957,8 @@ msgstr "Fitxategi-izen bat zehaztu behar duzu."
 msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
 
-#. filter:no-folder primary
-#: filter/filter-errors.xml.h:14
-#, fuzzy
-msgid "Missing folder."
-msgstr "%s karpeta kentzen"
-
-#. filter:no-folder secondary
-#: filter/filter-errors.xml.h:16
-msgid "You must specify a folder."
-msgstr "Karpeta bat zehaztu behar duzu."
-
 #. filter:bad-regexp primary
-#: filter/filter-errors.xml.h:18
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Bad regular expression \"{0}\"."
 msgstr ""
@@ -12486,159 +12966,37 @@ msgstr ""
 "%s"
 
 #. filter:bad-regexp secondary
-#: filter/filter-errors.xml.h:20
+#: filter/filter-errors.xml.h:16
 msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
 #. filter:no-name primary
-#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#: filter/filter-errors.xml.h:18 mail/mail-errors.xml.h:214
 #, fuzzy
 msgid "Missing name."
 msgstr "Esleipena"
 
 #. filter:no-name secondary
-#: filter/filter-errors.xml.h:24
+#: filter/filter-errors.xml.h:20
 msgid "You must name this filter."
 msgstr "Iragazkiari izena eman behar diozu."
 
-#. filter:no-name-vfolder secondary
-#: filter/filter-errors.xml.h:28
-#, fuzzy
-msgid "You must name this vFolder."
-msgstr "Karpeta birtualari izena eman behar diozu."
-
 #. filter:bad-name-notunique primary
-#: filter/filter-errors.xml.h:30
+#: filter/filter-errors.xml.h:22
 msgid "Name \"{0}\" already used."
 msgstr ""
 
 #. filter:bad-name-notunique secondary
-#: filter/filter-errors.xml.h:32
+#: filter/filter-errors.xml.h:24
 msgid "Please choose another name."
 msgstr ""
 
-#. filter:vfolder-no-source primary
-#: filter/filter-errors.xml.h:34
-#, fuzzy
-msgid "No sources selected."
-msgstr "Ez da zerbitzaririk hautatu"
-
-#. filter:vfolder-no-source secondary
-#: filter/filter-errors.xml.h:36
-msgid ""
-"You must specify at least one folder as a source.\n"
-"Either by selecting the folders individually, and/or by selecting\n"
-"all local folders, all remote folders, or both."
-msgstr ""
-
 #: filter/filter-file.c:288
 msgid "Choose a file"
 msgstr "Aukeratu fitxategi bat"
 
-#. and now for the action area
-#: filter/filter-filter.c:491
-#, fuzzy
-msgid "<b>Then</b>"
-msgstr "<b>Falta:</b> "
-
-#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
-#: mail/mail-account-gui.c:1347
-msgid "Select Folder"
-msgstr "Hautatu karpeta"
-
-#: filter/filter.glade.h:1 mail/mail-config.glade.h:1
-#, fuzzy
-msgid "    "
-msgstr "      "
-
-#: filter/filter.glade.h:2
-#, fuzzy
-msgid "<b>_Filter Rules</b>"
-msgstr "Iragazteko arauak"
-
-#: filter/filter.glade.h:3
-#, fuzzy
-msgid "<b>vFolder Sources</b>"
-msgstr "Karpeta birtualen iturburuak"
-
-#: filter/filter.glade.h:4
-msgid "Compare against"
-msgstr "Konparazio-ordua:"
-
-#: filter/filter.glade.h:5
-msgid "Incoming"
-msgstr "Sarrerakoa"
-
-#: filter/filter.glade.h:6
-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."
-
-#: filter/filter.glade.h:8
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Mezuaren data iragazketa gertatzen den\n"
-"orduarekiko erlazioan konparatuko da."
-
-#: filter/filter.glade.h:10
-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."
-
-#: filter/filter.glade.h:13
-msgid "a time relative to the current time"
-msgstr "uneko orduarekiko erlatiboa den ordua"
-
-#: filter/filter.glade.h:14
-msgid "ago"
-msgstr "lehenago"
-
-#: filter/filter.glade.h:18
-msgid "months"
-msgstr "hilabete"
-
-#: filter/filter.glade.h:19 mail/mail-config.glade.h:184
-msgid "seconds"
-msgstr "segundo igarotakoan"
-
-#: filter/filter.glade.h:20
-msgid "specific folders only"
-msgstr "zehaztutako karpetak bakarrik"
-
-#: filter/filter.glade.h:21
-msgid "the current time"
-msgstr "uneko ordua"
-
-#: filter/filter.glade.h:22
-msgid "the time you specify"
-msgstr "zuk zehaztutako ordua"
-
-#: filter/filter.glade.h:24
-msgid "with all active remote folders"
-msgstr "urruneko karpeta aktibo guztiekin"
-
-#: filter/filter.glade.h:25
-msgid "with all local and active remote folders"
-msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
-
-#: filter/filter.glade.h:26
-msgid "with all local folders"
-msgstr "karpeta lokal guztiekin"
-
-#: filter/filter.glade.h:27
-msgid "years"
-msgstr "urte"
-
-#: filter/filter-label.c:121 mail/em-migrate.c:1011 mail/mail-config.c:76
-#: mail/mail-config.glade.h:93
+#: filter/filter-label.c:121 mail/em-filter-i18n.h:26 mail/em-migrate.c:1011
+#: mail/mail-config.c:76 mail/mail-config.glade.h:93
 msgid "Important"
 msgstr "Garrantzitsua"
 
@@ -12708,6 +13066,71 @@ msgstr "sarrerakoa"
 msgid "outgoing"
 msgstr "irteerakoa"
 
+#: filter/filter.glade.h:1
+#, fuzzy
+msgid "<b>_Filter Rules</b>"
+msgstr "Iragazteko arauak"
+
+#: filter/filter.glade.h:2
+msgid "Compare against"
+msgstr "Konparazio-ordua:"
+
+#: filter/filter.glade.h:3
+msgid "Incoming"
+msgstr "Sarrerakoa"
+
+#: filter/filter.glade.h:4
+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."
+
+#: filter/filter.glade.h:6
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Mezuaren data iragazketa gertatzen den\n"
+"orduarekiko erlazioan konparatuko da."
+
+#: filter/filter.glade.h:8
+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."
+
+#: filter/filter.glade.h:11
+msgid "a time relative to the current time"
+msgstr "uneko orduarekiko erlatiboa den ordua"
+
+#: filter/filter.glade.h:12
+msgid "ago"
+msgstr "lehenago"
+
+#: filter/filter.glade.h:16
+msgid "months"
+msgstr "hilabete"
+
+#: filter/filter.glade.h:17 mail/mail-config.glade.h:184
+msgid "seconds"
+msgstr "segundo igarotakoan"
+
+#: filter/filter.glade.h:18
+msgid "the current time"
+msgstr "uneko ordua"
+
+#: filter/filter.glade.h:19
+msgid "the time you specify"
+msgstr "zuk zehaztutako ordua"
+
+#: filter/filter.glade.h:21
+msgid "years"
+msgstr "urte"
+
 #: filter/rule-editor.c:285
 msgid "Add Rule"
 msgstr "Gehitu araua"
@@ -12720,60 +13143,73 @@ msgstr "Editatu araua"
 msgid "Rule name"
 msgstr "Arau-izena"
 
-#: filter/score-editor.c:110
-#, fuzzy
-msgid "_Score Rules"
-msgstr "Puntuazio-arauak"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: filter/score-rule.c:184 filter/score-rule.c:186
-#: mail/message-list.etspec.h:10
-msgid "Score"
-msgstr "Puntuazioa"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Mezuak prestatzeko hobespenak"
 
-#: filter/searchtypes.xml.h:1
-msgid "Body contains"
-msgstr "gorputzak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
+"besteak beste."
 
-#: filter/searchtypes.xml.h:2
-msgid "Body does not contain"
-msgstr "gorputzak ez dauka hau"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
 
-#: filter/searchtypes.xml.h:3
-msgid "Body or subject contains"
-msgstr "gorputzak edo gaiak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfiguratu hemen zure posta-kontuak"
 
-#: filter/searchtypes.xml.h:4
-msgid "Message contains"
-msgstr "mezuak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution-en posta"
 
-#: filter/searchtypes.xml.h:5
-msgid "Recipients contain"
-msgstr "hartzaileak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en postako kontuak konfiguratzeko kontrola"
 
-#: filter/searchtypes.xml.h:6
-msgid "Sender contains"
-msgstr "bidaltzaileak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution-en postaren osagaiak"
 
-#: filter/searchtypes.xml.h:7
-msgid "Subject contains"
-msgstr "gaiak hau dauka"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea"
 
-#: filter/searchtypes.xml.h:8
-msgid "Subject does not contain"
-msgstr "gaiak ez dauka hau"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
 
-#: filter/vfolder-editor.c:108
-#, fuzzy
-msgid "Virtual _Folders"
-msgstr "Karpeta birtualak"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren hobespenen kontrola"
 
-#: filter/vfolder-rule.c:493
-msgid "_Add"
-msgstr "_Gehitu"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-view.c:418
+#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:506
+#: mail/mail-component.c:559
+msgid "Mail"
+msgstr "Posta"
 
-#: filter/vfolder-rule.c:573
-msgid "VFolder source"
-msgstr "Karpeta birtualen iturburua"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Posta-kontuak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
+msgid "Mail Preferences"
+msgstr "Posta-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Posta:"
 
 #. translators: default account indicator
 #: mail/em-account-prefs.c:418
@@ -12806,53 +13242,313 @@ msgstr "_Gehitu sinadura"
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
-#: mail/em-composer-utils.c:888
+#: mail/em-composer-utils.c:887
 #, fuzzy
 msgid "-------- Forwarded Message --------"
 msgstr "Birbidalitako mezua"
 
-#: mail/em-composer-utils.c:1495
+#: mail/em-composer-utils.c:1500
 msgid "an unknown sender"
 msgstr "bidaltzaile ezezaguna"
 
-#. translators: attribution string used when quoting messages,
-#. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1505
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#. Note to translators: this is the attribution string used when quoting messages.
+#. * each ${Variable} gets replaced with a value. To see a full list of available
+#. * variables, see em-composer-utils.c:1514
+#: mail/em-composer-utils.c:1547
+msgid ""
+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
+"${TimeZone}, ${Sender} wrote:"
 msgstr ""
-"Jatorrizko mezua:\n"
-"data: %a, %Y-%m-%d %H:%M, egilea: %%s"
+
+#: mail/em-filter-editor.c:147
+#, fuzzy
+msgid "_Filter Rules"
+msgstr "Iragazteko arauak"
+
+#: mail/em-filter-folder-element.c:237 mail/em-vfolder-rule.c:494
+#: mail/mail-account-gui.c:1347
+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 "Assign Color"
+msgstr "Esleitu kolorea"
+
+#: mail/em-filter-i18n.h:4
+msgid "Assign Score"
+msgstr "Esleitu puntuazioa"
+
+#: mail/em-filter-i18n.h:5
+msgid "Attachments"
+msgstr "Eranskinak"
+
+#: mail/em-filter-i18n.h:6
+msgid "Beep"
+msgstr "Soinu-seinalea"
+
+#: mail/em-filter-i18n.h:7
+msgid "contains"
+msgstr "hau daukana"
+
+#: mail/em-filter-i18n.h:8
+msgid "Copy to Folder"
+msgstr "Kopiatu karpeta honetara"
+
+#: mail/em-filter-i18n.h:9
+msgid "Date received"
+msgstr "Jasotze-data"
+
+#: mail/em-filter-i18n.h:10
+msgid "Date sent"
+msgstr "Bidaltze-data"
+
+#: mail/em-filter-i18n.h:12
+msgid "Deleted"
+msgstr "Ezabatuta"
+
+#: mail/em-filter-i18n.h:13
+msgid "does not contain"
+msgstr "hau ez daukana"
+
+#: mail/em-filter-i18n.h:14
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
+
+#: mail/em-filter-i18n.h:15
+msgid "does not exist"
+msgstr "ez dago"
+
+#: mail/em-filter-i18n.h:16
+msgid "does not return"
+msgstr "ez du hau ematen"
+
+#: mail/em-filter-i18n.h:17
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
+
+#: mail/em-filter-i18n.h:18
+msgid "does not start with"
+msgstr "ez da honela hasten"
+
+#: mail/em-filter-i18n.h:19
+msgid "Do Not Exist"
+msgstr "Ez"
+
+#: mail/em-filter-i18n.h:20
+msgid "Draft"
+msgstr "Zirriborroa"
+
+#: mail/em-filter-i18n.h:21
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: mail/em-filter-i18n.h:22
+msgid "Exist"
+msgstr "Bai"
+
+#: mail/em-filter-i18n.h:23
+msgid "exists"
+msgstr "badago"
+
+#: mail/em-filter-i18n.h:24
+msgid "Expression"
+msgstr "Adierazpena"
+
+#: mail/em-filter-i18n.h:25
+msgid "Follow Up"
+msgstr "Jarraipena"
+
+#: mail/em-filter-i18n.h:27
+msgid "is"
+msgstr "da"
+
+#: mail/em-filter-i18n.h:28
+msgid "is after"
+msgstr "honen ondorengoa da"
+
+#: mail/em-filter-i18n.h:29
+msgid "is before"
+msgstr "honen aurrekoa da"
+
+#: mail/em-filter-i18n.h:30
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: mail/em-filter-i18n.h:31
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
+
+#: mail/em-filter-i18n.h:32
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
+
+#: mail/em-filter-i18n.h:33
+msgid "is not"
+msgstr "ez da"
+
+#: mail/em-filter-i18n.h:34
+msgid "is not Flagged"
+msgstr "ez da Banderaduna"
+
+#: mail/em-filter-i18n.h:36
+#, fuzzy
+msgid "Junk Test"
+msgstr "ekaina"
+
+#: mail/em-filter-i18n.h:37 mail/em-folder-view.c:931
+#: widgets/misc/e-expander.c:189
+msgid "Label"
+msgstr "Etiketa"
+
+#: mail/em-filter-i18n.h:38
+msgid "Mailing list"
+msgstr "Posta-zerrenda"
+
+#: mail/em-filter-i18n.h:39
+msgid "Message Body"
+msgstr "Mezuaren gorputza"
+
+#: mail/em-filter-i18n.h:40
+msgid "Message Header"
+msgstr "Mezuaren goiburua"
+
+#: mail/em-filter-i18n.h:41
+#, fuzzy
+msgid "Message is Junk"
+msgstr "Mezuak"
+
+#: mail/em-filter-i18n.h:42
+#, fuzzy
+msgid "Message is not Junk"
+msgstr "Bidali beharreko mezua"
+
+#: mail/em-filter-i18n.h:43
+msgid "Move to Folder"
+msgstr "Eraman karpeta honetara"
+
+#: mail/em-filter-i18n.h:44
+#, fuzzy
+msgid "Pipe to Program"
+msgstr "Programatik irten"
+
+#: mail/em-filter-i18n.h:45
+msgid "Play Sound"
+msgstr "Jo soinua"
+
+#: mail/em-filter-i18n.h:46 mail/message-tag-followup.c:79
+msgid "Read"
+msgstr "Irakurrita"
+
+#: mail/em-filter-i18n.h:47
+msgid "Recipients"
+msgstr "Hartzailea"
+
+#: mail/em-filter-i18n.h:48
+msgid "Regex Match"
+msgstr "Adierazpen erregularra"
+
+#: mail/em-filter-i18n.h:49
+msgid "Replied to"
+msgstr "Erantzunda"
+
+#: mail/em-filter-i18n.h:50
+msgid "returns"
+msgstr "hau ematen du"
+
+#: mail/em-filter-i18n.h:51
+msgid "returns greater than"
+msgstr "hau baino handiagoa ematen du"
+
+#: mail/em-filter-i18n.h:52
+msgid "returns less than"
+msgstr "hau baino txikiagoa ematen du"
+
+#: mail/em-filter-i18n.h:53
+#, fuzzy
+msgid "Run Program"
+msgstr "Ireki programa:"
+
+#: mail/em-filter-i18n.h:54 mail/message-list.etspec.h:10
+msgid "Score"
+msgstr "Puntuazioa"
+
+#: mail/em-filter-i18n.h:55
+msgid "Sender"
+msgstr "Bidaltzailea"
+
+#: mail/em-filter-i18n.h:56
+msgid "Set Status"
+msgstr "Ezarri egoera"
+
+#: mail/em-filter-i18n.h:57
+msgid "Size (kB)"
+msgstr "Tamaina (kB)"
+
+#: mail/em-filter-i18n.h:58
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: mail/em-filter-i18n.h:59
+msgid "Source Account"
+msgstr "Iturburu-kontua"
+
+#: mail/em-filter-i18n.h:60
+msgid "Specific header"
+msgstr "Goiburu espezifikoa"
+
+#: mail/em-filter-i18n.h:61
+msgid "starts with"
+msgstr "honela hasten da"
+
+#: mail/em-filter-i18n.h:63
+msgid "Stop Processing"
+msgstr "Utzi prozesatzeari"
+
+#: mail/em-filter-i18n.h:64 mail/em-format-html.c:1519
+#: mail/em-format-quote.c:302 mail/em-format.c:755 mail/em-mailer-prefs.c:87
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:329
+#: smime/lib/e-cert.c:1131
+msgid "Subject"
+msgstr "Gaia"
+
+#: mail/em-filter-i18n.h:65
+msgid "Unset Status"
+msgstr "Egoera ezarri gabe"
+
+#. and now for the action area
+#: mail/em-filter-rule.c:488
+#, fuzzy
+msgid "<b>Then</b>"
+msgstr "<b>Falta:</b> "
 
 #: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala bilaketatik..."
 
-#: mail/em-folder-properties.c:120
+#: mail/em-folder-properties.c:122
 #, fuzzy
-msgid "Folder properties"
+msgid "Folder Properties"
 msgstr "Letra-tipoen propietateak"
 
-#. TODO: maybe we want some basic properties here, like message counts/approximate size/etc
-#: mail/em-folder-properties.c:126
-msgid "Properties"
-msgstr "Propietateak"
-
 #. TODO: can this be done in a loop?
-#: mail/em-folder-properties.c:135
-#, fuzzy
-msgid "Folder Name"
-msgstr "Ka_rpeta-izena:"
-
-#: mail/em-folder-properties.c:146
+#: mail/em-folder-properties.c:161
 #, fuzzy
-msgid "Total messages"
-msgstr "Laguntza-mezua"
+msgid "Total message:"
+msgid_plural "Total messages:"
+msgstr[0] "Laguntza-mezua"
+msgstr[1] "Laguntza-mezua"
 
-#: mail/em-folder-properties.c:158
+#: mail/em-folder-properties.c:173
 #, fuzzy
-msgid "Unread messages"
-msgstr "Hurrengo _irakurri gabeko mezua"
+msgid "Unread message:"
+msgid_plural "Unread messages:"
+msgstr[0] "Hurrengo _irakurri gabeko mezua"
+msgstr[1] "Hurrengo _irakurri gabeko mezua"
 
 #: mail/em-folder-selection-button.c:120
 msgid "<click here to select a folder>"
@@ -12862,414 +13558,431 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Create New Folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2274
-#: mail/mail-component.c:704
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2330
+#: mail/mail-component.c:709
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
-#: mail/em-folder-selector.c:299
+#: mail/em-folder-selector.c:300
 #, fuzzy
 msgid "Create"
 msgstr "Crestview"
 
-#: mail/em-folder-selector.c:303
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: mail/em-folder-selector.c:304
 msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
-#: mail/em-folder-tree.c:833
+#: mail/em-folder-tree-model.c:200 mail/em-folder-tree-model.c:202
+#: mail/mail-vfolder.c:872
+msgid "VFolders"
+msgstr "Karpeta birtualak"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:206 mail/em-folder-tree-model.c:208
+msgid "UNMATCHED"
+msgstr ""
+
+#: mail/em-folder-tree-model.c:476 mail/em-folder-tree-model.c:780
+msgid "Loading..."
+msgstr "Kargatzen..."
+
+#: mail/em-folder-tree.c:846
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/em-folder-tree.c:835
+#: mail/em-folder-tree.c:848
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/em-folder-tree.c:842 mail/message-list.c:1561
+#: mail/em-folder-tree.c:855 mail/message-list.c:1561
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/em-folder-tree.c:844 mail/message-list.c:1563
+#: mail/em-folder-tree.c:857 mail/message-list.c:1563
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/em-folder-tree.c:860
+#: mail/em-folder-tree.c:873
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: mail/em-folder-tree.c:950 ui/evolution-mail-message.xml.h:110
+#: mail/em-folder-tree.c:963 ui/evolution-mail-message.xml.h:110
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: mail/em-folder-tree.c:951 ui/evolution-mail-message.xml.h:119
+#: mail/em-folder-tree.c:964 ui/evolution-mail-message.xml.h:119
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: mail/em-folder-tree.c:953 mail/em-folder-tree.c:2061
-#: mail/em-folder-tree.c:2542 mail/em-folder-view.c:798
-#: mail/message-list.c:1651
+#: mail/em-folder-tree.c:966 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/message-list.c:1651
 #, fuzzy
 msgid "_Move"
 msgstr "Eraman"
 
-#: mail/em-folder-tree.c:955 mail/message-list.c:1653
+#: mail/em-folder-tree.c:968 mail/message-list.c:1653
 #, fuzzy
 msgid "Cancel _Drag"
 msgstr "Bertan behera utzi zeregina"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-tree.c:2061
-#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-tree.c:2117
+#: mail/em-folder-view.c:802 mail/em-folder-view.c:816
 #: mail/importers/evolution-mbox-importer.c:119
 #: mail/importers/evolution-outlook-importer.c:133
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: mail/em-folder-tree.c:2048 mail/em-folder-view.c:812
+#: mail/em-folder-tree.c:2104 mail/em-folder-view.c:816
 #, fuzzy
 msgid "C_opy"
 msgstr "Kopiatu"
 
-#: mail/em-folder-tree.c:2088
+#: mail/em-folder-tree.c:2144
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/em-folder-tree.c:2274 mail/mail-component.c:704
+#: mail/em-folder-tree.c:2330 mail/mail-component.c:709
 #, fuzzy
 msgid "Create folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-tree.c:2463
+#: mail/em-folder-tree.c:2526
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: mail/em-folder-tree.c:2465
+#: mail/em-folder-tree.c:2528
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: mail/em-folder-tree.c:2536 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2603 ui/evolution-addressbook.xml.h:44
 #: ui/evolution-mail-global.xml.h:18 ui/evolution-mail-messagedisplay.xml.h:8
 #: ui/evolution-message-composer.xml.h:53 ui/evolution.xml.h:37
 msgid "_View"
 msgstr "_Ikusi"
 
-#: mail/em-folder-tree.c:2537
+#: mail/em-folder-tree.c:2604
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ireki leiho berrian"
 
+#: mail/em-folder-tree.c:2608
+msgid "_Copy..."
+msgstr "K_opiatu..."
+
+#: mail/em-folder-tree.c:2609
+msgid "_Move..."
+msgstr "_Lekuz aldatu..."
+
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2546
+#: mail/em-folder-tree.c:2613
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: mail/em-folder-tree.c:2549
-msgid "_Rename"
-msgstr "_Izena aldatu"
-
-#: mail/em-folder-tree.c:2552 ui/evolution-mail-list.xml.h:27
-msgid "_Properties..."
-msgstr "_Propietateak..."
+#: mail/em-folder-tree.c:2616
+msgid "_Rename..."
+msgstr "Izena _aldatu..."
 
-#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:888
-msgid "VFolders"
-msgstr "Karpeta birtualak"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
-#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:773
-msgid "Loading..."
-msgstr "Kargatzen..."
-
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1902
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
-#: mail/mail-component.c:554
-msgid "Mail"
-msgstr "Posta"
+#: mail/em-folder-tree.c:2619 ui/evolution-mail-list.xml.h:27
+#, fuzzy
+msgid "_Properties"
+msgstr "Propietateak"
 
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:895 mail/em-popup.c:690
+#: mail/em-folder-view.c:899 mail/em-popup.c:690
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:901
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
+#: mail/em-folder-view.c:904 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:905 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:812
+#: mail/em-folder-view.c:906 mail/em-popup.c:812
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:903 mail/em-popup.c:814
+#: mail/em-folder-view.c:907 mail/em-popup.c:814
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:910
 msgid "Follo_w Up..."
 msgstr "_Jarraitu..."
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:911
 msgid "Fla_g Completed"
 msgstr "Ban_dera osatuta"
 
-#: mail/em-folder-view.c:908
+#: mail/em-folder-view.c:912
 msgid "Cl_ear Flag"
 msgstr "_Garbitu bandera"
 
-#: mail/em-folder-view.c:911 ui/evolution-mail-message.xml.h:50
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:50
 msgid "Mar_k as Read"
 msgstr "Mar_katu irakurritako gisa"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:916
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:917
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:914
+#: mail/em-folder-view.c:918
 msgid "_Mark as Unimportant"
 msgstr "Mar_katu ez-garrantzitsu gisa"
 
-#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:919 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:920 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:924
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:927
 msgid "Mo_ve to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:928 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/em-folder-view.c:927 widgets/misc/e-expander.c:189
-msgid "Label"
-msgstr "Etiketa"
-
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:936
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:939
 msgid "Appl_y Filters"
 msgstr "_Aplikatu iragazkiak"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:940
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Iragazteko arauak"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:943
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:944
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:945
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:946
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:943
+#: mail/em-folder-view.c:947
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:951
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:952
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:953
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:950
+#: mail/em-folder-view.c:954
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1706 mail/em-folder-view.c:1746
+#: mail/em-folder-view.c:1714 mail/em-folder-view.c:1754
 #: mail/mail-config.glade.h:68
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: mail/em-folder-view.c:1796
+#: mail/em-folder-view.c:1851
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/em-folder-view.c:2076
+#: mail/em-folder-view.c:2112
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/em-folder-view.c:2341
+#: mail/em-folder-view.c:2377
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik zeregina gehitzeko"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:325
-msgid "From"
-msgstr "Nork"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Bat datozenak:"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83
-msgid "Reply-To"
-msgstr "Erantzun honi"
+#: mail/em-format-html-display.c:641 mail/em-format-html.c:559
+#, fuzzy
+msgid "Unsigned"
+msgstr "Esleitua"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Nori"
+#: mail/em-format-html-display.c:641
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
 
-#: mail/em-format.c:753 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
-msgid "Cc"
-msgstr "Cc"
+#: mail/em-format-html-display.c:642 mail/em-format-html.c:560
+#, fuzzy
+msgid "Valid signature"
+msgstr "Editatu sinadura"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:86
-msgid "Bcc"
-msgstr "Bcc"
+#: mail/em-format-html-display.c:642
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
 
-#: mail/em-format.c:755 mail/em-format-html.c:1519 mail/em-format-quote.c:302
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329 smime/lib/e-cert.c:1131
-msgid "Subject"
-msgstr "Gaia"
+#: mail/em-format-html-display.c:643 mail/em-format-html.c:561
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Gorde sinadura"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1563 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#: mail/em-format-html-display.c:643
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:757 mail/em-format-html.c:1586 mail/em-mailer-prefs.c:89
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:993
-#, c-format
-msgid "%s attachment"
-msgstr "%s eranskina"
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr ""
+"input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
 
-#: mail/em-format.c:1024 mail/em-format.c:1143
+#: mail/em-format-html-display.c:650 mail/em-format-html.c:568
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+msgid "Unencrypted"
+msgstr "Etenda"
 
-#: mail/em-format.c:1133
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:650
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1279
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+#: mail/em-format-html-display.c:651 mail/em-format-html.c:569
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format.c:1298
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Onartzen ez den eskema"
+#: mail/em-format-html-display.c:651
+msgid ""
+"This message is encrypted, but with a weak encryption algorithm.  It would "
+"be difficult, but not impossible for an outsider to view the content of this "
+"message in a practical amount of time."
+msgstr ""
 
-#: mail/em-format.c:1306
+#: mail/em-format-html-display.c:652 mail/em-format-html.c:570
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Errorea zerrenda aldatzean"
+msgid "Encrypted"
+msgstr "PGP enkriptatzea"
 
-#: mail/em-format.c:1306
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Ezin da egiaztatu 'leaf' sinadura"
+#: mail/em-format-html-display.c:652
+msgid ""
+"This message is encrypted.  It would be difficult for an outsider to view "
+"the content of this message."
+msgstr ""
 
-#: mail/em-format-html.c:452 mail/em-format-html.c:454
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s mezua eskuratzen"
+#: mail/em-format-html-display.c:653 mail/em-format-html.c:571
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is encrypted, with a strong encryption algorithm.  It would be "
+"very difficult for an outsider to view the content of this message in a "
+"practical amount of time."
+msgstr ""
+
+#: mail/em-format-html-display.c:754 smime/gui/smime-ui.glade.h:47
 #, fuzzy
-msgid "Unsigned"
-msgstr "Esleitua"
+msgid "_View Certificate"
+msgstr "_Ziurtagiri-IDa:"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:769
 #, fuzzy
-msgid "Valid signature"
-msgstr "Editatu sinadura"
+msgid "This certificate is not viewable"
+msgstr "Ziurtagiria oraindik ez da baliozkoa"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:1004
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Gorde sinadura"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr " - %Y %B %d, %l:%M %p"
 
-#: mail/em-format-html.c:562
-msgid "Valid signature but cannot verify sender"
-msgstr ""
+#: mail/em-format-html-display.c:1012
+msgid "Overdue:"
+msgstr "Atzeratua:"
 
-#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Etenda"
+#: mail/em-format-html-display.c:1015
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr " - %Y %B %d, %l:%M %p"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
-msgid "Encrypted, weak"
-msgstr ""
+#: mail/em-format-html-display.c:1085
+#, fuzzy
+msgid "_View Inline"
+msgstr "Ikusi barnean"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:1086
 #, fuzzy
-msgid "Encrypted"
-msgstr "PGP enkriptatzea"
+msgid "_Hide"
+msgstr "Ezkutatu"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
-msgid "Encrypted, strong"
+#: mail/em-format-html-print.c:130
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d/%d orria"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "%s mezua eskuratzen"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
 #: mail/em-format-html.c:820
@@ -13306,9 +14019,35 @@ msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
 msgid "Formatting message"
 msgstr "Mezuak lekuz aldatzen"
 
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:750
+#: mail/em-mailer-prefs.c:82 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:325
+msgid "From"
+msgstr "Nork"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:751
+#: mail/em-mailer-prefs.c:83
+msgid "Reply-To"
+msgstr "Erantzun honi"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:752
+#: mail/em-mailer-prefs.c:84 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Nori"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:753
+#: mail/em-mailer-prefs.c:85
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/em-format-html.c:1413 mail/em-format-quote.c:192 mail/em-format.c:754
+#: mail/em-mailer-prefs.c:86
+msgid "Bcc"
+msgstr "Bcc"
+
 #. pseudo-header
 #: mail/em-format-html.c:1523 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:930
+#: mail/em-mailer-prefs.c:939
 msgid "Mailer"
 msgstr "Bidalketa-funtzioa"
 
@@ -13322,106 +14061,47 @@ msgstr ""
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Bat datozenak:"
-
-#: mail/em-format-html-display.c:644
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
-
-#: mail/em-format-html-display.c:645
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
+#: mail/em-format-html.c:1563 mail/em-format-quote.c:316 mail/em-format.c:756
+#: mail/em-mailer-prefs.c:88 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format-html.c:1586 mail/em-format.c:757 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:647
-msgid "Valid signature, cannot verify sender"
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s eranskina"
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
-"input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
-
-#: mail/em-format-html-display.c:653
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:654
-msgid ""
-"This message is encrypted, but with a weak encryption algorithm.  It would "
-"be difficult, but not impossible for an outsider to view the content of this "
-"message in a practical amount of time."
-msgstr ""
-
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/em-format-html-display.c:656
-msgid ""
-"This message is encrypted, with a strong encryption algorithm.  It would be "
-"very difficult for an outsider to view the content of this message in a "
-"practical amount of time."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:757 smime/gui/smime-ui.glade.h:47
-#, fuzzy
-msgid "_View Certificate"
-msgstr "_Ziurtagiri-IDa:"
-
-#: mail/em-format-html-display.c:772
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Ziurtagiria oraindik ez da baliozkoa"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
 
-#: mail/em-format-html-display.c:1007
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
-
-#: mail/em-format-html-display.c:1015
-msgid "Overdue:"
-msgstr "Atzeratua:"
-
-#: mail/em-format-html-display.c:1018
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr " - %Y %B %d, %l:%M %p"
+msgid "Unsupported signature format"
+msgstr "Onartzen ez den eskema"
 
-#: mail/em-format-html-display.c:1088
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_View Inline"
-msgstr "Ikusi barnean"
+msgid "Error verifying signature"
+msgstr "Errorea zerrenda aldatzean"
 
-#: mail/em-format-html-display.c:1089
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "_Hide"
-msgstr "Ezkutatu"
-
-#: mail/em-format-html-print.c:126
-#, c-format
-msgid "Page %d of %d"
-msgstr "%d/%d orria"
+msgid "Unknown error verifying signature"
+msgstr "Ezin da egiaztatu 'leaf' sinadura"
 
 #: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
@@ -13543,7 +14223,7 @@ msgstr "Bidali _mezua zerrendara..."
 msgid "_Add to Addressbook"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-popup.c:967
+#: mail/em-popup.c:985
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
@@ -13557,7 +14237,7 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: mail/em-subscribe-editor.c:639 shell/e-storage-set-view.etspec.h:2
+#: mail/em-subscribe-editor.c:639
 msgid "Folder"
 msgstr "Karpeta"
 
@@ -13594,11 +14274,24 @@ msgid "Add address"
 msgstr "Helbidea"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1016
+#: mail/em-utils.c:1019
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
+#: mail/em-vfolder-editor.c:104
+#, fuzzy
+msgid "Virtual _Folders"
+msgstr "Karpeta birtualak"
+
+#: mail/em-vfolder-rule.c:494
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: mail/em-vfolder-rule.c:574
+msgid "VFolder source"
+msgstr "Karpeta birtualen iturburua"
+
 #: mail/evolution-mail.schemas.in.in.h:1
 msgid "Automatic link recognition"
 msgstr ""
@@ -14084,66 +14777,33 @@ msgstr ""
 msgid "spamd port"
 msgstr "Inportatu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "*Control*F1"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Composer Preferences"
-msgstr "Mezuak prestatzeko hobespenak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
-"besteak beste."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Configure your email accounts here"
-msgstr "Konfiguratu hemen zure posta-kontuak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail"
-msgstr "Evolution-en posta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution-en postako kontuak konfiguratzeko kontrola"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail component"
-msgstr "Evolution-en postaren osagaiak"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution-en Elm inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer"
-msgstr "Evolution-en mezu-prestatzailea"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-en Netscape Mail inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution-en Outlook Express 4 inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-en postaren hobespenen kontrola"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution-en Pine inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Posta-kontuak"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution-en mbox inportatzailea"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:99
-msgid "Mail Preferences"
-msgstr "Posta-hobespenak"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:15
-#, fuzzy
-msgid "_Mail"
-msgstr "_Posta:"
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14205,34 +14865,6 @@ msgstr "Inportatzen"
 msgid "Importing mailbox"
 msgstr "Fitxategiak inportatzen"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution-en Elm inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution-en Netscape Mail inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution-en Outlook Express 4 inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution-en Pine inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution-en mbox inportatzailea"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
-
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
-
 #: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
@@ -14399,80 +15031,86 @@ msgstr "%s posta-zerrenda"
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazteko araua"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:459
 #, fuzzy, c-format
 msgid "%d deleted"
-msgstr "%d hautatuta"
+msgid_plural "%d deleted"
+msgstr[0] "%d hautatuta"
+msgstr[1] "%d hautatuta"
 
-#: mail/mail-component.c:463
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d junk"
-msgstr "%d bidali gabe"
+msgid_plural "%d junk"
+msgstr[0] "%d bidali gabe"
+msgstr[1] "%d bidali gabe"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:484
 #, fuzzy, c-format
-msgid "%d drafts"
-msgstr "Zirriborroak"
+msgid "%d draft"
+msgid_plural "%d drafts"
+msgstr[0] "Zirriborroak"
+msgstr[1] "Zirriborroak"
 
-#: mail/mail-component.c:488
-#, c-format
+#: mail/mail-component.c:486
+#, fuzzy, c-format
 msgid "%d sent"
-msgstr "%d bidali"
+msgid_plural "%d sent"
+msgstr[0] "%d bidali"
+msgstr[1] "%d bidali"
 
-#: mail/mail-component.c:490
-#, c-format
+#: mail/mail-component.c:488
+#, fuzzy, c-format
 msgid "%d unsent"
-msgstr "%d bidali gabe"
+msgid_plural "%d unsent"
+msgstr[0] "%d bidali gabe"
+msgstr[1] "%d bidali gabe"
 
-#: mail/mail-component.c:494
-#, c-format
+#: mail/mail-component.c:492
+#, fuzzy, c-format
 msgid "%d total"
-msgstr "%d guztira"
+msgid_plural "%d total"
+msgstr[0] "%d guztira"
+msgstr[1] "%d guztira"
 
-#: mail/mail-component.c:496
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid ", %d unread"
-msgstr "%d bidali gabe"
+msgid_plural ", %d unread"
+msgstr[0] "%d bidali gabe"
+msgstr[1] "%d bidali gabe"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: mail/mail-component.c:664
+#: mail/mail-component.c:669
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Karpeta birtual berria"
 
-#: mail/mail-component.c:665
+#: mail/mail-component.c:670
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Posta-iragazkiak"
 
-#: mail/mail-component.c:666
+#: mail/mail-component.c:671
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/mail-component.c:798
+#: mail/mail-component.c:803
 msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config.c:895
-msgid "Checking Service"
-msgstr "Zerbitzua egiaztatzen"
-
-#: mail/mail-config.c:973 mail/mail-config.c:977
-msgid "Connecting to server..."
-msgstr "Zerbitzariarekin konektatzen..."
-
 #: mail/mail-config-druid.c:362 mail/mail-config.glade.h:92
 msgid "Identity"
 msgstr "Identitatea"
@@ -14534,16 +15172,24 @@ msgstr ""
 "egingo dira Evolution-eko posta-kontua sortzeko. Idatzi behean kontuari eman "
 "nahi diozun izena. Izen hori bistaratzeko bakarrik erabiliko da."
 
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Zerbitzua egiaztatzen"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Zerbitzariarekin konektatzen..."
+
+#: mail/mail-config.glade.h:1 mail/mail-dialogs.glade.h:5
+#, fuzzy
+msgid "    "
+msgstr "      "
+
 #: mail/mail-config.glade.h:2
 #, fuzzy
 msgid " Ch_eck for Supported Types "
 msgstr " _Begiratu zein mota onartzen diren "
 
-#: mail/mail-config.glade.h:4
-#, fuzzy
-msgid "<b>Preview</b>"
-msgstr "Aurrebista"
-
 #: mail/mail-config.glade.h:5
 #, fuzzy
 msgid "<b>SSL is not supported in this build of evolution</b>"
@@ -14818,7 +15464,7 @@ msgstr "Ez aipatu jatorrizko mezua"
 msgid "Don't sign _meeting requests (for Outlook compatibility)"
 msgstr "Ez sinatu bilera-eskaerak (Outlook-ekin bateragarria izateko)"
 
-#: mail/mail-config.glade.h:74 shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:74 shell/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Eginda"
 
@@ -15183,6 +15829,119 @@ msgstr "kolorea"
 msgid "description"
 msgstr "azalpena"
 
+#: mail/mail-dialogs.glade.h:1
+msgid ""
+"\n"
+" Please read carefully the license agreement displayed\n"
+" below and tick the check box for accepting it\n"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:7
+#, fuzzy
+msgid "<b>vFolder Sources</b>"
+msgstr "Karpeta birtualen iturburuak"
+
+#: mail/mail-dialogs.glade.h:8
+msgid "<span weight=\"bold\">Digital Signature</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:9
+msgid "<span weight=\"bold\">Encryption</span>"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:10
+#, fuzzy
+msgid "Accept License"
+msgstr "Onartua"
+
+#: mail/mail-dialogs.glade.h:11 mail/message-tags.glade.h:2
+msgid "C_ompleted"
+msgstr "_Osatuta"
+
+#: mail/mail-dialogs.glade.h:12
+msgid "Case Sensitive"
+msgstr "Maiuskula/minuskula"
+
+#: mail/mail-dialogs.glade.h:14
+msgid "Find in Message"
+msgstr "Bilatu mezuan"
+
+#: mail/mail-dialogs.glade.h:15
+msgid "Find:"
+msgstr "Bilatu:"
+
+#: mail/mail-dialogs.glade.h:16 mail/message-tag-followup.c:294
+#: mail/message-tags.glade.h:3
+msgid "Flag to Follow Up"
+msgstr "Markatu jarraipena egiteko"
+
+#: mail/mail-dialogs.glade.h:17
+msgid "Folder Subscriptions"
+msgstr "Karpeta-harpidetzak"
+
+#: mail/mail-dialogs.glade.h:18
+msgid "License Agreement"
+msgstr ""
+
+#: mail/mail-dialogs.glade.h:19
+msgid "None Selected"
+msgstr "Ez da bat ere hautatu"
+
+#: mail/mail-dialogs.glade.h:20
+msgid "S_erver:"
+msgstr "_Zerbitzaria:"
+
+#: mail/mail-dialogs.glade.h:21
+#, fuzzy
+msgid "Security Information"
+msgstr "Kontuaren informazioa"
+
+#: mail/mail-dialogs.glade.h:23 mail/message-tags.glade.h:4
+msgid ""
+"The messages you have selected for follow up are listed below.\n"
+"Please select a follow up action from the \"Flag\" menu."
+msgstr ""
+"Jarraitzeko hautatutako mezuak beheko zerrendan agertzen dira.\n"
+"Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
+
+#: mail/mail-dialogs.glade.h:25
+#, fuzzy
+msgid "Tick this to accept the license agreement"
+msgstr "Posta-kontuak"
+
+#: mail/mail-dialogs.glade.h:26 mail/message-tags.glade.h:6
+#, fuzzy
+msgid "_Due By:"
+msgstr "_Noizko:"
+
+#: mail/mail-dialogs.glade.h:27 mail/message-tags.glade.h:7
+msgid "_Flag:"
+msgstr "_Bandera:"
+
+#: mail/mail-dialogs.glade.h:28
+msgid "_Subscribe"
+msgstr "_Harpidetu"
+
+#: mail/mail-dialogs.glade.h:29
+msgid "_Unsubscribe"
+msgstr "Harpidetza _kendu"
+
+#: mail/mail-dialogs.glade.h:30
+msgid "specific folders only"
+msgstr "zehaztutako karpetak bakarrik"
+
+#: mail/mail-dialogs.glade.h:31
+msgid "with all active remote folders"
+msgstr "urruneko karpeta aktibo guztiekin"
+
+#: mail/mail-dialogs.glade.h:32
+msgid "with all local and active remote folders"
+msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
+
+#: mail/mail-dialogs.glade.h:33
+msgid "with all local folders"
+msgstr "karpeta lokal guztiekin"
+
 #. mail:camel-service-auth-invalid primary
 #: mail/mail-errors.xml.h:2
 #, fuzzy
@@ -15390,14 +16149,6 @@ msgstr ""
 msgid "{0}."
 msgstr ""
 
-#. mail:session-message-info secondary
-#: mail/mail-errors.xml.h:70 mail/mail-errors.xml.h:72
-#: mail/mail-errors.xml.h:74 mail/mail-errors.xml.h:76
-#: mail/mail-errors.xml.h:78 mail/mail-errors.xml.h:80
-#: mail/mail-errors.xml.h:84 mail/mail-errors.xml.h:88
-msgid "{0}"
-msgstr ""
-
 #. mail:ask-session-password primary
 #: mail/mail-errors.xml.h:82
 #, fuzzy
@@ -15502,8 +16253,9 @@ msgstr ""
 
 #. mail:no-rename-folder-exists primary
 #: mail/mail-errors.xml.h:128 mail/mail-errors.xml.h:132
+#, fuzzy
 msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgstr "Ezin da karpeta eraman: %s"
 
 #. mail:no-rename-folder-exists secondary
 #: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
@@ -15554,8 +16306,9 @@ msgstr "Ezin izan da objektua eguneratu"
 
 #. mail:account-incomplete primary
 #: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+#, fuzzy
 msgid "Cannot save changes to account."
-msgstr ""
+msgstr "eta beste txartel bat."
 
 #. mail:account-incomplete secondary
 #: mail/mail-errors.xml.h:158
@@ -15584,8 +16337,9 @@ msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
 #: mail/mail-errors.xml.h:169
+#, fuzzy
 msgid "Don't delete"
-msgstr "Ez ezabatu"
+msgstr "_Desezabatu"
 
 #. mail:no-save-signature primary
 #: mail/mail-errors.xml.h:171
@@ -15649,8 +16403,11 @@ msgstr ""
 
 #. mail:vfolder-notunique primary
 #: mail/mail-errors.xml.h:190
+#, fuzzy
 msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
+"Ezin da karpeta ezabatu:\n"
+"%s"
 
 #. mail:vfolder-updated primary
 #: mail/mail-errors.xml.h:194
@@ -15692,13 +16449,44 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#. mail:ask-migrate-existing primary
+#. mail:no-folder primary
 #: mail/mail-errors.xml.h:210
+#, fuzzy
+msgid "Missing folder."
+msgstr "%s karpeta kentzen"
+
+#. mail:no-folder secondary
+#: mail/mail-errors.xml.h:212
+msgid "You must specify a folder."
+msgstr "Karpeta bat zehaztu behar duzu."
+
+#. mail:no-name-vfolder secondary
+#: mail/mail-errors.xml.h:216
+#, fuzzy
+msgid "You must name this vFolder."
+msgstr "Karpeta birtualari izena eman behar diozu."
+
+#. mail:vfolder-no-source primary
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ez da zerbitzaririk hautatu"
+
+#. mail:vfolder-no-source secondary
+#: mail/mail-errors.xml.h:220
+msgid ""
+"You must specify at least one folder as a source.\n"
+"Either by selecting the folders individually, and/or by selecting\n"
+"all local folders, all remote folders, or both."
+msgstr ""
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:224
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
 #. mail:ask-migrate-existing secondary
-#: mail/mail-errors.xml.h:212
+#: mail/mail-errors.xml.h:226
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15706,16 +16494,16 @@ msgid ""
 "quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.h:216
+#: mail/mail-errors.xml.h:230
 msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#: mail/mail-errors.xml.h:231 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
 msgid "_Overwrite"
 msgstr "Gainidatzi"
 
-#: mail/mail-errors.xml.h:218
+#: mail/mail-errors.xml.h:232
 #, fuzzy
 msgid "_Append"
 msgstr "Aspen"
@@ -15877,7 +16665,7 @@ msgstr ""
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2015
+#: mail/mail-ops.c:2010
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15886,46 +16674,21 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2020
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: mail/mail-ops.c:2193
+#: mail/mail-ops.c:2168
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
 
-#: mail/mail-search.glade.h:2
-msgid "Case Sensitive"
-msgstr "Maiuskula/minuskula"
-
-#: mail/mail-search.glade.h:3
-msgid "Find in Message"
-msgstr "Bilatu mezuan"
-
-#: mail/mail-search.glade.h:4
-msgid "Find:"
-msgstr "Bilatu:"
-
-#: mail/mail-security.glade.h:1
-msgid "<span weight=\"bold\">Digital Signature</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:2
-msgid "<span weight=\"bold\">Encryption</span>"
-msgstr ""
-
-#: mail/mail-security.glade.h:4
-#, fuzzy
-msgid "Security Information"
-msgstr "Kontuaren informazioa"
-
 #: mail/mail-send-recv.c:157
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
@@ -15961,24 +16724,24 @@ msgstr "Eguneratzen..."
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:239
+#: mail/mail-session.c:240
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:274
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:274
+#: mail/mail-session.c:276
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:297
+#: mail/mail-session.c:304
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:298
+#: mail/mail-session.c:305
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -16033,15 +16796,15 @@ msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 msgid "Updating vFolders for '%s'"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:958
+#: mail/mail-vfolder.c:942
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:997
+#: mail/mail-vfolder.c:981
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:1081
+#: mail/mail-vfolder.c:1065
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
@@ -16105,7 +16868,7 @@ msgstr "%b %d %l:%M %p"
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3321
+#: mail/message-list.c:3324
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -16161,10 +16924,6 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
-#: mail/message-tag-followup.c:79
-msgid "Read"
-msgstr "Irakurrita"
-
 #: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Erantzun"
@@ -16177,50 +16936,51 @@ msgstr "Erantzun denei"
 msgid "Review"
 msgstr "Berrikusi"
 
-#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
-msgid "Flag to Follow Up"
-msgstr "Markatu jarraipena egiteko"
+#: mail/searchtypes.xml.h:1
+msgid "Body contains"
+msgstr "gorputzak hau dauka"
 
-#: mail/message-tags.glade.h:2
-msgid "C_ompleted"
-msgstr "_Osatuta"
+#: mail/searchtypes.xml.h:2
+msgid "Body does not contain"
+msgstr "gorputzak ez dauka hau"
 
-#: mail/message-tags.glade.h:4
-msgid ""
-"The messages you have selected for follow up are listed below.\n"
-"Please select a follow up action from the \"Flag\" menu."
-msgstr ""
-"Jarraitzeko hautatutako mezuak beheko zerrendan agertzen dira.\n"
-"Hautatu jarraitze-ekintza bat \"Bandera\" menuan."
+#: mail/searchtypes.xml.h:3
+msgid "Body or subject contains"
+msgstr "gorputzak edo gaiak hau dauka"
 
-#: mail/message-tags.glade.h:6
-#, fuzzy
-msgid "_Due By:"
-msgstr "_Noizko:"
+#: mail/searchtypes.xml.h:4
+msgid "Message contains"
+msgstr "mezuak hau dauka"
 
-#: mail/message-tags.glade.h:7
-msgid "_Flag:"
-msgstr "_Bandera:"
+#: mail/searchtypes.xml.h:5
+msgid "Recipients contain"
+msgstr "hartzaileak hau dauka"
 
-#: mail/subscribe-dialog.glade.h:1
-msgid "Folder Subscriptions"
-msgstr "Karpeta-harpidetzak"
+#: mail/searchtypes.xml.h:6
+msgid "Sender contains"
+msgstr "bidaltzaileak hau dauka"
 
-#: mail/subscribe-dialog.glade.h:2
-msgid "None Selected"
-msgstr "Ez da bat ere hautatu"
+#: mail/searchtypes.xml.h:7
+msgid "Subject contains"
+msgstr "gaiak hau dauka"
 
-#: mail/subscribe-dialog.glade.h:3
-msgid "S_erver:"
-msgstr "_Zerbitzaria:"
+#: mail/searchtypes.xml.h:8
+msgid "Subject does not contain"
+msgstr "gaiak ez dauka hau"
 
-#: mail/subscribe-dialog.glade.h:4
-msgid "_Subscribe"
-msgstr "_Harpidetu"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a"
 
-#: mail/subscribe-dialog.glade.h:5
-msgid "_Unsubscribe"
-msgstr "Harpidetza _kendu"
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution-en probaren osagaia"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
@@ -16290,31 +17050,18 @@ msgstr ""
 msgid "mail"
 msgstr "Helb. el."
 
-#: shell/e-shell.c:588 shell/e-shell.c:589
-#, fuzzy, c-format
-msgid "%ld KB"
-msgstr "%B %d"
-
-#: shell/e-shell.c:786
+#: shell/e-active-connection-dialog.glade.h:1
 #, fuzzy
-msgid "Uknown system error."
-msgstr "Errore ezezaguna"
-
-#: shell/e-shell.c:1143
-msgid "Invalid arguments"
-msgstr "Argumentu baliogabeak"
-
-#: shell/e-shell.c:1145
-msgid "Cannot register on OAF"
-msgstr "Ezin da OAFen erregistratu"
+msgid "<b>Active Connections</b>"
+msgstr "Konexio aktiboak"
 
-#: shell/e-shell.c:1147
-msgid "Configuration Database not found"
-msgstr "Ez da aurkitu konfigurazioko datu-basea"
+#: shell/e-active-connection-dialog.glade.h:2
+msgid "Active Connections"
+msgstr "Konexio aktiboak"
 
-#: shell/e-shell.c:1149
-msgid "Generic error"
-msgstr "Errore generikoa"
+#: shell/e-active-connection-dialog.glade.h:3
+msgid "Click OK to close these connections and go offline"
+msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -16501,30 +17248,6 @@ msgstr "Karpeta-izenak ezin du \"#\" karaktererik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-window.c:337
-#, fuzzy
-msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution linean dago.  Egin klik botoi honetan lineaz kanpo lan "
-"egiteko."
-
-#: shell/e-shell-window.c:344
-#, fuzzy
-msgid "Evolution is in the process of going offline."
-msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
-
-#: shell/e-shell-window.c:350
-#, fuzzy
-msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan "
-"egiteko."
-
-#: shell/e-shell-window.c:637
-#, fuzzy, c-format
-msgid "Switch to %s"
-msgstr "Mezu-hartzailea: %s"
-
 #: shell/e-shell-window-commands.c:66
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
@@ -16542,113 +17265,94 @@ msgstr "Bug buddy ez dago instalatuta."
 msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
-#: shell/e-shell-window-commands.c:323
+#: shell/e-shell-window-commands.c:322
 #, fuzzy
 msgid "Groupware Suite"
 msgstr "Taldea"
 
-#: shell/e-shell-window-commands.c:563
+#: shell/e-shell-window-commands.c:562
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-window-commands.c:576 ui/evolution.xml.h:39
+#: shell/e-shell-window-commands.c:575 ui/evolution.xml.h:39
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
-#: shell/e-shell-window-commands.c:589 ui/evolution.xml.h:25
+#: shell/e-shell-window-commands.c:588 ui/evolution.xml.h:25
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-storage-set-view.etspec.h:1
-msgid "Checkbox"
-msgstr "Kontrol-laukia"
-
-#: shell/e-user-creatable-items-handler.c:691
-msgid "New"
-msgstr "Berria"
-
-#: shell/evolution-test-component.c:140
-#, fuzzy
-msgid "New Test"
-msgstr "Zeregin berria"
-
-#: shell/evolution-test-component.c:141
+#: shell/e-shell-window.c:337
 #, fuzzy
-msgid "_Test"
-msgstr "Proba"
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution linean dago.  Egin klik botoi honetan lineaz kanpo lan "
+"egiteko."
 
-#: shell/evolution-test-component.c:142
+#: shell/e-shell-window.c:344
 #, fuzzy
-msgid "Create a new test item"
-msgstr "Sortu zeregin berria"
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
 
-#: shell/glade/e-active-connection-dialog.glade.h:1
+#: shell/e-shell-window.c:350
 #, fuzzy
-msgid "<b>Active Connections</b>"
-msgstr "Konexio aktiboak"
-
-#: shell/glade/e-active-connection-dialog.glade.h:2
-msgid "Active Connections"
-msgstr "Konexio aktiboak"
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution lineaz kanpo dago.  Egin klik botoi honetan linean lan "
+"egiteko."
 
-#: shell/glade/e-active-connection-dialog.glade.h:3
-msgid "Click OK to close these connections and go offline"
-msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
+#: shell/e-shell-window.c:637
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mezu-hartzailea: %s"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:1
-msgid "C_alendar:"
-msgstr "E_gutegia:"
+#: shell/e-shell.c:588 shell/e-shell.c:589
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
 
-#: shell/glade/e-shell-config-default-folders.glade.h:2
+#: shell/e-shell.c:774
 #, fuzzy
-msgid "_Contacts:"
-msgstr "Kontaktuak: "
-
-#: shell/glade/e-shell-config-default-folders.glade.h:3
-msgid "_Mail:"
-msgstr "_Posta:"
-
-#: shell/glade/e-shell-config-default-folders.glade.h:4
-msgid "_Tasks:"
-msgstr "_Zereginak:"
+msgid "Uknown system error."
+msgstr "Errore ezezaguna"
 
-#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
-msgid "Folder _type:"
-msgstr "Karpeta-_mota:"
+#: shell/e-shell.c:1131
+msgid "Invalid arguments"
+msgstr "Argumentu baliogabeak"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
-msgid "Open Other User's Folder"
-msgstr "Ireki beste erabiltzaile baten karpeta"
+#: shell/e-shell.c:1133
+msgid "Cannot register on OAF"
+msgstr "Ezin da OAFen erregistratu"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
-msgid "_Account:"
-msgstr "K_ontua:"
+#: shell/e-shell.c:1135
+msgid "Configuration Database not found"
+msgstr "Ez da aurkitu konfigurazioko datu-basea"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
-msgid "_Folder Name:"
-msgstr "Ka_rpeta-izena:"
+#: shell/e-shell.c:1137
+msgid "Generic error"
+msgstr "Errore generikoa"
 
-#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
-msgid "_User:"
-msgstr "_Erabiltzaile-izena:"
+#: shell/e-user-creatable-items-handler.c:691
+msgid "New"
+msgstr "Berria"
 
-#: shell/glade/evolution-startup-wizard.glade.h:2
+#: shell/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
 
-#: shell/glade/evolution-startup-wizard.glade.h:3
+#: shell/evolution-startup-wizard.glade.h:3
 msgid "Importing Files"
 msgstr "Fitxategiak inportatzen"
 
-#: shell/glade/evolution-startup-wizard.glade.h:4
+#: shell/evolution-startup-wizard.glade.h:4
 msgid "Timezone "
 msgstr "Ordu-zona "
 
-#: shell/glade/evolution-startup-wizard.glade.h:5
+#: shell/evolution-startup-wizard.glade.h:5
 msgid "Welcome"
 msgstr "Ongi etorri"
 
-#: shell/glade/evolution-startup-wizard.glade.h:6
+#: shell/evolution-startup-wizard.glade.h:6
 msgid ""
 "Welcome to Evolution. The next few screens will allow\n"
 "Evolution to connect to your email accounts, and to import\n"
@@ -16662,7 +17366,7 @@ msgstr ""
 "\n"
 "Jarraitzeko, egin klik \"Aurrera\" botoian. "
 
-#: shell/glade/evolution-startup-wizard.glade.h:11
+#: shell/evolution-startup-wizard.glade.h:11
 msgid ""
 "You have successfully entered all of the information\n"
 "needed to set up Evolution. \n"
@@ -16674,19 +17378,20 @@ msgstr ""
 "\n"
 "Egin klik \"Aplikatu\" botoian, ezarpenak gordetzeko. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-en shell-a"
+#: shell/evolution-test-component.c:140
+#, fuzzy
+msgid "New Test"
+msgstr "Zeregin berria"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#: shell/evolution-test-component.c:141
 #, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
+msgid "_Test"
+msgstr "Proba"
 
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#: shell/evolution-test-component.c:142
 #, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution-en probaren osagaia"
+msgid "Create a new test item"
+msgstr "Sortu zeregin berria"
 
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -16753,7 +17458,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:231
+#: shell/main.c:225
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16789,7 +17494,7 @@ msgstr ""
 "Gogorik lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: shell/main.c:255
+#: shell/main.c:249
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -16798,39 +17503,39 @@ msgstr ""
 "Eskerrik asko\n"
 "Ximian Evolution taldea\n"
 
-#: shell/main.c:262
+#: shell/main.c:256
 msgid "Don't tell me again"
 msgstr "Ez esan berriro"
 
-#: shell/main.c:496
+#: shell/main.c:461
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:498
+#: shell/main.c:463
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:500
+#: shell/main.c:465
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:503
+#: shell/main.c:468
 msgid "Forcibly shut down all evolution components"
 msgstr "Behartu evolution-en osagai guztiak ixtea"
 
-#: shell/main.c:507
+#: shell/main.c:472
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:510
+#: shell/main.c:475
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:534
+#: shell/main.c:502
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:538
+#: shell/main.c:506
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16905,6 +17610,28 @@ msgid ""
 "Click help for details."
 msgstr ""
 
+#: smime/gui/ca-trust-dialog.c:91
+#, c-format
+msgid ""
+"Certificate '%s' is a CA certificate.\n"
+"\n"
+"Edit trust settings:"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:145
+msgid ""
+"Because you trust the certificate authority that issued this certificate, "
+"then you trust the authenticity of this certificate unless otherwise "
+"indicated here"
+msgstr ""
+
+#: smime/gui/cert-trust-dialog.c:149
+msgid ""
+"Because you do not trust the certificate authority that issued this "
+"certificate, then you do not trust the authenticity of this certificate "
+"unless otherwise indicated here"
+msgstr ""
+
 #: smime/gui/certificate-manager.c:130 smime/gui/certificate-manager.c:353
 #: smime/gui/certificate-manager.c:556
 #, fuzzy
@@ -17172,6 +17899,12 @@ msgstr "_Ziurtagiri-IDa:"
 msgid "_Edit CA Trust"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:612
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Txartelaren ID hori badago lehendik"
+
 #: smime/lib/e-cert.c:238 smime/lib/e-cert.c:248
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17401,12 +18134,6 @@ msgstr "Gaia: %s"
 msgid "Certificate Signature Value"
 msgstr "Ziurtagiri-sinaduraren hutsegitea"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:608
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Txartelaren ID hori badago lehendik"
-
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17550,8 +18277,8 @@ msgstr "Ikusi uneko kontaktua"
 #: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
 #: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:15
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:107 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
 #: ui/evolution-tasks.xml.h:19 ui/evolution.xml.h:27
 msgid "_Actions"
 msgstr "_Ekintzak"
@@ -18036,16 +18763,6 @@ msgstr "_Alderantzikatu hautapena"
 msgid "_Threaded Message List"
 msgstr "_Harian sartutako mezu-zerrenda"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
-msgid "Close this window"
-msgstr "Itxi leiho hau"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:28
-msgid "_Close"
-msgstr "It_xi"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18458,6 +19175,16 @@ msgstr "_Tresnak"
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:5
+msgid "Close this window"
+msgstr "Itxi leiho hau"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:28
+msgid "_Close"
+msgstr "It_xi"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Erantsi"
@@ -18540,10 +19267,6 @@ msgstr "Gorde uneko fitxategia beste izen batekin"
 msgid "Save the message in a specified folder"
 msgstr "Gorde mezua adierazitako karpetan"
 
-#: ui/evolution-message-composer.xml.h:24
-msgid "Send"
-msgstr "Bidali"
-
 #: ui/evolution-message-composer.xml.h:25
 #: ui/evolution-signature-editor.xml.h:11
 msgid "Send the mail in HTML format"
@@ -19126,7 +19849,7 @@ msgid "Evolution Query"
 msgstr "Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:415
+#: widgets/misc/e-error.c:417
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19289,27 +20012,267 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
+#, fuzzy
+#~ msgid "Authentication Credentials for HTTP Server"
+#~ msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
+
+#, fuzzy
+#~ msgid "Login name:"
+#~ msgstr "_Zerrenda-izena:"
+
+#~ msgid "URL:"
+#~ msgstr "URLa:"
+
+#~ msgid "contact-list-editor"
+#~ msgstr "kontaktu-zerrendaren editorea"
+
+#~ msgid "Save List as VCard"
+#~ msgstr "Gorde zerrenda VCard gisa"
+
+#, fuzzy
+#~ msgid "Groupwise"
+#~ msgstr "Taldea"
+
+#~ msgid "Could not start wombat"
+#~ msgstr "Ezin izan da wombat abiarazi"
+
+#, fuzzy
+#~ msgid "C_alendar"
+#~ msgstr "E_gutegia:"
+
+#~ msgid "Audio Alarm Options"
+#~ msgstr "Audio alarmaren aukerak"
+
+#~ msgid "Message Alarm Options"
+#~ msgstr "Mezu-alarmaren aukerak"
+
+#~ msgid "Email Alarm Options"
+#~ msgstr "Posta elektronikoaren alarmaren aukerak"
+
+#~ msgid "Program Alarm Options"
+#~ msgstr "Programa-alarmaren aukerak"
+
+#~ msgid "Unknown Alarm Options"
+#~ msgstr "Alarma ezezagunen aukerak"
+
+#~ msgid "Alarm Repeat"
+#~ msgstr "Alarma-errepikapena"
+
+#~ msgid "Message to Display:"
+#~ msgstr "Bistaratuko den mezua:"
+
+#~ msgid "Message to Send"
+#~ msgstr "Bidali beharreko mezua"
+
+#~ msgid "Play sound:"
+#~ msgstr "Jo soinua:"
+
+#~ msgid "Run program:"
+#~ msgstr "Ireki programa:"
+
+#~ msgid "With these arguments:"
+#~ msgstr "Argumentu hauekin:"
+
+#~ msgid "Basics"
+#~ msgstr "Oinarriak"
+
+#~ msgid "Date/Time:"
+#~ msgstr "Data/Ordua:"
+
+#~ msgid "Reminders"
+#~ msgstr "Oroigarriak"
+
+#~ msgid "_Options..."
+#~ msgstr "_Aukerak..."
+
+#~ msgid "Addressbook..."
+#~ msgstr "Helbide-liburua..."
+
+#~ msgid "Reminder"
+#~ msgstr "Oroigarria"
+
+#~ msgid "B_usy"
+#~ msgstr "_Okupatuta"
+
+#~ msgid "Co_nfidential"
+#~ msgstr "_Konfidentziala"
+
+#~ msgid "Date & Time"
+#~ msgstr "Data eta ordua"
+
+#~ msgid "F_ree"
+#~ msgstr "L_ibre"
+
+#~ msgid "Pri_vate"
+#~ msgstr "Pri_batua"
+
+#~ msgid "Pu_blic"
+#~ msgstr "_Publikoa"
+
+#, fuzzy
+#~ msgid "Add A_ttendee"
+#~ msgstr "Partaidea"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook."
+#~ msgstr "Gehitu bidaltzailea helbide-liburuan"
+
+#~ msgid "Preview"
+#~ msgstr "Aurrebista"
+
+#~ msgid "Recurrence Rule"
+#~ msgstr "Errepikatze-araua"
+
+#~ msgid "_Custom recurrence"
+#~ msgstr "_Errepikapen pertsonalizatua"
+
+#~ msgid "_Modify"
+#~ msgstr "_Aldatu"
+
+#~ msgid "_No recurrence"
+#~ msgstr "E_rrepikapenik ez"
+
+#~ msgid "_Simple recurrence"
+#~ msgstr "Errepikapen _soila"
+
+#, fuzzy
+#~ msgid "% _Complete"
+#~ msgstr "Osatuta %"
+
+#~ msgid "Progress"
+#~ msgstr "Lanean"
+
+#~ msgid "Con_fidential"
+#~ msgstr "Kon_fidentziala"
+
+#, fuzzy
+#~ msgid "Folder:"
+#~ msgstr "Kar_peta:"
+
+#~ msgid "<b>Starts:</b> "
+#~ msgstr "<b>Hasiera:</b> "
+
+#~ msgid "<b>Ends:</b> "
+#~ msgstr "<b>Amaiera:</b> "
+
+#~ msgid "<b>Completed:</b> "
+#~ msgstr "<b>Eginda:</b> "
+
+#~ msgid "<b>Due:</b> "
+#~ msgstr "<b>Falta:</b> "
+
+#~ msgid "<i>None</i>"
+#~ msgstr "<i>Bat ere ez</i>"
+
+#~ msgid "There was an error on the CORBA system\n"
+#~ msgstr "Errorea izan da CORBA sisteman\n"
+
+#~ msgid "Object could not be found\n"
+#~ msgstr "Objektua ezin izan da aurkitu\n"
+
+#~ msgid "You don't have the right permissions to update the calendar\n"
+#~ msgstr "Ez dauzkazu egutegia eguneratzeko behar diren baimenak\n"
+
+#~ msgid "Attendee status could not be updated!\n"
+#~ msgstr "Partaidearen egoera ezin izan da eguneratu\n"
+
+#, fuzzy
+#~ msgid "Add attendees from addressbook"
+#~ msgstr "Gehitu bidaltzailea helbide-liburuan"
+
+#~ msgid "_Options"
+#~ msgstr "Au_kerak"
+
+#~ msgid "Meeting _start time:"
+#~ msgstr "Bilera _hasteko ordua:"
+
+#~ msgid "Meeting _end time:"
+#~ msgstr "Bilera amai_tzeko ordua:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Error opening %s:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea %s(e)n:\n"
+#~ " %s"
+
+#, fuzzy
+#~ msgid "Can't find certificate for `%s'"
+#~ msgstr "Huts egin du \"%s\"(r)en ziurtagiria aurkitzean."
+
+#, fuzzy
+#~ msgid "Can't create CMS Message"
+#~ msgstr "Sortu _araua mezutik"
+
+#, fuzzy
+#~ msgid "Can't create encoder context"
+#~ msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
+
+#~ msgid ""
+#~ "Could not create composer window:\n"
+#~ "Unable to activate HTML editor component."
+#~ msgstr ""
+#~ "Ezin izan da mezua prestatzeko leihoa sortu:\n"
+#~ "Ezin da HTML editorearen osagaia aktibatu."
+
+#, fuzzy
+#~ msgid "_Score Rules"
+#~ msgstr "Puntuazio-arauak"
+
+#, fuzzy
+#~ msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+#~ msgstr ""
+#~ "Jatorrizko mezua:\n"
+#~ "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
+
+#, fuzzy
+#~ msgid "Folder Name"
+#~ msgstr "Ka_rpeta-izena:"
+
+#~ msgid "_Rename"
+#~ msgstr "_Izena aldatu"
+
+#~ msgid "_Properties..."
+#~ msgstr "_Propietateak..."
+
+#~ msgid "Checkbox"
+#~ msgstr "Kontrol-laukia"
+
+#~ msgid "C_alendar:"
+#~ msgstr "E_gutegia:"
+
+#, fuzzy
+#~ msgid "_Contacts:"
+#~ msgstr "Kontaktuak: "
+
+#~ msgid "_Mail:"
+#~ msgstr "_Posta:"
+
+#~ msgid "_Tasks:"
+#~ msgstr "_Zereginak:"
+
+#~ msgid "Folder _type:"
+#~ msgstr "Karpeta-_mota:"
+
+#~ msgid "Open Other User's Folder"
+#~ msgstr "Ireki beste erabiltzaile baten karpeta"
+
+#~ msgid "_Folder Name:"
+#~ msgstr "Ka_rpeta-izena:"
+
+#~ msgid "_User:"
+#~ msgstr "_Erabiltzaile-izena:"
+
 #~ msgid "Failed to connect to LDAP server"
 #~ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 
-#~ msgid "Failed to authenticate with LDAP server"
-#~ msgstr "Huts egin du LDAP zerbitzarian autentifikatzean"
-
 #~ msgid "Could not perform query on Root DSE"
 #~ msgstr "Ezin izan da egin kontsulta Root DSEn"
 
-#~ msgid "The server responded with no supported search bases"
-#~ msgstr "Onartzen ez diren bilaketa-oinarriekin erantzun du zerbitzariak"
-
-#~ msgid "This server does not support LDAPv3 schema information"
-#~ msgstr "Zerbitzari honek ez du onartzen LDAPv3 eskema-informazioa"
-
 #~ msgid "Error retrieving schema information"
 #~ msgstr "Errorea eskema-informazioa eskuratzean"
 
-#~ msgid "Server did not respond with valid schema information"
-#~ msgstr "Zerbitzariak ez du erantzun baliozko eskema-informazioarekin"
-
 #~ msgid "  S_how Supported Bases "
 #~ msgstr "  E_rakutsi onartzen diren oinarriak "
 
@@ -19383,9 +20346,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Webcam:"
 #~ msgstr "Orrialdea"
 
-#~ msgid "Category editor not available."
-#~ msgstr "Kategoria-editorea ez dago erabilgarri."
-
 #, fuzzy
 #~ msgid ""
 #~ "The following entries are invalid:\n"
@@ -19441,9 +20401,6 @@ msgstr "%s (%%%d osatuta)"
 #~ "Ezabatzen ari zaren gertaera bilera bat da. Bilera bertan beherautzi dela "
 #~ "dioen oharra bidali nahi duzu?"
 
-#~ msgid "Are you sure you want to cancel and delete this meeting?"
-#~ msgstr "Ziur zaude bilera hau bertan behera utzi eta ezabatu nahi duzula?"
-
 #~ msgid ""
 #~ "The task being deleted is assigned, would you like to send a cancellation "
 #~ "notice?"
@@ -19461,47 +20418,15 @@ msgstr "%s (%%%d osatuta)"
 #~ "Ezabatzen ari zaren egunkari-sarrera argitaratuta dago. Bertan behera "
 #~ "utzi dela dioen oharra bidali nahi nahi duzu?"
 
-#~ msgid "Are you sure you want to cancel and delete this journal entry?"
-#~ msgstr ""
-#~ "Ziur zaude egunkariko sarrera hau bertan behera utzi eta ezabatu nahi "
-#~ "duzula?"
-
-#~ msgid "Are you sure you want to delete the appointment `%s'?"
-#~ msgstr "Ziur zaude `%s' hitzordua ezabatu nahi duzula?"
-
 #~ msgid "Are you sure you want to delete this untitled appointment?"
 #~ msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
 
-#~ msgid "Are you sure you want to delete the task `%s'?"
-#~ msgstr "Ziur zaude `%s' zeregina ezabatu nahi duzula?"
-
 #~ msgid "Are you sure you want to delete this untitled task?"
 #~ msgstr "Ziur zaude izenik gabeko zeregin hau ezabatu nahi duzula?"
 
-#~ msgid "Are you sure you want to delete the journal entry `%s'?"
-#~ msgstr "Ziur zaude egunkariko `%s' sarrera ezabatu nahi duzula?"
-
 #~ msgid "Are you sure want to delete this untitled journal entry?"
 #~ msgstr "Ziur zaude egunkariko sarrera izengabe hau ezabatu nahi duzula?"
 
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d appointment?"
-#~ msgid_plural "Are you sure you want to delete %d appointments?"
-#~ msgstr[0] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
-#~ msgstr[1] "Ziur zaude %d hitzordu ezabatu nahi dituzula?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d task?"
-#~ msgid_plural "Are you sure you want to delete %d tasks?"
-#~ msgstr[0] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
-#~ msgstr[1] "Ziur zaude %d zeregin ezabatu nahi dituzula?"
-
-#, fuzzy
-#~ msgid "Are you sure you want to delete %d journal entry?"
-#~ msgid_plural "Are you sure you want to delete %d journal entries?"
-#~ msgstr[0] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
-#~ msgstr[1] "Ziur zaude %d egunkari-sarrera ezabatu nahi dituzula?"
-
 #~ msgid "_Invite Others..."
 #~ msgstr "_Gonbidatu beste batzuk..."
 
@@ -19535,10 +20460,6 @@ msgstr "%s (%%%d osatuta)"
 #~ "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
 #, fuzzy
-#~ msgid "Could not get article %s from NNTP server"
-#~ msgstr "Ezin izan da wombat zerbitzaria abiarazi"
-
-#, fuzzy
 #~ msgid "Error posting message: %s: message not posted"
 #~ msgstr ""
 #~ "Errorea mezua automatikoki gordetzean: %s\n"
@@ -19562,179 +20483,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Unknown server response: %s"
 #~ msgstr "Zerbitzari-erantzun ezezaguna: %s"
 
-#~ msgid "Adjust Score"
-#~ msgstr "Doitu puntuazioa"
-
-#~ msgid "Assign Color"
-#~ msgstr "Esleitu kolorea"
-
-#~ msgid "Assign Score"
-#~ msgstr "Esleitu puntuazioa"
-
-#~ msgid "Attachments"
-#~ msgstr "Eranskinak"
-
-#~ msgid "Beep"
-#~ msgstr "Soinu-seinalea"
-
-#~ msgid "contains"
-#~ msgstr "hau daukana"
-
-#~ msgid "Copy to Folder"
-#~ msgstr "Kopiatu karpeta honetara"
-
-#~ msgid "Date received"
-#~ msgstr "Jasotze-data"
-
-#~ msgid "Date sent"
-#~ msgstr "Bidaltze-data"
-
-#~ msgid "Deleted"
-#~ msgstr "Ezabatuta"
-
-#~ msgid "does not contain"
-#~ msgstr "hau ez daukana"
-
-#~ msgid "does not end with"
-#~ msgstr "ez da honela amaitzen"
-
-#~ msgid "does not exist"
-#~ msgstr "ez dago"
-
-#~ msgid "does not return"
-#~ msgstr "ez du hau ematen"
-
-#~ msgid "does not sound like"
-#~ msgstr "ez da honen antzekoa"
-
-#~ msgid "does not start with"
-#~ msgstr "ez da honela hasten"
-
-#~ msgid "Do Not Exist"
-#~ msgstr "Ez"
-
-#~ msgid "Draft"
-#~ msgstr "Zirriborroa"
-
-#~ msgid "ends with"
-#~ msgstr "honela amaitzen da"
-
-#~ msgid "Exist"
-#~ msgstr "Bai"
-
-#~ msgid "exists"
-#~ msgstr "badago"
-
-#~ msgid "Expression"
-#~ msgstr "Adierazpena"
-
-#~ msgid "Follow Up"
-#~ msgstr "Jarraipena"
-
-#~ msgid "is"
-#~ msgstr "da"
-
-#~ msgid "is after"
-#~ msgstr "honen ondorengoa da"
-
-#~ msgid "is before"
-#~ msgstr "honen aurrekoa da"
-
-#~ msgid "is Flagged"
-#~ msgstr "Banderaduna da"
-
-#~ msgid "is greater than"
-#~ msgstr "hau baino handiagoa da"
-
-#~ msgid "is less than"
-#~ msgstr "hau baino txikiagoa da"
-
-#~ msgid "is not"
-#~ msgstr "ez da"
-
-#~ msgid "is not Flagged"
-#~ msgstr "ez da Banderaduna"
-
-#, fuzzy
-#~ msgid "Junk Test"
-#~ msgstr "ekaina"
-
-#~ msgid "Mailing list"
-#~ msgstr "Posta-zerrenda"
-
-#~ msgid "Message Body"
-#~ msgstr "Mezuaren gorputza"
-
-#~ msgid "Message Header"
-#~ msgstr "Mezuaren goiburua"
-
-#, fuzzy
-#~ msgid "Message is Junk"
-#~ msgstr "Mezuak"
-
-#, fuzzy
-#~ msgid "Message is not Junk"
-#~ msgstr "Bidali beharreko mezua"
-
-#~ msgid "Move to Folder"
-#~ msgstr "Eraman karpeta honetara"
-
-#, fuzzy
-#~ msgid "Pipe to Program"
-#~ msgstr "Programatik irten"
-
-#~ msgid "Play Sound"
-#~ msgstr "Jo soinua"
-
-#~ msgid "Recipients"
-#~ msgstr "Hartzailea"
-
-#~ msgid "Regex Match"
-#~ msgstr "Adierazpen erregularra"
-
-#~ msgid "Replied to"
-#~ msgstr "Erantzunda"
-
-#~ msgid "returns"
-#~ msgstr "hau ematen du"
-
-#~ msgid "returns greater than"
-#~ msgstr "hau baino handiagoa ematen du"
-
-#~ msgid "returns less than"
-#~ msgstr "hau baino txikiagoa ematen du"
-
-#, fuzzy
-#~ msgid "Run Program"
-#~ msgstr "Ireki programa:"
-
-#~ msgid "Sender"
-#~ msgstr "Bidaltzailea"
-
-#~ msgid "Set Status"
-#~ msgstr "Ezarri egoera"
-
-#~ msgid "Size (kB)"
-#~ msgstr "Tamaina (kB)"
-
-#~ msgid "sounds like"
-#~ msgstr "honen antzekoa da"
-
-#~ msgid "Source Account"
-#~ msgstr "Iturburu-kontua"
-
-#~ msgid "Specific header"
-#~ msgstr "Goiburu espezifikoa"
-
-#~ msgid "starts with"
-#~ msgstr "honela hasten da"
-
-#~ msgid "Stop Processing"
-#~ msgstr "Utzi prozesatzeari"
-
-#~ msgid "Unset Status"
-#~ msgstr "Egoera ezarri gabe"
-
 #~ msgid "Working"
 #~ msgstr "Lanean"
 
@@ -19938,9 +20686,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Finished"
 #~ msgstr "Amaituta"
 
-#~ msgid "Group:"
-#~ msgstr "Taldea:"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -20600,12 +21345,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Receiving LDAP search results..."
 #~ msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#~ msgid "Error performing search"
-#~ msgstr "Errorea bilaketa egitean"
-
-#~ msgid "Cursor could not be loaded\n"
-#~ msgstr "Ezin izan da kurtsorea kargatu\n"
-
 #~ msgid "EBook not loaded\n"
 #~ msgstr "EBook ez dago kargatuta\n"
 
@@ -20794,9 +21533,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_Save as..."
 #~ msgstr "_Gorde honela..."
 
-#~ msgid "Alarms"
-#~ msgstr "Alarmak"
-
 #~ msgid "Geographical Position"
 #~ msgstr "Kokaleku geografikoa"
 
@@ -23389,9 +24125,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Emporia"
 #~ msgstr "Emporia"
 
-#~ msgid "Enid"
-#~ msgstr "Enid"
-
 #~ msgid "Enid/Woodring"
 #~ msgstr "Enid/Woodring"
 
@@ -24775,9 +25508,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "La Junta"
 #~ msgstr "La Junta"
 
-#~ msgid "Lake Charles"
-#~ msgstr "Lake Charles"
-
 #~ msgid "Lake Hood"
 #~ msgstr "Lake Hood"
 
@@ -25168,9 +25898,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Mammoth Lakes"
 #~ msgstr "Mammoth Lakes"
 
-#~ msgid "Managua"
-#~ msgstr "Managua"
-
 #~ msgid "Manassas"
 #~ msgstr "Manassas"
 
@@ -27556,9 +28283,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "South Dakota"
 #~ msgstr "Hego Dakota"
 
-#~ msgid "Southend"
-#~ msgstr "Southend"
-
 #~ msgid "South Marsh Island"
 #~ msgstr "South Marsh Island"
 
@@ -30104,9 +30828,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "View the selected folder"
 #~ msgstr "Bistaratu hautatutako karpeta"
 
-#~ msgid "_Copy..."
-#~ msgstr "K_opiatu..."
-
 #~ msgid "_Folder Bar"
 #~ msgstr "_Karpeta-barra"
 
@@ -30116,18 +30837,12 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "_Go to Folder..."
 #~ msgstr "_Joan karpeta honetara..."
 
-#~ msgid "_Move..."
-#~ msgstr "_Lekuz aldatu..."
-
 #~ msgid "_New Folder"
 #~ msgstr "_Karpeta berria"
 
 #~ msgid "_Remove Other User's Folder"
 #~ msgstr "Ken_du beste erabiltzaile baten karpeta"
 
-#~ msgid "_Rename..."
-#~ msgstr "Izena _aldatu..."
-
 #~ msgid "_Shortcut Bar"
 #~ msgstr "La_sterbide-barra"
 
@@ -30146,9 +30861,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "With _Category"
 #~ msgstr "Kategoria hau _dutenak"
 
-#~ msgid "Information"
-#~ msgstr "Informazioa"
-
 #~ msgid "Error"
 #~ msgstr "Errorea"
 
@@ -30161,8 +30873,5 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Evolution Addressbook local/LDAP backend"
 #~ msgstr "Evolution-en helbide-liburuko lokala/LDAP modulua"
 
-#~ msgid "Evolution Calendar local file backend"
-#~ msgstr "Evolution-en egutegiaren fitxategi lokalaren modulua"
-
 #~ msgid "Evolution Addressbook local file backend"
 #~ msgstr "Evolution-en helbide-liburuaren fitxategi lokalaren modulua"