Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22964
author: Ettore Perazzoli <ettore@src.gnome.org> 2003-10-22 02:28:34 +0800
committer: Ettore Perazzoli <ettore@src.gnome.org> 2003-10-22 02:28:34 +0800
commit: 0fb08f3ff81575a4749d851404233f34252dd2f2 (patch)
tree: 7e03befedc3a76fd104921dbbc616810d87333be /po/eu.po
parent: 0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff)
download: gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.bz2
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.lz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.xz
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst
gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip
1 files changed, 3464 insertions, 3672 deletions
diff --git a/po/eu.po b/po/eu.po
index 849cb48a0e..ae8c4d7e2c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.1.0\n"
-"POT-Creation-Date: 2003-10-15 23:45+0200\n"
+"POT-Creation-Date: 2003-06-25 13:24-0400\n"
 "PO-Revision-Date: 2001-05-25 13:35+0200\n"
 "Last-Translator: Josu Waliño <josu@elhuyar.com>\n"
 "Language-Team: Euskara\n"
@@ -13,198 +13,50 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: addressbook/backend/ebook/e-card.c:1306
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution LDIF importer"
+msgstr "Evolution-en Inportatzeko laguntzailea"
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
+msgid "LDAP Data Interchange Format (.ldif)"
+msgstr ""
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#, fuzzy
+msgid "Evolution VCard Importer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#, fuzzy
+msgid "Evolution VCard importer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
+msgid "VCard (.vcf, .gcrd)"
+msgstr ""
+
 #: addressbook/backend/ebook/e-card-simple.c:60
+#: addressbook/backend/ebook/e-card.c:1306
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:15
 msgid "File As"
 msgstr "Jaso honela"
 
-#: addressbook/backend/ebook/e-card.c:1313
-#: addressbook/gui/contact-editor/fullname.glade.h:4
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
-msgid "Full Name"
-msgstr "Izen osoa"
-
-#: addressbook/backend/ebook/e-card.c:1320
 #: addressbook/backend/ebook/e-card-simple.c:61
-#: addressbook/gui/component/select-names/e-select-names.etspec.h:1
+#: addressbook/backend/ebook/e-card.c:1320
 #: 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
 #: my-evolution/e-summary-table.c:59
 msgid "Name"
 msgstr "Izena"
 
-#: addressbook/backend/ebook/e-card.c:1326
-#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#, fuzzy
-msgid "Address"
-msgstr "Helbi_dea:"
-
-#: addressbook/backend/ebook/e-card.c:1333
-#, fuzzy
-msgid "Address Label"
-msgstr "Helbide-txartelak"
-
-#: addressbook/backend/ebook/e-card.c:1340
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/backend/ebook/e-card-simple.c:62
+#: addressbook/backend/ebook/e-card.c:1347
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
 msgid "Email"
 msgstr "Helb. el."
 
-#: addressbook/backend/ebook/e-card.c:1354
-#, fuzzy
-msgid "Birth date"
-msgstr "Jaioteguna"
-
-#: addressbook/backend/ebook/e-card.c:1360
-#: calendar/gui/e-calendar-table.etspec.h:18
-msgid "URL"
-msgstr "URLa"
-
-#: addressbook/backend/ebook/e-card.c:1367
-#: addressbook/backend/ebook/e-card-simple.c:69
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
-msgid "Organization"
-msgstr "Erakundea"
-
-#: addressbook/backend/ebook/e-card.c:1374
-#, fuzzy
-msgid "Organizational Unit"
-msgstr "Erakundea"
-
-#: addressbook/backend/ebook/e-card.c:1381
-#: addressbook/backend/ebook/e-card-simple.c:90
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-msgid "Office"
-msgstr "Bulegoa"
-
-#: addressbook/backend/ebook/e-card.c:1388
-#: addressbook/backend/ebook/e-card-simple.c:91
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Title"
-msgstr "Kargua"
-
-#: addressbook/backend/ebook/e-card.c:1395
-#: calendar/gui/e-meeting-time-sel.etspec.h:9
-msgid "Role"
-msgstr "Funtzioa"
-
-#: addressbook/backend/ebook/e-card.c:1402
-#: addressbook/backend/ebook/e-card-simple.c:93
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-msgid "Manager"
-msgstr "Zuzendaria"
-
-#: addressbook/backend/ebook/e-card.c:1409
-#: addressbook/backend/ebook/e-card-simple.c:64
-#: addressbook/backend/ebook/e-card-simple.c:94
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
-msgid "Assistant"
-msgstr "Laguntzailea"
-
-#: addressbook/backend/ebook/e-card.c:1416
-#: addressbook/backend/ebook/e-card-simple.c:95
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-msgid "Nickname"
-msgstr "Goitizena"
-
-#: addressbook/backend/ebook/e-card.c:1423
-#: addressbook/backend/ebook/e-card-simple.c:96
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-msgid "Spouse"
-msgstr "Ezkontidea"
-
-#: addressbook/backend/ebook/e-card.c:1430
-#: addressbook/backend/ebook/e-card-simple.c:101
-msgid "Anniversary"
-msgstr "Urteurrena"
-
-#: addressbook/backend/ebook/e-card.c:1436
-#, fuzzy
-msgid "Mailer"
-msgstr "Posta"
-
-#: addressbook/backend/ebook/e-card.c:1443
-#: addressbook/backend/ebook/e-card-simple.c:98
-msgid "Calendar URI"
-msgstr "Egutegi-URIa"
-
-#: addressbook/backend/ebook/e-card.c:1450
-#, fuzzy
-msgid "Free/Busy URL"
-msgstr "_Libre/okupatuta URLa:"
-
-#: addressbook/backend/ebook/e-card.c:1457
-#, fuzzy
-msgid "ICS Calendar"
-msgstr "Egutegia"
-
-#: addressbook/backend/ebook/e-card.c:1464
-#: addressbook/backend/ebook/e-card-simple.c:97
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
-msgid "Note"
-msgstr "Oharra"
-
-#: addressbook/backend/ebook/e-card.c:1471
-#, fuzzy
-msgid "Related Contacts"
-msgstr "Kontaktua ezabatu?"
-
-#: addressbook/backend/ebook/e-card.c:1478
-#: addressbook/backend/ebook/e-card-simple.c:105
-#: calendar/gui/e-calendar-table.etspec.h:4
-msgid "Categories"
-msgstr "Kategoriak"
-
-#: addressbook/backend/ebook/e-card.c:1485
-#, fuzzy
-msgid "Category List"
-msgstr "Kategoria da"
-
-#: addressbook/backend/ebook/e-card.c:1492
-msgid "Wants HTML"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1499
-msgid "Wants HTML set"
-msgstr ""
-
-#: addressbook/backend/ebook/e-card.c:1506 ui/evolution-calendar.xml.h:16
-#, fuzzy
-msgid "List"
-msgstr "Lista"
-
-#: addressbook/backend/ebook/e-card.c:1513
-#, fuzzy
-msgid "List Show Addresses"
-msgstr "Beste helbide bat"
-
-#: addressbook/backend/ebook/e-card.c:1520
-#, fuzzy
-msgid "Arbitrary"
-msgstr "Amritsar"
-
-#: addressbook/backend/ebook/e-card.c:1527
-#, fuzzy
-msgid "ID"
-msgstr "jn."
-
-#: addressbook/backend/ebook/e-card.c:1534
-#, fuzzy
-msgid "Last Use"
-msgstr "Itsatsi"
-
-#: addressbook/backend/ebook/e-card.c:1545
-#, fuzzy
-msgid "Use Score"
-msgstr "Puntuazioa"
-
 #: addressbook/backend/ebook/e-card-simple.c:63
 #: addressbook/gui/contact-editor/e-contact-editor.c:1752
 msgid "Primary"
@@ -214,6 +66,14 @@ msgstr "Nagusia"
 msgid "Prim"
 msgstr "Nag"
 
+#: addressbook/backend/ebook/e-card-simple.c:64
+#: addressbook/backend/ebook/e-card-simple.c:94
+#: addressbook/backend/ebook/e-card.c:1409
+#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:2
+msgid "Assistant"
+msgstr "Laguntzailea"
+
 #: addressbook/backend/ebook/e-card-simple.c:65
 #: addressbook/backend/ebook/e-card-simple.c:70
 #: addressbook/gui/contact-editor/e-contact-editor.c:1738
@@ -248,6 +108,12 @@ msgid "Home"
 msgstr "Etxekoa"
 
 #: addressbook/backend/ebook/e-card-simple.c:69
+#: addressbook/backend/ebook/e-card.c:1367
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
+msgid "Organization"
+msgstr "Erakundea"
+
+#: addressbook/backend/ebook/e-card-simple.c:69
 msgid "Org"
 msgstr "Erak"
 
@@ -366,9 +232,21 @@ msgid "Dep"
 msgstr "Sai"
 
 #: addressbook/backend/ebook/e-card-simple.c:90
+#: addressbook/backend/ebook/e-card.c:1381
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Office"
+msgstr "Bulegoa"
+
+#: addressbook/backend/ebook/e-card-simple.c:90
 msgid "Off"
 msgstr "Bul"
 
+#: addressbook/backend/ebook/e-card-simple.c:91
+#: addressbook/backend/ebook/e-card.c:1388
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Title"
+msgstr "Kargua"
+
 #: addressbook/backend/ebook/e-card-simple.c:92
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Profession"
@@ -379,6 +257,12 @@ msgid "Prof"
 msgstr "Lanb"
 
 #: addressbook/backend/ebook/e-card-simple.c:93
+#: addressbook/backend/ebook/e-card.c:1402
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Manager"
+msgstr "Zuzendaria"
+
+#: addressbook/backend/ebook/e-card-simple.c:93
 msgid "Man"
 msgstr "Zuz"
 
@@ -387,9 +271,32 @@ msgid "Ass"
 msgstr "Lag"
 
 #: addressbook/backend/ebook/e-card-simple.c:95
+#: addressbook/backend/ebook/e-card.c:1416
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Nickname"
+msgstr "Goitizena"
+
+#: addressbook/backend/ebook/e-card-simple.c:95
 msgid "Nick"
 msgstr "Goit"
 
+#: addressbook/backend/ebook/e-card-simple.c:96
+#: addressbook/backend/ebook/e-card.c:1423
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Spouse"
+msgstr "Ezkontidea"
+
+#: addressbook/backend/ebook/e-card-simple.c:97
+#: addressbook/backend/ebook/e-card.c:1464
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
+msgid "Note"
+msgstr "Oharra"
+
+#: addressbook/backend/ebook/e-card-simple.c:98
+#: addressbook/backend/ebook/e-card.c:1443
+msgid "Calendar URI"
+msgstr "Egutegi-URIa"
+
 #: addressbook/backend/ebook/e-card-simple.c:98
 msgid "CALUri"
 msgstr "EguURI"
@@ -413,6 +320,11 @@ msgid "icsCalendar"
 msgstr "Egutegia"
 
 #: addressbook/backend/ebook/e-card-simple.c:101
+#: addressbook/backend/ebook/e-card.c:1430
+msgid "Anniversary"
+msgstr "Urteurrena"
+
+#: addressbook/backend/ebook/e-card-simple.c:101
 msgid "Anniv"
 msgstr "Urteu"
 
@@ -420,6 +332,12 @@ msgstr "Urteu"
 msgid "Birth Date"
 msgstr "Jaioteguna"
 
+#: addressbook/backend/ebook/e-card-simple.c:105
+#: addressbook/backend/ebook/e-card.c:1478
+#: calendar/gui/e-calendar-table.etspec.h:4
+msgid "Categories"
+msgstr "Kategoriak"
+
 #: addressbook/backend/ebook/e-card-simple.c:106
 msgid "Family Name"
 msgstr "Deitura"
@@ -435,34 +353,123 @@ msgid "%x"
 msgstr "%x"
 
 #: addressbook/backend/ebook/e-card-simple.c:912
-#: addressbook/backend/ebook/e-destination.c:709
+#: addressbook/backend/ebook/e-destination.c:706
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Kontaktu-zerrenda izengabea"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1313
+#: addressbook/gui/contact-editor/fullname.glade.h:4
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:17
+msgid "Full Name"
+msgstr "Izen osoa"
+
+#: addressbook/backend/ebook/e-card.c:1326
+#: addressbook/gui/contact-editor/e-contact-editor-address.c:96
 #, fuzzy
-msgid "Evolution LDIF importer"
-msgstr "Evolution-en Inportatzeko laguntzailea"
+msgid "Address"
+msgstr "Helbi_dea:"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_LDIF_Importer.server.in.in.h:2
-msgid "LDAP Data Interchange Format (.ldif)"
-msgstr ""
+#: addressbook/backend/ebook/e-card.c:1333
+#, fuzzy
+msgid "Address Label"
+msgstr "Helbide-txartelak"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:1
+#: addressbook/backend/ebook/e-card.c:1340
 #, fuzzy
-msgid "Evolution VCard Importer"
-msgstr "Evolution-en mezu-prestatzailea."
+msgid "Phone"
+msgstr "Ponce"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:2
+#: addressbook/backend/ebook/e-card.c:1354
 #, fuzzy
-msgid "Evolution VCard importer"
-msgstr "Evolution-en mezu-prestatzailea."
+msgid "Birth date"
+msgstr "Jaioteguna"
 
-#: addressbook/backend/ebook/GNOME_Evolution_Addressbook_VCard_Importer.server.in.in.h:3
-msgid "VCard (.vcf, .gcrd)"
+#: addressbook/backend/ebook/e-card.c:1360
+#: calendar/gui/e-calendar-table.etspec.h:19
+msgid "URL"
+msgstr "URLa"
+
+#: addressbook/backend/ebook/e-card.c:1374
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "Erakundea"
+
+#: addressbook/backend/ebook/e-card.c:1395
+#: calendar/gui/dialogs/meeting-page.etspec.h:9
+#: calendar/gui/e-meeting-time-sel.etspec.h:9
+msgid "Role"
+msgstr "Funtzioa"
+
+#: addressbook/backend/ebook/e-card.c:1436 mail/mail-format.c:963
+#, fuzzy
+msgid "Mailer"
+msgstr "Posta"
+
+#: addressbook/backend/ebook/e-card.c:1450
+#, fuzzy
+msgid "Free/Busy URL"
+msgstr "_Libre/okupatuta URLa:"
+
+#: addressbook/backend/ebook/e-card.c:1457
+#, fuzzy
+msgid "ICS Calendar"
+msgstr "Egutegia"
+
+#: addressbook/backend/ebook/e-card.c:1471
+#, fuzzy
+msgid "Related Contacts"
+msgstr "Kontaktua ezabatu?"
+
+#: addressbook/backend/ebook/e-card.c:1485
+#, fuzzy
+msgid "Category List"
+msgstr "Kategoria da"
+
+#: addressbook/backend/ebook/e-card.c:1492
+msgid "Wants HTML"
 msgstr ""
 
+#: addressbook/backend/ebook/e-card.c:1499
+msgid "Wants HTML set"
+msgstr ""
+
+#: addressbook/backend/ebook/e-card.c:1506
+#, fuzzy
+msgid "List"
+msgstr "Lista"
+
+#: addressbook/backend/ebook/e-card.c:1513
+#, fuzzy
+msgid "List Show Addresses"
+msgstr "Beste helbide bat"
+
+#: addressbook/backend/ebook/e-card.c:1520
+#, fuzzy
+msgid "Arbitrary"
+msgstr "Amritsar"
+
+#: addressbook/backend/ebook/e-card.c:1527
+#, fuzzy
+msgid "ID"
+msgstr "jn."
+
+#: addressbook/backend/ebook/e-card.c:1534
+#, fuzzy
+msgid "Last Use"
+msgstr "Itsatsi"
+
+#: addressbook/backend/ebook/e-card.c:1545
+#, fuzzy
+msgid "Use Score"
+msgstr "Puntuazioa"
+
+#: addressbook/backend/ebook/test-client-list.c:15
+#: addressbook/backend/ebook/test-client.c:33
+#: calendar/gui/alarm-notify/notify-main.c:171
+msgid "Could not initialize Bonobo"
+msgstr "Ezin izan da Bonobo hasieratu"
+
 #: addressbook/backend/pas/pas-backend-file.c:464
 #: addressbook/backend/pas/pas-backend-ldap.c:3050
 msgid "Searching..."
@@ -522,14 +529,14 @@ msgid "EBook not loaded\n"
 msgstr "EBook ez dago kargatuta\n"
 
 #: addressbook/conduit/address-conduit.c:1376
-#: calendar/conduits/calendar/calendar-conduit.c:1351
-#: calendar/conduits/todo/todo-conduit.c:893
+#: calendar/conduits/calendar/calendar-conduit.c:1342
+#: calendar/conduits/todo/todo-conduit.c:884
 msgid "Could not start wombat server"
 msgstr "Ezin izan da wombat zerbitzaria abiarazi"
 
 #: addressbook/conduit/address-conduit.c:1377
-#: calendar/conduits/calendar/calendar-conduit.c:1352
-#: calendar/conduits/todo/todo-conduit.c:894
+#: calendar/conduits/calendar/calendar-conduit.c:1343
+#: calendar/conduits/todo/todo-conduit.c:885
 msgid "Could not start wombat"
 msgstr "Ezin izan da wombat abiarazi"
 
@@ -538,6 +545,159 @@ msgstr "Ezin izan da wombat abiarazi"
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "Configure access to LDAP directory servers here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Directory Servers"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editatu helbide-liburua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Addressbook LDAP Configuration Control"
+msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook folder viewer"
+msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
+
+#: addressbook/gui/component/addressbook-component.c:76
+#: addressbook/gui/component/addressbook-component.c:620
+#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
+#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
+msgid "Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/addressbook-component.c:76
+msgid "Folder containing contact information"
+msgstr "Kontaktuen informazioa duen karpeta"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP Server"
+msgstr "LDAP zerbitzaria"
+
+#: addressbook/gui/component/addressbook-component.c:78
+msgid "LDAP server containing contact information"
+msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public Contacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/addressbook-component.c:80
+#, fuzzy
+msgid "Public folder containing contact information"
+msgstr "Kontaktuen informazioa duen karpeta"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "New Contact"
+msgstr "Kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:574
+msgid "_Contact"
+msgstr "_Kontaktua"
+
+#: addressbook/gui/component/addressbook-component.c:575
+#, fuzzy
+msgid "Create a new contact"
+msgstr "Sortu kontaktu berria"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "New Contact List"
+msgstr "Kontaktuen zerrenda berria"
+
+#: addressbook/gui/component/addressbook-component.c:578
+msgid "Contact _List"
+msgstr "_Kontaktuen zerrenda"
+
+#: addressbook/gui/component/addressbook-component.c:579
+#, fuzzy
+msgid "Create a new contact list"
+msgstr "Sortu kontaktu-zerrenda berria"
+
+#: addressbook/gui/component/addressbook-config.c:206
+#, fuzzy
+msgid "Failed to connect to LDAP server"
+msgstr "Ezin da LDAP zerbitzariarekin konektatu."
+
+#: addressbook/gui/component/addressbook-config.c:231
+#, fuzzy
+msgid "Failed to authenticate with LDAP server"
+msgstr ""
+"Ezin da IMAP zerbitzarirako autentifikatu.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook-config.c:259
+msgid "Could not perform query on Root DSE"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:682
+msgid "The server responded with no supported search bases"
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:1193
+#, fuzzy
+msgid "This server does not support LDAPv3 schema information"
+msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
+
+#: addressbook/gui/component/addressbook-config.c:1215
+#, fuzzy
+msgid "Error retrieving schema information"
+msgstr ""
+"Errorea iragazki-informazioa kargatzean:\n"
+"%s"
+
+#: addressbook/gui/component/addressbook-config.c:1223
+#, fuzzy
+msgid "Server did not respond with valid schema information"
+msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
+
+#: addressbook/gui/component/addressbook-config.c:1637
+msgid "Account Name"
+msgstr "Kontuaren izena"
+
+#: addressbook/gui/component/addressbook-config.c:1639
+msgid "Server Name"
+msgstr "Zerbitzari-izena"
+
+#: addressbook/gui/component/addressbook-config.c:1676
+#, fuzzy
+msgid "LDAP was not enabled in this build of Evolution"
+msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
+
+#: addressbook/gui/component/addressbook-storage.c:178
+msgid "Other Contacts"
+msgstr "Beste kontaktu batzuk"
+
 #: addressbook/gui/component/addressbook.c:502
 msgid ""
 "We were unable to open this addressbook.  Please check that the\n"
@@ -665,116 +825,6 @@ msgstr "Edozein kategoria"
 msgid "The URI that the Folder Browser will display"
 msgstr "Karpeta-arakatzaileak bistaratuko duen URIa"
 
-#: addressbook/gui/component/addressbook-component.c:76
-#: addressbook/gui/component/addressbook-component.c:628
-#: importers/netscape-importer.c:1874 mail/importers/netscape-importer.c:1844
-#: shell/e-local-storage.c:178 shell/e-shortcuts.c:1087
-msgid "Contacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/addressbook-component.c:76
-msgid "Folder containing contact information"
-msgstr "Kontaktuen informazioa duen karpeta"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP Server"
-msgstr "LDAP zerbitzaria"
-
-#: addressbook/gui/component/addressbook-component.c:78
-msgid "LDAP server containing contact information"
-msgstr "Kontaktuen informazioa duen LDAP zerbitzaria"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public Contacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/addressbook-component.c:80
-#, fuzzy
-msgid "Public folder containing contact information"
-msgstr "Kontaktuen informazioa duen karpeta"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "New Contact"
-msgstr "Kontaktu berria"
-
-#: addressbook/gui/component/addressbook-component.c:582
-msgid "_Contact"
-msgstr "_Kontaktua"
-
-#: addressbook/gui/component/addressbook-component.c:583
-#, fuzzy
-msgid "Create a new contact"
-msgstr "Sortu kontaktu berria"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "New Contact List"
-msgstr "Kontaktuen zerrenda berria"
-
-#: addressbook/gui/component/addressbook-component.c:586
-msgid "Contact _List"
-msgstr "_Kontaktuen zerrenda"
-
-#: addressbook/gui/component/addressbook-component.c:587
-#, fuzzy
-msgid "Create a new contact list"
-msgstr "Sortu kontaktu-zerrenda berria"
-
-#: addressbook/gui/component/addressbook-config.c:206
-#, fuzzy
-msgid "Failed to connect to LDAP server"
-msgstr "Ezin da LDAP zerbitzariarekin konektatu."
-
-#: addressbook/gui/component/addressbook-config.c:231
-#, fuzzy
-msgid "Failed to authenticate with LDAP server"
-msgstr ""
-"Ezin da IMAP zerbitzarirako autentifikatu.\n"
-"%s\n"
-"\n"
-
-#: addressbook/gui/component/addressbook-config.c:259
-msgid "Could not perform query on Root DSE"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:682
-msgid "The server responded with no supported search bases"
-msgstr ""
-
-#: addressbook/gui/component/addressbook-config.c:1193
-#, fuzzy
-msgid "This server does not support LDAPv3 schema information"
-msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
-
-#: addressbook/gui/component/addressbook-config.c:1215
-#, fuzzy
-msgid "Error retrieving schema information"
-msgstr ""
-"Errorea iragazki-informazioa kargatzean:\n"
-"%s"
-
-#: addressbook/gui/component/addressbook-config.c:1223
-#, fuzzy
-msgid "Server did not respond with valid schema information"
-msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
-
-#: addressbook/gui/component/addressbook-config.c:1637
-msgid "Account Name"
-msgstr "Kontuaren izena"
-
-#: addressbook/gui/component/addressbook-config.c:1639
-msgid "Server Name"
-msgstr "Zerbitzari-izena"
-
-#: addressbook/gui/component/addressbook-config.c:1676
-#, fuzzy
-msgid "LDAP was not enabled in this build of Evolution"
-msgstr "(SSL ez da onartzen Evolution-en bertsio honetan)"
-
-#: addressbook/gui/component/addressbook-storage.c:178
-msgid "Other Contacts"
-msgstr "Beste kontaktu batzuk"
-
 #.
 #. * This is the code for the UI thingie that lets you manipulate the e-mail
 #. * addresses (and *only* the e-mail addresses) associated with an existing
@@ -803,76 +853,33 @@ msgstr "Sortu kontaktu berria \"%s\""
 msgid "Add address to existing contact \"%s\""
 msgstr "Gehitu helbidea lehendik dagoen kontaktuari \"%s\""
 
-#: addressbook/gui/component/e-address-popup.c:917
+#: addressbook/gui/component/e-address-popup.c:914
 msgid "Querying Addressbook..."
 msgstr "Helbide-liburuan kontsulta egiten..."
 
-#: addressbook/gui/component/e-address-popup.c:1001
-#: addressbook/gui/component/e-address-widget.c:401
+#: addressbook/gui/component/e-address-popup.c:998
+#: addressbook/gui/component/e-address-widget.c:392
 msgid "Edit Contact Info"
 msgstr "Editatu kontaktu-informazioa"
 
-#: addressbook/gui/component/e-address-popup.c:1031
-#: addressbook/gui/component/e-address-widget.c:437
+#: addressbook/gui/component/e-address-popup.c:1028
+#: addressbook/gui/component/e-address-widget.c:428
 #: addressbook/gui/component/select-names/e-select-names-popup.c:324
 msgid "Add to Contacts"
 msgstr "Gehitu kontaktuei"
 
-#: addressbook/gui/component/e-address-popup.c:1056
+#: addressbook/gui/component/e-address-popup.c:1053
 msgid "Merge E-Mail Address"
 msgstr "Fusionatu helbide elektronikoa"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Disable Queries"
 msgstr "Desgaitu kontsultak"
 
-#: addressbook/gui/component/e-address-widget.c:378
+#: addressbook/gui/component/e-address-widget.c:369
 msgid "Enable Queries (Dangerous!)"
 msgstr "Gaitu kontsultak (Arriskutsua!)"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Configure access to LDAP directory servers here"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Directory Servers"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editatu helbide-liburua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Addressbook LDAP Configuration Control"
-msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Helbide-liburuko helbideen pop-up-erako fabrika"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
-
 #: addressbook/gui/component/ldap-config.glade.h:1
 #: addressbook/gui/contact-list-editor/contact-list-editor.glade.h:1
 #: mail/mail-config.glade.h:1
@@ -1029,9 +1036,10 @@ msgstr "Bat"
 msgid "S_earch scope: "
 msgstr "Bilaketa _barrutia: "
 
+#. No time range is set, so don't start a query
 #: addressbook/gui/component/ldap-config.glade.h:34
-#: calendar/gui/e-cal-view.c:541 calendar/gui/e-day-view.c:3261
-#: calendar/gui/e-week-view.c:1181 calendar/gui/gnome-cal.c:625
+#: calendar/gui/calendar-model.c:1983 calendar/gui/e-day-view.c:1712
+#: calendar/gui/e-week-view.c:1256
 msgid "Searching"
 msgstr "Bilaketa"
 
@@ -1231,11 +1239,11 @@ msgstr "_Deskarga-muga"
 
 #: addressbook/gui/component/ldap-config.glade.h:85 filter/filter.glade.h:14
 #: mail/mail-config.glade.h:143 ui/evolution-addressbook.xml.h:33
-#: ui/evolution-calendar.xml.h:35 ui/evolution-composer-entries.xml.h:8
-#: ui/evolution-mail-list.xml.h:24 ui/evolution-mail-messagedisplay.xml.h:6
+#: ui/evolution-calendar.xml.h:31 ui/evolution-composer-entries.xml.h:8
+#: ui/evolution-mail-list.xml.h:25 ui/evolution-mail-messagedisplay.xml.h:6
 #: ui/evolution-message-composer.xml.h:41
-#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:10
-#: ui/evolution-tasks.xml.h:19
+#: ui/evolution-signature-editor.xml.h:11 ui/evolution-subscribe.xml.h:10
+#: ui/evolution-tasks.xml.h:17
 msgid "_Edit"
 msgstr "_Edizioa"
 
@@ -1282,25 +1290,21 @@ msgstr "Orokorra"
 msgid "searching-tab"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/select-names/e-select-names.c:509
-msgid "Select Contacts from Addressbook"
-msgstr "Hautatu kontaktuak helbide-liburutik"
-
-#: addressbook/gui/component/select-names/e-select-names.c:650
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Find contact in"
-msgstr "bidaltzaileak hau dauka"
-
-#: addressbook/gui/component/select-names/e-select-names.c:694
-#: addressbook/gui/component/select-names/e-select-names-popup.c:211
-#: composer/e-msg-composer-attachment-bar.c:444
-msgid "Remove"
-msgstr "Kendu"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
 
 #: addressbook/gui/component/select-names/e-select-names-popup.c:204
 msgid "Remove All"
 msgstr "Kendu denak"
 
+#: addressbook/gui/component/select-names/e-select-names-popup.c:211
+#: addressbook/gui/component/select-names/e-select-names.c:694
+#: composer/e-msg-composer-attachment-bar.c:507
+msgid "Remove"
+msgstr "Kendu"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:218
 #, fuzzy
 msgid "View Contact List"
@@ -1325,10 +1329,14 @@ msgstr "Kontaktu izengabea"
 msgid "Source"
 msgstr "Iturburua"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:509
+msgid "Select Contacts from Addressbook"
+msgstr "Hautatu kontaktuak helbide-liburutik"
+
+#: addressbook/gui/component/select-names/e-select-names.c:650
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution-en helbide-liburuko izen-hautaketako interfazea."
+msgid "Find contact in"
+msgstr "bidaltzaileak hau dauka"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1405,7 +1413,7 @@ msgid "D_epartment:"
 msgstr "_Saila:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: calendar/gui/dialogs/task-editor.c:200
+#: calendar/gui/dialogs/task-editor.c:197
 msgid "Details"
 msgstr "Xehetasunak"
 
@@ -1476,13 +1484,11 @@ msgid "_Categories..."
 msgstr "Ka_tegoriak..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:28
-#: calendar/gui/dialogs/meeting-page.c:634
-#: calendar/gui/e-calendar-table.c:1008 calendar/gui/e-calendar-table.c:1026
-#: calendar/gui/e-cal-view.c:1144 calendar/gui/e-cal-view.c:1176
-#: ui/evolution-addressbook.xml.h:32 ui/evolution-calendar.xml.h:34
-#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:14
-#: ui/evolution-mail-message.xml.h:104 ui/evolution-tasks.xml.h:18
-#: ui/evolution.xml.h:45
+#: calendar/gui/dialogs/meeting-page.c:717 calendar/gui/e-calendar-table.c:977
+#: calendar/gui/e-day-view.c:3755 calendar/gui/e-week-view.c:3631
+#: mail/folder-browser.c:1790 ui/evolution-addressbook.xml.h:32
+#: ui/evolution-calendar.xml.h:30 ui/evolution-mail-message.xml.h:97
+#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:45
 msgid "_Delete"
 msgstr "E_zabatu..."
 
@@ -1527,15 +1533,15 @@ msgid "_Web page address:"
 msgstr "_Web orriaren helbidea:"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:102
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-editor/e-contact-editor-fullname.c:95
+#: addressbook/gui/contact-editor/e-contact-editor.c:184
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:163
 #: addressbook/gui/widgets/e-addressbook-model.c:318
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:408
-#: addressbook/gui/widgets/e-minicard.c:183
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:393
 #: addressbook/gui/widgets/e-minicard-label.c:164
-#: addressbook/gui/widgets/e-minicard-view.c:478
 #: addressbook/gui/widgets/e-minicard-view-widget.c:120
+#: addressbook/gui/widgets/e-minicard-view.c:478
+#: addressbook/gui/widgets/e-minicard.c:183
 #, fuzzy
 msgid "Editable"
 msgstr "Gaitu"
@@ -2564,18 +2570,18 @@ msgstr "Zimbawe"
 #: addressbook/gui/contact-editor/e-contact-editor.c:156
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:142
 #: addressbook/gui/widgets/e-addressbook-model.c:304
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:394
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:379
 #: addressbook/gui/widgets/e-addressbook-view.c:180
-#: addressbook/gui/widgets/e-minicard-view.c:464
 #: addressbook/gui/widgets/e-minicard-view-widget.c:106
+#: addressbook/gui/widgets/e-minicard-view.c:464
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
 
 #: addressbook/gui/contact-editor/e-contact-editor.c:163
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:149
-#: addressbook/gui/widgets/e-minicard.c:190
 #: addressbook/gui/widgets/e-minicard-widget.c:93
+#: addressbook/gui/widgets/e-minicard.c:190
 #, fuzzy
 msgid "Card"
 msgstr "Autokoa"
@@ -2809,7 +2815,7 @@ msgstr "Zerrenda berria"
 msgid "Contact List Editor"
 msgstr "Kontaktu-zerrendaren editorea"
 
-#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:457
+#: addressbook/gui/contact-list-editor/e-contact-list-editor.c:456
 msgid "Save List as VCard"
 msgstr "Gorde zerrenda VCard gisa"
 
@@ -2856,7 +2862,7 @@ msgstr ""
 "badago karpeta honetan. Hala ere gehitu nahi duzu?"
 
 #. FIXME: get the toplevel window...
-#: addressbook/gui/search/e-addressbook-search-dialog.c:116
+#: addressbook/gui/search/e-addressbook-search-dialog.c:117
 #: widgets/misc/e-filter-bar.c:148
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
@@ -2875,10 +2881,10 @@ msgid "%d cards"
 msgstr "%d txartel"
 
 #: addressbook/gui/widgets/e-addressbook-model.c:311
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:401
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:386
 #: addressbook/gui/widgets/e-addressbook-view.c:187
-#: addressbook/gui/widgets/e-minicard-view.c:471
 #: addressbook/gui/widgets/e-minicard-view-widget.c:113
+#: addressbook/gui/widgets/e-minicard-view.c:471
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
@@ -2888,118 +2894,118 @@ msgstr "Quimper"
 msgid "Error getting book view"
 msgstr "Errorea %s abiaraztean"
 
-#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:415
+#: addressbook/gui/widgets/e-addressbook-reflow-adapter.c:400
 #, fuzzy
 msgid "Model"
 msgstr "Molde"
 
-#: addressbook/gui/widgets/e-addressbook-table-adapter.c:148
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-table-adapter.c:145
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 #: addressbook/gui/widgets/e-minicard.c:531
 msgid "Error modifying card"
 msgstr "Errorea txartela aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:37
-#: shell/evolution-shell-component.c:1183
+#: addressbook/gui/widgets/e-addressbook-util.c:36
+#: shell/evolution-shell-component.c:1180
 msgid "Success"
 msgstr "Behar bezala egin da"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:38
+#: addressbook/gui/widgets/e-addressbook-util.c:37
 #: camel/providers/imap/camel-imap-command.c:306
 #: camel/providers/imap/camel-imap-command.c:403
 #: camel/providers/pop3/camel-pop3-store.c:526
 #: camel/providers/pop3/camel-pop3-store.c:533 shell/e-shell.c:2077
-#: shell/e-storage.c:598 shell/evolution-shell-component.c:1222
+#: shell/e-storage.c:598 shell/evolution-shell-component.c:1219
 msgid "Unknown error"
 msgstr "Errore ezezaguna"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:39
+#: addressbook/gui/widgets/e-addressbook-util.c:38
 msgid "Repository offline"
 msgstr "Biltegia deskonektatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:40 shell/e-storage.c:584
-#: shell/evolution-shell-component.c:1213
+#: addressbook/gui/widgets/e-addressbook-util.c:39 shell/e-storage.c:584
+#: shell/evolution-shell-component.c:1210
 msgid "Permission denied"
 msgstr "Baimena ukatuta"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:41
+#: addressbook/gui/widgets/e-addressbook-util.c:40
 msgid "Card not found"
 msgstr "Ez da txartela aurkitu"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:42
+#: addressbook/gui/widgets/e-addressbook-util.c:41
 msgid "Card ID already exists"
 msgstr "Txartelaren ID hori badago lehendik"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: addressbook/gui/widgets/e-addressbook-util.c:42
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:44
+#: addressbook/gui/widgets/e-addressbook-util.c:43
+#: calendar/gui/calendar-model.c:759 calendar/gui/calendar-model.c:1184
 #: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-calendar-table.c:479 calendar/gui/e-cal-model-tasks.c:325
-#: calendar/gui/e-cal-model-tasks.c:604 calendar/gui/e-tasks.c:253
-#: calendar/gui/print.c:2314 camel/camel-service.c:733
-#: camel/camel-service.c:771 camel/camel-service.c:855
-#: camel/camel-service.c:895 camel/providers/pop3/camel-pop3-store.c:443
+#: calendar/gui/e-calendar-table.c:477 calendar/gui/print.c:2307
+#: camel/camel-service.c:745 camel/camel-service.c:785
+#: camel/camel-service.c:875 camel/camel-service.c:917
+#: camel/providers/pop3/camel-pop3-store.c:443
 #: camel/providers/pop3/camel-pop3-store.c:520
 msgid "Cancelled"
 msgstr "Bertan behera utzita"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:45
+#: addressbook/gui/widgets/e-addressbook-util.c:44
 #, fuzzy
 msgid "Authentication Failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: addressbook/gui/widgets/e-addressbook-util.c:46
+#: addressbook/gui/widgets/e-addressbook-util.c:45
 #, fuzzy
 msgid "Authentication Required"
 msgstr "Autentifikazioa behar da"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:47
+#: addressbook/gui/widgets/e-addressbook-util.c:46
 msgid "TLS not Available"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-util.c:48
+#: addressbook/gui/widgets/e-addressbook-util.c:47
 #, fuzzy
 msgid "Addressbook does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: addressbook/gui/widgets/e-addressbook-util.c:49
+#: addressbook/gui/widgets/e-addressbook-util.c:48
 msgid "Other error"
 msgstr "Beste errore bat"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:76
+#: addressbook/gui/widgets/e-addressbook-util.c:75
 msgid "Do you want to save changes?"
 msgstr "Aldaketak gorde nahi dituzu?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:78
+#: addressbook/gui/widgets/e-addressbook-util.c:77
 #, fuzzy
 msgid "_Discard"
 msgstr "Dinard"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
+#: addressbook/gui/widgets/e-addressbook-util.c:96
 msgid "Error adding list"
 msgstr "Errorea zerrenda gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:97
-#: addressbook/gui/widgets/e-addressbook-util.c:273
+#: addressbook/gui/widgets/e-addressbook-util.c:96
+#: addressbook/gui/widgets/e-addressbook-util.c:272
 msgid "Error adding card"
 msgstr "Errorea txartela gehitzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:106
+#: addressbook/gui/widgets/e-addressbook-util.c:105
 msgid "Error modifying list"
 msgstr "Errorea zerrenda aldatzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
+#: addressbook/gui/widgets/e-addressbook-util.c:115
 msgid "Error removing list"
 msgstr "Errorea zerrenda kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:116
-#: addressbook/gui/widgets/e-addressbook-util.c:231
+#: addressbook/gui/widgets/e-addressbook-util.c:115
+#: addressbook/gui/widgets/e-addressbook-util.c:230
 msgid "Error removing card"
 msgstr "Errorea txartela kentzean"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:198
+#: addressbook/gui/widgets/e-addressbook-util.c:197
 #, fuzzy, c-format
 msgid ""
 "Opening %d cards will open %d new windows as well.\n"
@@ -3008,138 +3014,139 @@ msgstr ""
 "%d txartel txartelak izatea eskatu duzu. Hori dela-eta %d leiho berri\n"
 "agertuko dira pantailan. Ziur zaude txartel horiek bistaratu nahi dituzula?"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:329
+#: addressbook/gui/widgets/e-addressbook-util.c:328
 msgid "Move card to"
 msgstr "Eraman txartela hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:331
+#: addressbook/gui/widgets/e-addressbook-util.c:330
 msgid "Copy card to"
 msgstr "Kopiatu txartela hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:334
+#: addressbook/gui/widgets/e-addressbook-util.c:333
 msgid "Move cards to"
 msgstr "Eraman txartelak hona"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:336
+#: addressbook/gui/widgets/e-addressbook-util.c:335
 msgid "Copy cards to"
 msgstr "Kopiatu txartelak hemen"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:518
+#: addressbook/gui/widgets/e-addressbook-util.c:517
 msgid "Multiple VCards"
 msgstr "VCard anitz"
 
-#: addressbook/gui/widgets/e-addressbook-util.c:526
+#: addressbook/gui/widgets/e-addressbook-util.c:525
 #, c-format
 msgid "VCard for %s"
 msgstr "%s(r)en VCard-a"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:194
-#: calendar/gui/e-calendar-table.etspec.h:17
+#: calendar/gui/dialogs/meeting-page.etspec.h:11
+#: calendar/gui/e-calendar-table.etspec.h:18
 #: calendar/gui/e-meeting-time-sel.etspec.h:11
 msgid "Type"
 msgstr "Mota"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:398
+#: addressbook/gui/widgets/e-addressbook-view.c:394
 #: importers/evolution-gnomecard-importer.c:228 importers/pine-importer.c:642
 #: mail/importers/pine-importer.c:577
 msgid "Addressbook"
 msgstr "Helbide-liburua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:680
-#: addressbook/gui/widgets/e-addressbook-view.c:899
-#: addressbook/gui/widgets/e-addressbook-view.c:1883
+#: addressbook/gui/widgets/e-addressbook-view.c:676
+#: addressbook/gui/widgets/e-addressbook-view.c:895
+#: addressbook/gui/widgets/e-addressbook-view.c:1879
 #: ui/evolution-addressbook.xml.h:19
 msgid "Save as VCard"
 msgstr "Gorde VCard gisa"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:886
+#: addressbook/gui/widgets/e-addressbook-view.c:882
 #, fuzzy
 msgid "New Contact..."
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:887
+#: addressbook/gui/widgets/e-addressbook-view.c:883
 #, fuzzy
 msgid "New Contact List..."
 msgstr "Kontaktuen zerrenda berria"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:890
+#: addressbook/gui/widgets/e-addressbook-view.c:886
 #, fuzzy
 msgid "Go to Folder..."
 msgstr "_Joan karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:891
+#: addressbook/gui/widgets/e-addressbook-view.c:887
 #, fuzzy
 msgid "Import..."
 msgstr "_Inportatu..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:893
+#: addressbook/gui/widgets/e-addressbook-view.c:889
 #, fuzzy
 msgid "Search for Contacts..."
 msgstr "_Bilatu kontaktuak"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:894
+#: addressbook/gui/widgets/e-addressbook-view.c:890
 #, fuzzy
 msgid "Addressbook Sources..."
 msgstr "_Helbide-liburuaren iturburuak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:896
+#: addressbook/gui/widgets/e-addressbook-view.c:892
 #, fuzzy
 msgid "Pilot Settings..."
 msgstr "_Pilot-en ezarpenak..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:900
+#: addressbook/gui/widgets/e-addressbook-view.c:896
 #: ui/evolution-addressbook.xml.h:10
 msgid "Forward Contact"
 msgstr "Birbidali kontaktua"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:901
+#: addressbook/gui/widgets/e-addressbook-view.c:897
 msgid "Send Message to Contact"
 msgstr "Bidali mezua kontaktuari"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:902 calendar/gui/print.c:2446
+#: addressbook/gui/widgets/e-addressbook-view.c:898 calendar/gui/print.c:2439
 #: ui/evolution-addressbook.xml.h:16 ui/evolution-comp-editor.xml.h:8
-#: ui/evolution-contact-editor.xml.h:5 ui/evolution-mail-message.xml.h:72
+#: ui/evolution-contact-editor.xml.h:4 ui/evolution-mail-message.xml.h:67
 #: ui/my-evolution.xml.h:1
 msgid "Print"
 msgstr "Inprimatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:904
+#: addressbook/gui/widgets/e-addressbook-view.c:900
 msgid "Print Envelope"
 msgstr "Inprimatu gutun-azala"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:908
+#: addressbook/gui/widgets/e-addressbook-view.c:904
 msgid "Copy to folder..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: addressbook/gui/widgets/e-addressbook-view.c:905
 msgid "Move to folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: addressbook/gui/widgets/e-addressbook-view.c:912
+#: addressbook/gui/widgets/e-addressbook-view.c:908
 #: ui/evolution-addressbook.xml.h:6 ui/evolution-tasks.xml.h:4
 msgid "Cut"
 msgstr "Ebaki"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:913
-#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:9
+#: addressbook/gui/widgets/e-addressbook-view.c:909
+#: ui/evolution-addressbook.xml.h:2 ui/evolution-mail-message.xml.h:8
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
 msgstr "Kopiatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:914
-#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:910
+#: ui/evolution-addressbook.xml.h:13 ui/evolution-tasks.xml.h:9
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:915 filter/libfilter-i18n.h:10
+#: addressbook/gui/widgets/e-addressbook-view.c:911 filter/libfilter-i18n.h:11
 #: mail/mail-accounts.c:234 ui/evolution-addressbook.xml.h:8
-#: 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-comp-editor.xml.h:4 ui/evolution-contact-editor.xml.h:2
+#: ui/evolution-contact-list-editor.xml.h:2 ui/evolution-mail-message.xml.h:20
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:919
-#: calendar/gui/e-cal-view.c:1109
+#: addressbook/gui/widgets/e-addressbook-view.c:915
+#: calendar/gui/e-day-view.c:3715 calendar/gui/e-week-view.c:3596
 #, fuzzy
 msgid "Current View"
 msgstr "_Uneko ikuspegia"
@@ -3148,7 +3155,7 @@ msgstr "_Uneko ikuspegia"
 #. Translators: put here a list of labels you want to see on buttons in
 #. addressbook. You may use any character to separate labels but it must
 #. also be placed at the begining ot the string
-#: addressbook/gui/widgets/e-addressbook-view.c:953
+#: addressbook/gui/widgets/e-addressbook-view.c:949
 msgid ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
@@ -3156,11 +3163,11 @@ msgstr ",123,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 #. in addressbook. You may use any character to separate labels but it
 #. must also be placed at the begining ot the string.
 #. Use lower case letters if possible.
-#: addressbook/gui/widgets/e-addressbook-view.c:958
+#: addressbook/gui/widgets/e-addressbook-view.c:954
 msgid ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 msgstr ",0,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1356
+#: addressbook/gui/widgets/e-addressbook-view.c:1352
 #, c-format
 msgid ""
 "The addressbook backend for\n"
@@ -3228,46 +3235,36 @@ msgstr "Beste telefono bat"
 msgid "Primary Phone"
 msgstr "Telefono nagusia"
 
-#: addressbook/gui/widgets/e-minicard.c:146
+#: addressbook/gui/widgets/e-minicard-control.c:204
+#, c-format
+msgid "and %d other cards."
+msgstr "eta beste %d txartel."
+
+#: addressbook/gui/widgets/e-minicard-control.c:206
+msgid "and one other card."
+msgstr "eta beste txartel bat."
+
+#: addressbook/gui/widgets/e-minicard-control.c:318
+msgid "Save in addressbook"
+msgstr "Gorde helbide-liburuan"
+
 #: addressbook/gui/widgets/e-minicard-label.c:115
+#: addressbook/gui/widgets/e-minicard.c:146
 #, fuzzy
 msgid "Width"
 msgstr "Zabalera:"
 
-#: addressbook/gui/widgets/e-minicard.c:153
 #: addressbook/gui/widgets/e-minicard-label.c:122
+#: addressbook/gui/widgets/e-minicard.c:153
 #, fuzzy
 msgid "Height"
 msgstr "Altuera:"
 
-#: addressbook/gui/widgets/e-minicard.c:161
 #: addressbook/gui/widgets/e-minicard-label.c:129
+#: addressbook/gui/widgets/e-minicard.c:161
 msgid "Has Focus"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:169
-#, fuzzy
-msgid "Selected"
-msgstr "Ezabatuta"
-
-#: addressbook/gui/widgets/e-minicard.c:176
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Zereginen ordena"
-
-#: addressbook/gui/widgets/e-minicard-control.c:204
-#, c-format
-msgid "and %d other cards."
-msgstr "eta beste %d txartel."
-
-#: addressbook/gui/widgets/e-minicard-control.c:206
-msgid "and one other card."
-msgstr "eta beste txartel bat."
-
-#: addressbook/gui/widgets/e-minicard-control.c:318
-msgid "Save in addressbook"
-msgstr "Gorde helbide-liburuan"
-
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -3287,6 +3284,11 @@ msgstr "Testu-tamai_na"
 msgid "Max field name length"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#, fuzzy
+msgid "Column Width"
+msgstr "Columbia"
+
 #: addressbook/gui/widgets/e-minicard-view.c:141
 msgid ""
 "\n"
@@ -3316,10 +3318,15 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrar"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:127
+#: addressbook/gui/widgets/e-minicard.c:169
 #, fuzzy
-msgid "Column Width"
-msgstr "Columbia"
+msgid "Selected"
+msgstr "Ezabatuta"
+
+#: addressbook/gui/widgets/e-minicard.c:176
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Zereginen ordena"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3330,20 +3337,20 @@ msgstr "Txartelen ikuspegia"
 msgid "GTK Tree View"
 msgstr "Astearen ikuspegia"
 
-#: addressbook/printing/e-contact-print.c:1158
+#: addressbook/printing/e-contact-print-envelope.c:217
+#: addressbook/printing/e-contact-print-envelope.c:238
+msgid "Print envelope"
+msgstr "Inprimatu gutun-azala"
+
+#: addressbook/printing/e-contact-print.c:1139
 msgid "Print cards"
 msgstr "Inprimatu txartelak"
 
-#: addressbook/printing/e-contact-print.c:1224
-#: addressbook/printing/e-contact-print.c:1250
+#: addressbook/printing/e-contact-print.c:1204
+#: addressbook/printing/e-contact-print.c:1226
 msgid "Print card"
 msgstr "Inprimatu txartela"
 
-#: addressbook/printing/e-contact-print-envelope.c:217
-#: addressbook/printing/e-contact-print-envelope.c:238
-msgid "Print envelope"
-msgstr "Inprimatu gutun-azala"
-
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3513,63 +3520,6 @@ msgstr "Zabalera:"
 msgid "_Font..."
 msgstr "_Letra-tipoa..."
 
-#: addressbook/tools/evolution-addressbook-export.c:56
-msgid "Specify the output file instead of standard output"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:57
-msgid "OUTPUTFILE"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:58
-#, fuzzy
-msgid "List local addressbook folders"
-msgstr "karpeta lokal eta urruneko karpeta aktibo guztiekin"
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-msgid "Show cards as vcard or csv file"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:60
-#, fuzzy
-msgid "[vcard|csv]"
-msgstr "Txartelik ez"
-
-#: addressbook/tools/evolution-addressbook-export.c:61
-msgid "Export in asynchronous mode "
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid ""
-"The number of cards in one output file in asychronous mode,default size 100."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:63
-msgid "NUMBER"
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:91
-msgid ""
-"Command line arguments error, please use --help option to see the usage."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:105
-msgid "Only support csv or vcard format."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:114
-msgid "In async mode, output must be file."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:122
-msgid "In normal mode, there should not need size option."
-msgstr ""
-
-#: addressbook/tools/evolution-addressbook-export.c:153
-#, fuzzy
-msgid "Impossible internal error."
-msgstr "Barne-errorea"
-
 #: calendar/cal-util/cal-component.c:1218
 msgid "Untitled appointment"
 msgstr "Hitzordu izengabea"
@@ -3699,30 +3649,28 @@ msgid "31st"
 msgstr "31."
 
 #: calendar/cal-util/cal-util.c:550 calendar/cal-util/cal-util.c:572
-#: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:403 calendar/gui/e-tasks.c:271
-#: mail/message-list.c:912
+#: calendar/gui/dialogs/task-details-page.glade.h:6
+#: calendar/gui/e-calendar-table.c:401 mail/message-list.c:753
 msgid "High"
 msgstr "Handia"
 
 #: calendar/cal-util/cal-util.c:552 calendar/cal-util/cal-util.c:574
-#: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-calendar-table.c:404 calendar/gui/e-cal-model.c:826
-#: calendar/gui/e-tasks.c:273 mail/message-list.c:911
+#: calendar/gui/calendar-model.c:1709
+#: calendar/gui/dialogs/task-details-page.glade.h:9
+#: calendar/gui/e-calendar-table.c:402 mail/message-list.c:752
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/cal-util/cal-util.c:554 calendar/cal-util/cal-util.c:576
-#: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:405 calendar/gui/e-tasks.c:275
-#: mail/message-list.c:910
+#: calendar/gui/dialogs/task-details-page.glade.h:8
+#: calendar/gui/e-calendar-table.c:403 mail/message-list.c:751
 msgid "Low"
 msgstr "Txikia"
 
 #. An empty string is the same as 'None'.
 #: calendar/cal-util/cal-util.c:570
-#: calendar/gui/dialogs/task-details-page.glade.h:11
-#: calendar/gui/e-calendar-table.c:406
+#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/e-calendar-table.c:404
 msgid "Undefined"
 msgstr "Definitu gabe"
 
@@ -3730,13 +3678,13 @@ msgstr "Definitu gabe"
 msgid "Split Multi-Day Events:"
 msgstr ""
 
-#: calendar/conduits/calendar/calendar-conduit.c:1297
-#: calendar/conduits/todo/todo-conduit.c:838
+#: calendar/conduits/calendar/calendar-conduit.c:1289
+#: calendar/conduits/todo/todo-conduit.c:830
 msgid "Error while communicating with calendar server"
 msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: calendar/conduits/calendar/calendar-conduit.c:1456
-#: calendar/conduits/calendar/calendar-conduit.c:1459
+#: calendar/conduits/calendar/calendar-conduit.c:1440
+#: calendar/conduits/calendar/calendar-conduit.c:1443
 msgid "Could not read pilot's Calendar application block"
 msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 
@@ -3744,33 +3692,84 @@ msgstr "Ezin izan da pilot-aren Calendar aplikazio-blokea irakurri"
 msgid "Default Priority:"
 msgstr "Lehentasun lehenetsia:"
 
-#: calendar/conduits/todo/todo-conduit.c:970
-#: calendar/conduits/todo/todo-conduit.c:973
+#: calendar/conduits/todo/todo-conduit.c:954
+#: calendar/conduits/todo/todo-conduit.c:957
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren ToDo aplikazio-blokea irakurri"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Egutegiaren eta zereginen ezarpenak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Calendar and Tasks component"
+msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar viewer"
+msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en berri-editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Tasks viewer"
+msgstr "Evolution-en berri-editorea"
+
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
 msgid "Starting:"
 msgstr "Hasi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
 msgid "Ending:"
 msgstr "Amaitu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:254
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:227
+msgid "invalid time"
+msgstr "baliogabeko ordua"
+
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:272
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:347
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:365
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s alarma"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:1
-#: ui/evolution-comp-editor.xml.h:1 ui/evolution-contact-editor.xml.h:1
-#: ui/evolution-contact-list-editor.xml.h:1
-#: ui/evolution-signature-editor.xml.h:1
+#: ui/evolution-comp-editor.xml.h:1
 msgid "C_lose"
 msgstr "_Itxi"
 
@@ -3786,25 +3785,16 @@ msgstr "Alarma-errepikaren denbora (minututan)"
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:874
+#: calendar/gui/alarm-notify/alarm-queue.c:770
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:892
-#, c-format
-msgid ""
-"Alarm on %s\n"
-"%s\n"
-"Starting at %s\n"
-"Ending at %s"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:979
-#: calendar/gui/alarm-notify/alarm-queue.c:1003
+#: calendar/gui/alarm-notify/alarm-queue.c:843
+#: calendar/gui/alarm-notify/alarm-queue.c:867 widgets/misc/e-messagebox.c:161
 msgid "Warning"
 msgstr "Abisua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:983
+#: calendar/gui/alarm-notify/alarm-queue.c:847
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -3816,7 +3806,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta   \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1009
+#: calendar/gui/alarm-notify/alarm-queue.c:873
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3833,87 +3823,71 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1023
+#: calendar/gui/alarm-notify/alarm-queue.c:887
 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
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Alarma bidezko jakinarazpen-zerbitzurako fabrika"
-
-#: calendar/gui/alarm-notify/notify-main.c:173
-msgid "Could not initialize Bonobo"
-msgstr "Ezin izan da Bonobo hasieratu"
-
-#: calendar/gui/alarm-notify/notify-main.c:176
+#: calendar/gui/alarm-notify/notify-main.c:174
 msgid "Could not initialize gnome-vfs"
 msgstr "Ezin izan da gnome-vfs hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:185
+#: calendar/gui/alarm-notify/notify-main.c:183
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
-#: calendar/gui/calendar-commands.c:376
-#, fuzzy
-msgid ""
-"This operation will permanently erase all events older than the selected "
-"amount of time. If you continue, you will not be able to recover these "
-"events."
-msgstr ""
-"Eragiketa honek betiko borratuko ditu egindakotzat markatutako zereginak. "
-"Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
-"\n"
-"Benetan borratu nahi dituzu?"
+#: calendar/gui/cal-search-bar.c:50
+msgid "Summary contains"
+msgstr "Laburpenak hau dauka"
 
-#: calendar/gui/calendar-commands.c:382
-#, fuzzy
-msgid "Purge events older than"
-msgstr "hau baino txikiagoa da"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Description contains"
+msgstr "Azalpenak hau dauka"
 
-#: calendar/gui/calendar-commands.c:387
-#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
-msgid "days"
-msgstr "egun "
+#: calendar/gui/cal-search-bar.c:52
+msgid "Comment contains"
+msgstr "Iruzkinak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:358 mail/mail-ops.c:1106
+msgid "Unmatched"
+msgstr "Ez dator bat"
 
-#: calendar/gui/calendar-commands.c:485
+#: calendar/gui/calendar-commands.c:419
 msgid "%A %d %B %Y"
 msgstr "%A, %Y %B %d"
 
 #. strftime format %a = abbreviated weekday name, %d = day of month,
 #. %b = abbreviated month name. Don't use any other specifiers.
-#: calendar/gui/calendar-commands.c:488 calendar/gui/e-day-view.c:1364
-#: calendar/gui/e-day-view-top-item.c:266
-#: calendar/gui/e-week-view-main-item.c:325
+#: calendar/gui/calendar-commands.c:422 calendar/gui/e-day-view-top-item.c:265
+#: calendar/gui/e-day-view.c:1438 calendar/gui/e-week-view-main-item.c:325
 msgid "%a %d %b"
 msgstr "%a, %b %d"
 
-#: calendar/gui/calendar-commands.c:490 calendar/gui/calendar-commands.c:495
-#: calendar/gui/calendar-commands.c:497
+#: calendar/gui/calendar-commands.c:424 calendar/gui/calendar-commands.c:429
+#: calendar/gui/calendar-commands.c:431
 msgid "%a %d %b %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:514 calendar/gui/calendar-commands.c:520
-#: calendar/gui/calendar-commands.c:526 calendar/gui/calendar-commands.c:528
+#: calendar/gui/calendar-commands.c:442 calendar/gui/calendar-commands.c:449
+#: calendar/gui/calendar-commands.c:455 calendar/gui/calendar-commands.c:457
 msgid "%d %B %Y"
 msgstr "%Y %B %d"
 
 #. strftime format %d = day of month, %B = full
 #. month name. You can change the order but don't
 #. change the specifiers or add anything.
-#: calendar/gui/calendar-commands.c:518
-#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1508
+#: calendar/gui/calendar-commands.c:447
+#: calendar/gui/e-week-view-main-item.c:333 calendar/gui/print.c:1509
 msgid "%d %B"
 msgstr "%B %d"
 
-#: calendar/gui/calendar-commands.c:918
+#: calendar/gui/calendar-commands.c:849
 msgid ""
 "Could not create the calendar view.  Please check your ORBit and OAF setup."
 msgstr ""
 "Ezin izan da egutegiaren ikuspegia sortu.  Egiaztatu ORBit eta OAF "
 "konfigurazioa."
 
-#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1569
+#: calendar/gui/calendar-component.c:70 calendar/gui/gnome-cal.c:1353
 #: importers/netscape-importer.c:1873 mail/importers/netscape-importer.c:1843
 #: my-evolution/my-evolution.glade.h:2 shell/e-local-storage.c:177
 #: shell/e-shortcuts.c:1085
@@ -3934,11 +3908,11 @@ msgstr "Egu_tegi publikoaren URLa:"
 msgid "Public folder containing appointments and events"
 msgstr "Hitzorduak eta gertaerak dituen karpeta"
 
-#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:1080
-#: calendar/gui/print.c:1787 calendar/gui/tasks-control.c:487
+#: calendar/gui/calendar-component.c:80 calendar/gui/e-tasks.c:738
+#: calendar/gui/print.c:1789 calendar/gui/tasks-control.c:504
 #: calendar/importers/icalendar-importer.c:644
 #: importers/netscape-importer.c:1875 mail/importers/netscape-importer.c:1845
-#: my-evolution/e-summary-tasks.c:348 my-evolution/e-summary-tasks.c:357
+#: my-evolution/e-summary-tasks.c:329 my-evolution/e-summary-tasks.c:338
 #: shell/e-local-storage.c:183 shell/e-shortcuts.c:1086
 msgid "Tasks"
 msgstr "Zereginak"
@@ -4009,6 +3983,107 @@ msgstr "_Hitzordua"
 msgid "Create a new all-day appointment"
 msgstr "Sortu hitzordu berria"
 
+#: calendar/gui/calendar-model.c:405 calendar/gui/calendar-model.c:964
+#: calendar/gui/e-calendar-table.c:380
+msgid "Private"
+msgstr "Pribatua"
+
+#: calendar/gui/calendar-model.c:408 calendar/gui/calendar-model.c:966
+#: calendar/gui/e-calendar-table.c:381
+msgid "Confidential"
+msgstr "Konfidentziala"
+
+#: calendar/gui/calendar-model.c:411 calendar/gui/e-calendar-table.c:379
+msgid "Public"
+msgstr "Publikoa"
+
+#: calendar/gui/calendar-model.c:523
+msgid "N"
+msgstr "I"
+
+#: calendar/gui/calendar-model.c:523
+msgid "S"
+msgstr "H"
+
+#: calendar/gui/calendar-model.c:525
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/calendar-model.c:525
+msgid "W"
+msgstr "M"
+
+#: calendar/gui/calendar-model.c:590 calendar/gui/calendar-model.c:1134
+#: calendar/gui/e-calendar-table.c:453
+msgid "Free"
+msgstr "Libre"
+
+#: calendar/gui/calendar-model.c:592 calendar/gui/e-calendar-table.c:454
+#: calendar/gui/e-meeting-time-sel.c:406
+#: shell/evolution-shell-component.c:1204
+msgid "Busy"
+msgstr "Okupatuta"
+
+#: calendar/gui/calendar-model.c:750 calendar/gui/calendar-model.c:1178
+#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/e-calendar-table.c:474 calendar/gui/print.c:2298
+msgid "Not Started"
+msgstr "Ez da hasi"
+
+#: calendar/gui/calendar-model.c:753 calendar/gui/calendar-model.c:1180
+#: calendar/gui/dialogs/task-details-page.glade.h:7
+#: calendar/gui/e-calendar-table.c:475 calendar/gui/print.c:2301
+msgid "In Progress"
+msgstr "Egiten ari da"
+
+#: calendar/gui/calendar-model.c:756 calendar/gui/calendar-model.c:1182
+#: calendar/gui/dialogs/task-details-page.glade.h:4
+#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-meeting-model.c:294
+#: calendar/gui/e-meeting-model.c:317 calendar/gui/print.c:2304
+msgid "Completed"
+msgstr "Eginda"
+
+#: calendar/gui/calendar-model.c:1036
+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"
+
+#. An empty string is the same as 'None'.
+#: calendar/gui/calendar-model.c:1176 calendar/gui/dialogs/meeting-page.c:330
+#: calendar/gui/dialogs/meeting-page.glade.h:2 composer/e-msg-composer.c:2056
+#: mail/folder-browser.c:1752 mail/mail-account-gui.c:1260
+#: mail/mail-account-gui.c:1692 mail/mail-accounts.c:442
+#: mail/mail-config.glade.h:76
+#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
+#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:442
+#: widgets/misc/e-dateedit.c:1458 widgets/misc/e-dateedit.c:1573
+msgid "None"
+msgstr "Bat ere ez"
+
+#: calendar/gui/calendar-model.c:1711
+msgid "Recurring"
+msgstr "Errepikatua"
+
+#: calendar/gui/calendar-model.c:1713
+msgid "Assigned"
+msgstr "Esleitua"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:266
+#: calendar/gui/e-meeting-model.c:276 calendar/gui/e-meeting-model.c:534
+#: calendar/gui/e-meeting-model.c:784
+msgid "Yes"
+msgstr "Bai"
+
+#: calendar/gui/calendar-model.c:1719 calendar/gui/e-meeting-model.c:278
+#: calendar/gui/e-meeting-model.c:785
+msgid "No"
+msgstr "Ez"
+
 #: calendar/gui/calendar-view-factory.c:118
 msgid "Day View"
 msgstr "Egunaren ikuspegia"
@@ -4025,73 +4100,52 @@ msgstr "Astearen ikuspegia"
 msgid "Month View"
 msgstr "Hilabetearen ikuspegia"
 
-#: calendar/gui/calendar-view-factory.c:130
-#, fuzzy
-msgid "List View"
-msgstr "Ikuspegi pertsonalizatua"
-
-#: 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:358 mail/mail-ops.c:1120
-msgid "Unmatched"
-msgstr "Ez dator bat"
-
-#: calendar/gui/comp-editor-factory.c:462
+#: calendar/gui/comp-editor-factory.c:456
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegiaren zerbitzariarekin komunikatzean"
 
-#: calendar/gui/comp-editor-factory.c:473
+#: calendar/gui/comp-editor-factory.c:467
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:479
+#: calendar/gui/comp-editor-factory.c:473
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Baimena ukatuta"
 
-#: calendar/gui/control-factory.c:125
+#: calendar/gui/control-factory.c:119
 #, fuzzy, c-format
 msgid "Could not open the folder in '%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/control-factory.c:171
+#: calendar/gui/control-factory.c:165
 msgid "The URI that the calendar will display"
 msgstr "Egutegiak bistaratuko duen URIa"
 
-#: calendar/gui/control-factory.c:178
+#: calendar/gui/control-factory.c:172
 #, fuzzy
 msgid "The type of view to show"
 msgstr "Aldatu ikuspegia -> %s"
 
-#: calendar/gui/dialogs/alarm-options.c:466
+#: calendar/gui/dialogs/alarm-options.c:420
 msgid "Audio Alarm Options"
 msgstr "Audio alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:475
+#: calendar/gui/dialogs/alarm-options.c:429
 msgid "Message Alarm Options"
 msgstr "Mezu-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:484
+#: calendar/gui/dialogs/alarm-options.c:438
 #, fuzzy
 msgid "Email Alarm Options"
 msgstr "Posta-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:493
+#: calendar/gui/dialogs/alarm-options.c:447
 msgid "Program Alarm Options"
 msgstr "Programa-alarmaren aukerak"
 
-#: calendar/gui/dialogs/alarm-options.c:509
+#: calendar/gui/dialogs/alarm-options.c:456
 msgid "Unknown Alarm Options"
 msgstr "Alarma ezezagunen aukerak"
 
@@ -4130,6 +4184,10 @@ msgstr "Bidali"
 msgid "With these arguments:"
 msgstr "Argumentu hauekin:"
 
+#: calendar/gui/dialogs/alarm-options.glade.h:10 filter/filter.glade.h:17
+msgid "days"
+msgstr "egun "
+
 #: calendar/gui/dialogs/alarm-options.glade.h:11
 msgid "dialog1"
 msgstr ""
@@ -4142,8 +4200,7 @@ msgstr "bider, maiztasun honekin:"
 msgid "hours"
 msgstr "ordu "
 
-#: calendar/gui/dialogs/alarm-options.glade.h:14
-#: executive-summary/test-service/rdf-summary.c:806 filter/filter.glade.h:19
+#: calendar/gui/dialogs/alarm-options.glade.h:14 filter/filter.glade.h:19
 msgid "minutes"
 msgstr "minutu "
 
@@ -4157,11 +4214,11 @@ msgstr "Oinarriak"
 msgid "Date/Time:"
 msgstr "Data/Ordua:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:465
+#: calendar/gui/dialogs/alarm-page.glade.h:3 calendar/gui/e-alarm-list.c:461
 msgid "Display a message"
 msgstr "Bistaratu mezua"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:461
+#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:457
 msgid "Play a sound"
 msgstr "Jo soinua"
 
@@ -4169,7 +4226,7 @@ msgstr "Jo soinua"
 msgid "Reminders"
 msgstr "Oroigarriak"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:473
+#: calendar/gui/dialogs/alarm-page.glade.h:6 calendar/gui/e-alarm-list.c:469
 msgid "Run a program"
 msgstr "Exekutatu programa"
 
@@ -4180,8 +4237,7 @@ msgstr "Bidali mezua"
 
 #: calendar/gui/dialogs/alarm-page.glade.h:8
 #: calendar/gui/dialogs/recurrence-page.glade.h:8
-#: calendar/gui/e-itip-control.c:1022 calendar/gui/e-itip-control.glade.h:11
-#: calendar/gui/e-tasks.c:208
+#: calendar/gui/e-itip-control.c:1052 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Laburpena:"
 
@@ -4265,7 +4321,7 @@ msgstr "egun"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 #: calendar/gui/dialogs/recurrence-page.c:1040
-#: calendar/gui/e-itip-control.c:647
+#: calendar/gui/e-itip-control.c:677
 msgid "Friday"
 msgstr "Ostirala"
 
@@ -4279,7 +4335,7 @@ msgstr "minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 #: calendar/gui/dialogs/recurrence-page.c:1036
-#: calendar/gui/e-itip-control.c:643
+#: calendar/gui/e-itip-control.c:673
 msgid "Monday"
 msgstr "Astelehena"
 
@@ -4290,7 +4346,7 @@ msgstr "_Ig."
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: calendar/gui/dialogs/recurrence-page.c:1041
-#: calendar/gui/e-itip-control.c:648
+#: calendar/gui/e-itip-control.c:678
 msgid "Saturday"
 msgstr "Larunbata"
 
@@ -4304,7 +4360,7 @@ msgstr "Erakutsi aste-_zenbakiak data-nabigatzailean"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
 #: calendar/gui/dialogs/recurrence-page.c:1042
-#: calendar/gui/e-itip-control.c:642
+#: calendar/gui/e-itip-control.c:672
 msgid "Sunday"
 msgstr "Igandea"
 
@@ -4324,7 +4380,7 @@ msgstr "Z_ereginen zerrenda"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #: calendar/gui/dialogs/recurrence-page.c:1039
-#: calendar/gui/e-itip-control.c:646
+#: calendar/gui/e-itip-control.c:676
 msgid "Thursday"
 msgstr "Osteguna"
 
@@ -4342,7 +4398,7 @@ msgstr "Ordu-formatua:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1037
-#: calendar/gui/e-itip-control.c:644
+#: calendar/gui/e-itip-control.c:674
 msgid "Tuesday"
 msgstr "Asteartea"
 
@@ -4352,12 +4408,12 @@ msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #: calendar/gui/dialogs/recurrence-page.c:1038
-#: calendar/gui/e-itip-control.c:645
+#: calendar/gui/e-itip-control.c:675
 msgid "Wednesday"
 msgstr "Asteazkena"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: ui/evolution-calendar.xml.h:31
+#: ui/evolution-calendar.xml.h:27
 msgid "Work Week"
 msgstr "Lan-astea"
 
@@ -4472,50 +4528,75 @@ 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?"
 
-#: calendar/gui/dialogs/changed-comp.c:59
+#: calendar/gui/dialogs/changed-comp.c:58
 msgid "This event has been deleted."
 msgstr "Gertaera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:63
+#: calendar/gui/dialogs/changed-comp.c:62
 msgid "This task has been deleted."
 msgstr "Zeregina ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:67
+#: calendar/gui/dialogs/changed-comp.c:66
 msgid "This journal entry has been deleted."
 msgstr "Egunkariko sarrera ezabatu da."
 
-#: calendar/gui/dialogs/changed-comp.c:76
+#: calendar/gui/dialogs/changed-comp.c:75
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:78
+#: calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea itxi?"
 
-#: calendar/gui/dialogs/changed-comp.c:83
+#: calendar/gui/dialogs/changed-comp.c:82
 msgid "This event has been changed."
 msgstr "Gertaera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:87
+#: calendar/gui/dialogs/changed-comp.c:86
 msgid "This task has been changed."
 msgstr "Zeregin hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:91
+#: calendar/gui/dialogs/changed-comp.c:90
 msgid "This journal entry has been changed."
 msgstr "Egunkariko sarrera hau aldatu egin da."
 
-#: calendar/gui/dialogs/changed-comp.c:100
+#: calendar/gui/dialogs/changed-comp.c:99
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 
-#: calendar/gui/dialogs/changed-comp.c:102
+#: calendar/gui/dialogs/changed-comp.c:101
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
+#: calendar/gui/dialogs/comp-editor-page.c:409
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Errore ezezaguna: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2216
+msgid " to "
+msgstr "- "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2220
+msgid " (Completed "
+msgstr "(Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2222
+msgid "Completed "
+msgstr "Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2227
+msgid " (Due "
+msgstr "(Falta: "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2229
+msgid "Due "
+msgstr "Falta: "
+
 #: calendar/gui/dialogs/comp-editor.c:334
 #, fuzzy
 msgid "Could not update invalid object"
@@ -4563,47 +4644,21 @@ msgid "No summary"
 msgstr "Laburpenik ez"
 
 #: calendar/gui/dialogs/comp-editor.c:1281
-#: calendar/gui/e-calendar-table.c:1138 calendar/gui/e-cal-view.c:878
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1068 calendar/gui/e-day-view.c:3993
+#: calendar/gui/e-week-view.c:3840 composer/e-msg-composer.c:1164
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1384
-#: calendar/gui/dialogs/comp-editor.c:1408
-#: calendar/gui/dialogs/comp-editor.c:1434
+#: calendar/gui/dialogs/comp-editor.c:1382
+#: calendar/gui/dialogs/comp-editor.c:1406
+#: calendar/gui/dialogs/comp-editor.c:1432
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1464
-#: calendar/gui/dialogs/comp-editor.c:1473
+#: calendar/gui/dialogs/comp-editor.c:1459
 msgid "Unable to obtain current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
-#: calendar/gui/dialogs/comp-editor-page.c:409
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Errore ezezaguna: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2223
-msgid " to "
-msgstr "- "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2227
-msgid " (Completed "
-msgstr "(Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2229
-msgid "Completed "
-msgstr "Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2234
-msgid " (Due "
-msgstr "(Falta: "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2236
-msgid "Due "
-msgstr "Falta: "
-
 #: calendar/gui/dialogs/delete-comp.c:96
 #, c-format
 msgid "Are you sure you want to delete the appointment `%s'?"
@@ -4712,31 +4767,31 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2260
+#: calendar/gui/dialogs/event-editor.c:199 calendar/gui/print.c:2253
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:206
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:213
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:220
+#: calendar/gui/dialogs/event-editor.c:292
+#: calendar/gui/dialogs/event-editor.c:436
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 ui/evolution-event-editor.xml.h:6
+#: calendar/gui/dialogs/event-editor.c:227
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439 ui/evolution-event-editor.xml.h:6
 msgid "Meeting"
 msgstr "Bilera"
 
-#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:509
+#: calendar/gui/dialogs/event-page.c:603 calendar/gui/dialogs/task-page.c:507
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Hasiera-data"
@@ -4774,9 +4829,9 @@ msgid "Classification"
 msgstr "Sailkapena"
 
 #: calendar/gui/dialogs/event-page.glade.h:6
-#, fuzzy
-msgid "Co_nfidential"
-msgstr "Konfidentziala"
+#: calendar/gui/dialogs/task-page.glade.h:4
+msgid "Con_fidential"
+msgstr "Kon_fidentziala"
 
 #: calendar/gui/dialogs/event-page.glade.h:7
 #: calendar/gui/dialogs/task-page.glade.h:5
@@ -4802,6 +4857,7 @@ msgid "Pu_blic"
 msgstr "_Publikoa"
 
 #: calendar/gui/dialogs/event-page.glade.h:12
+#: calendar/gui/e-calendar-table.etspec.h:13
 msgid "Show Time As"
 msgstr "Erakutsi ordua honela"
 
@@ -4818,34 +4874,75 @@ msgstr "_Amaiera-ordua:"
 msgid "_Start time:"
 msgstr "_Hasiera-ordua:"
 
-#. an empty string is the same as 'None'
-#: calendar/gui/dialogs/meeting-page.c:311
-#: calendar/gui/dialogs/meeting-page.glade.h:2
-#: calendar/gui/e-cal-model-tasks.c:596 composer/e-msg-composer.c:2093
-#: mail/mail-account-gui.c:1260 mail/mail-account-gui.c:1692
-#: mail/mail-accounts.c:442 mail/mail-config.glade.h:76
-#: widgets/e-timezone-dialog/e-timezone-dialog.c:194
-#: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:445
-#: widgets/misc/e-dateedit.c:1483 widgets/misc/e-dateedit.c:1598
-msgid "None"
-msgstr "Bat ere ez"
-
-#: calendar/gui/dialogs/meeting-page.c:416
+#: calendar/gui/dialogs/meeting-page.c:437
 msgid "The organizer selected no longer has an account."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:422
+#: calendar/gui/dialogs/meeting-page.c:443
 msgid "An organizer is required."
 msgstr "Antolatzailea behar da."
 
-#: calendar/gui/dialogs/meeting-page.c:437
+#: calendar/gui/dialogs/meeting-page.c:458
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:630
+#: calendar/gui/dialogs/meeting-page.c:629
+msgid "That person is already attending the meeting!"
+msgstr "Pertsona hori lehendik dago bileran!"
+
+#: calendar/gui/dialogs/meeting-page.c:713
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
+#: calendar/gui/dialogs/meeting-page.etspec.h:1
+#: calendar/gui/e-meeting-time-sel.etspec.h:1
+msgid "Attendee"
+msgstr "Partaidea"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:2
+#: calendar/gui/e-meeting-time-sel.etspec.h:2
+#, fuzzy
+msgid "Click here to add an attendee"
+msgstr "* Egin klik hemen kontaktua gehitzeko *"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:3
+#: calendar/gui/e-meeting-time-sel.etspec.h:3
+msgid "Common Name"
+msgstr "Izen arrunta"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:4
+#: calendar/gui/e-meeting-time-sel.etspec.h:4
+msgid "Delegated From"
+msgstr "Delegatzailea"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:5
+#: calendar/gui/e-meeting-time-sel.etspec.h:5
+msgid "Delegated To"
+msgstr "Delegatua"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:6
+#: calendar/gui/e-meeting-time-sel.etspec.h:6
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:7
+#: calendar/gui/e-meeting-time-sel.etspec.h:7
+msgid "Member"
+msgstr "Kidea"
+
+#: calendar/gui/dialogs/meeting-page.etspec.h:8
+#: calendar/gui/e-itip-control.c:1179
+#: 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:15
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:58
+#: mail/message-list.etspec.h:12
+msgid "Status"
+msgstr "Egoera"
+
 #: calendar/gui/dialogs/meeting-page.glade.h:3
 #: calendar/gui/e-itip-control.glade.h:9
 msgid "Organizer:"
@@ -4856,7 +4953,7 @@ msgid "_Change Organizer"
 msgstr "_Aldatu antolatzailea"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:5
-#: calendar/gui/e-meeting-time-sel.c:411
+#: calendar/gui/e-meeting-time-sel.c:424
 msgid "_Invite Others..."
 msgstr "_Gonbidatu beste batzuk..."
 
@@ -5015,7 +5112,7 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1599
+#: calendar/gui/dialogs/save-comp.c:58 composer/e-msg-composer.c:1557
 msgid "_Discard Changes"
 msgstr ""
 
@@ -5042,83 +5139,53 @@ msgid "The task information has changed. Send an updated version?"
 msgstr ""
 "Zereginari buruzko informazioa aldatu egin da. Bertsio eguneratua bidali?"
 
-#: calendar/gui/dialogs/task-details-page.c:405
+#: calendar/gui/dialogs/task-details-page.c:401
 #, fuzzy
 msgid "Completed date is wrong"
 msgstr "Eginda "
 
 #: calendar/gui/dialogs/task-details-page.glade.h:2
-#, fuzzy, no-c-format
-msgid "% _Complete"
+#: calendar/gui/e-calendar-table.etspec.h:2
+#, no-c-format
+msgid "% Complete"
 msgstr "% Osatuta"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-calendar-table.c:478 calendar/gui/e-cal-model-tasks.c:323
-#: calendar/gui/e-cal-model-tasks.c:602 calendar/gui/e-tasks.c:250
-#: calendar/gui/print.c:2311
-msgid "Completed"
-msgstr "Eginda"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-calendar-table.c:477 calendar/gui/e-cal-model-tasks.c:321
-#: calendar/gui/e-cal-model-tasks.c:600 calendar/gui/e-cal-model-tasks.c:662
-#: calendar/gui/e-tasks.c:247 calendar/gui/print.c:2308
-msgid "In Progress"
-msgstr "Egiten ari da"
-
-#: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-calendar-table.c:476 calendar/gui/e-cal-model-tasks.c:319
-#: calendar/gui/e-cal-model-tasks.c:598 calendar/gui/e-tasks.c:257
-#: calendar/gui/print.c:2305
-msgid "Not Started"
-msgstr "Ez da hasi"
+#: calendar/gui/dialogs/task-details-page.glade.h:5
+msgid "Date Completed:"
+msgstr "Osatze-data:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:10
+#: calendar/gui/dialogs/task-details-page.glade.h:11
 msgid "Progress"
 msgstr "Lanean"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:12
-#, fuzzy
-msgid "_Date Completed:"
-msgstr "Osatze-data:"
+msgid "URL:"
+msgstr "URLa:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:13
+#: calendar/gui/dialogs/task-details-page.glade.h:14
 msgid "_Priority:"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:14
+#: calendar/gui/dialogs/task-details-page.glade.h:15
 msgid "_Status:"
 msgstr "_Egoera:"
 
-#: calendar/gui/dialogs/task-details-page.glade.h:15
-#, fuzzy
-msgid "_Web Page:"
-msgstr "_Web orriaren helbidea:"
-
-#: calendar/gui/dialogs/task-editor.c:193
+#: calendar/gui/dialogs/task-editor.c:190
 msgid "Basic"
 msgstr "Oinarrizkoa"
 
-#: 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:204
+#: calendar/gui/dialogs/task-editor.c:252
+#: calendar/gui/dialogs/task-editor.c:387
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:482
+#: calendar/gui/dialogs/task-page.c:480
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:542
-msgid "Due date is before start date!"
-msgstr ""
-
-#: calendar/gui/dialogs/task-page.glade.h:4
-msgid "Con_fidential"
-msgstr "Kon_fidentziala"
-
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1077
-#: calendar/gui/e-itip-control.glade.h:6 calendar/gui/e-tasks.c:287
+#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:1107
+#: calendar/gui/e-itip-control.glade.h:6
 #: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:43
 msgid "Description:"
 msgstr "Azalpena:"
@@ -5131,262 +5198,227 @@ msgstr "Ha_siera-data:"
 msgid "_Due Date:"
 msgstr "_Mugaeguna:"
 
-#: calendar/gui/e-alarm-list.c:397
+#: calendar/gui/e-alarm-list.c:393
 #, c-format
 msgid "%d days"
 msgstr "%d egun"
 
-#: calendar/gui/e-alarm-list.c:400
+#: calendar/gui/e-alarm-list.c:396
 msgid "1 day"
 msgstr "egun bat"
 
-#: calendar/gui/e-alarm-list.c:405
+#: calendar/gui/e-alarm-list.c:401
 #, c-format
 msgid "%d weeks"
 msgstr "%d aste"
 
-#: calendar/gui/e-alarm-list.c:408
+#: calendar/gui/e-alarm-list.c:404
 msgid "1 week"
 msgstr "aste bat"
 
-#: calendar/gui/e-alarm-list.c:413
+#: calendar/gui/e-alarm-list.c:409
 #, c-format
 msgid "%d hours"
 msgstr "%d ordu"
 
-#: calendar/gui/e-alarm-list.c:416
+#: calendar/gui/e-alarm-list.c:412
 msgid "1 hour"
 msgstr "ordubete"
 
-#: calendar/gui/e-alarm-list.c:421
+#: calendar/gui/e-alarm-list.c:417
 #, c-format
 msgid "%d minutes"
 msgstr "%d minutu"
 
-#: calendar/gui/e-alarm-list.c:424
+#: calendar/gui/e-alarm-list.c:420
 msgid "1 minute"
 msgstr "minutu bat"
 
-#: calendar/gui/e-alarm-list.c:429
+#: calendar/gui/e-alarm-list.c:425
 #, c-format
 msgid "%d seconds"
 msgstr "%d segundo"
 
-#: calendar/gui/e-alarm-list.c:432
+#: calendar/gui/e-alarm-list.c:428
 msgid "1 second"
 msgstr "segundo bat"
 
-#: calendar/gui/e-alarm-list.c:469
+#: calendar/gui/e-alarm-list.c:465
 msgid "Send an email"
 msgstr "Bidali mezua"
 
-#: calendar/gui/e-alarm-list.c:479
+#: calendar/gui/e-alarm-list.c:475
 msgid "Unknown action to be performed"
 msgstr "Egin beharreko ekintza ezezaguna"
 
-#: calendar/gui/e-alarm-list.c:491
+#: calendar/gui/e-alarm-list.c:487
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s hitzordua hasi aurretik"
 
-#: calendar/gui/e-alarm-list.c:494
+#: calendar/gui/e-alarm-list.c:490
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s hitzordua hasi ondoren"
 
-#: calendar/gui/e-alarm-list.c:499
+#: calendar/gui/e-alarm-list.c:495
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s hitzorduaren hasieran"
 
-#: calendar/gui/e-alarm-list.c:508
+#: calendar/gui/e-alarm-list.c:504
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s hitzordua amaitu aurretik"
 
-#: calendar/gui/e-alarm-list.c:511
+#: calendar/gui/e-alarm-list.c:507
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s hitzordua amaitu ondoren"
 
-#: calendar/gui/e-alarm-list.c:516
+#: calendar/gui/e-alarm-list.c:512
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s hitzorduaren amaieran"
 
-#: calendar/gui/e-alarm-list.c:540
+#: calendar/gui/e-alarm-list.c:536
 #, c-format
 msgid "%s at %s"
 msgstr "%s - %s"
 
-#: calendar/gui/e-alarm-list.c:546
+#: calendar/gui/e-alarm-list.c:542
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: calendar/gui/e-calendar-table.c:381 calendar/gui/e-cal-model.c:280
-#: calendar/gui/e-cal-model.c:287
-msgid "Public"
-msgstr "Publikoa"
-
-#: calendar/gui/e-calendar-table.c:382 calendar/gui/e-cal-model.c:289
-msgid "Private"
-msgstr "Pribatua"
-
-#: calendar/gui/e-calendar-table.c:383 calendar/gui/e-cal-model.c:291
-msgid "Confidential"
-msgstr "Konfidentziala"
-
-#: calendar/gui/e-calendar-table.c:425
+#: calendar/gui/e-calendar-table.c:423
 msgid "0%"
 msgstr "%0"
 
-#: calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-calendar-table.c:424
 msgid "10%"
 msgstr "%10"
 
-#: calendar/gui/e-calendar-table.c:427
+#: calendar/gui/e-calendar-table.c:425
 msgid "20%"
 msgstr "%20"
 
-#: calendar/gui/e-calendar-table.c:428
+#: calendar/gui/e-calendar-table.c:426
 msgid "30%"
 msgstr "%30"
 
-#: calendar/gui/e-calendar-table.c:429
+#: calendar/gui/e-calendar-table.c:427
 msgid "40%"
 msgstr "%40"
 
-#: calendar/gui/e-calendar-table.c:430
+#: calendar/gui/e-calendar-table.c:428
 msgid "50%"
 msgstr "%50"
 
-#: calendar/gui/e-calendar-table.c:431
+#: calendar/gui/e-calendar-table.c:429
 msgid "60%"
 msgstr "%60"
 
-#: calendar/gui/e-calendar-table.c:432
+#: calendar/gui/e-calendar-table.c:430
 msgid "70%"
 msgstr "%70"
 
-#: calendar/gui/e-calendar-table.c:433
+#: calendar/gui/e-calendar-table.c:431
 msgid "80%"
 msgstr "%80"
 
-#: calendar/gui/e-calendar-table.c:434
+#: calendar/gui/e-calendar-table.c:432
 msgid "90%"
 msgstr "%90"
 
-#: calendar/gui/e-calendar-table.c:435
+#: calendar/gui/e-calendar-table.c:433
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:455 calendar/gui/e-cal-model-calendar.c:163
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-calendar-table.c:456 calendar/gui/e-cal-model-calendar.c:166
-#: calendar/gui/e-meeting-time-sel.c:393
-#: shell/evolution-shell-component.c:1207
-msgid "Busy"
-msgstr "Okupatuta"
-
-#: calendar/gui/e-calendar-table.c:724 calendar/gui/e-cal-view.c:562
+#: calendar/gui/e-calendar-table.c:726 calendar/gui/e-day-view.c:2867
+#: calendar/gui/e-week-view.c:1933
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:988 calendar/gui/e-calendar-table.c:1029
-#: calendar/gui/e-cal-view.c:1126 calendar/gui/e-cal-view.c:1192
+#: calendar/gui/e-calendar-table.c:958 calendar/gui/e-day-view.c:3737
+#: calendar/gui/e-week-view.c:3613 mail/folder-browser.c:1763
 #: shell/e-shortcuts-view.c:422 ui/evolution-addressbook.xml.h:36
 msgid "_Open"
 msgstr "_Ireki"
 
-#: calendar/gui/e-calendar-table.c:989
+#: calendar/gui/e-calendar-table.c:959
 #, fuzzy
-msgid "Open _Web Page"
-msgstr "_Ireki mezua"
-
-#: calendar/gui/e-calendar-table.c:990 calendar/gui/e-calendar-table.c:1035
-#: calendar/gui/e-cal-view.c:1127 calendar/gui/e-cal-view.c:1198
-#: ui/evolution-mail-message.xml.h:120
-msgid "_Save As..."
-msgstr "_Gorde honela..."
+msgid "_Save as..."
+msgstr "Gorde honela..."
 
-#: calendar/gui/e-calendar-table.c:991 calendar/gui/e-calendar-table.c:1033
-#: calendar/gui/e-cal-view.c:1101 calendar/gui/e-cal-view.c:1128
-#: calendar/gui/e-cal-view.c:1196 ui/evolution-addressbook.xml.h:38
-#: ui/evolution-calendar.xml.h:37 ui/evolution-comp-editor.xml.h:19
-#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:116
-#: ui/evolution-tasks.xml.h:21 ui/my-evolution.xml.h:6
+#: calendar/gui/e-calendar-table.c:960 calendar/gui/e-day-view.c:3739
+#: calendar/gui/e-week-view.c:3588 calendar/gui/e-week-view.c:3615
+#: ui/evolution-addressbook.xml.h:38 ui/evolution-calendar.xml.h:33
+#: ui/evolution-contact-editor.xml.h:14 ui/evolution-mail-message.xml.h:108
+#: ui/evolution-tasks.xml.h:20 ui/my-evolution.xml.h:6
 msgid "_Print..."
 msgstr "_Inprimatu..."
 
-#: calendar/gui/e-calendar-table.c:995 calendar/gui/e-calendar-table.c:1024
-#: calendar/gui/e-cal-view.c:1133 calendar/gui/e-cal-view.c:1174
-#: ui/evolution-addressbook.xml.h:1 ui/evolution-calendar.xml.h:1
-#: ui/evolution-tasks.xml.h:1
+#: calendar/gui/e-calendar-table.c:964 calendar/gui/e-day-view.c:3744
+#: calendar/gui/e-week-view.c:3620 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:996 calendar/gui/e-calendar-table.c:1022
-#: calendar/gui/e-cal-view.c:1134 calendar/gui/e-cal-view.c:1172
-#: ui/evolution-addressbook.xml.h:30 ui/evolution-calendar.xml.h:33
-#: ui/evolution-composer-entries.xml.h:7 ui/evolution-mail-message.xml.h:101
-#: ui/evolution-tasks.xml.h:17
+#: calendar/gui/e-calendar-table.c:965 calendar/gui/e-day-view.c:3745
+#: calendar/gui/e-week-view.c:3621 ui/evolution-addressbook.xml.h:30
+#: ui/evolution-calendar.xml.h:29 ui/evolution-composer-entries.xml.h:7
+#: ui/evolution-mail-list.xml.h:24 ui/evolution-tasks.xml.h:15
 msgid "_Copy"
 msgstr "Ko_piatu"
 
-#: calendar/gui/e-calendar-table.c:997 calendar/gui/e-calendar-table.c:1031
-#: calendar/gui/e-cal-view.c:1105 calendar/gui/e-cal-view.c:1135
-#: calendar/gui/e-cal-view.c:1194 ui/evolution-addressbook.xml.h:37
-#: ui/evolution-calendar.xml.h:36 ui/evolution-composer-entries.xml.h:9
-#: ui/evolution-mail-message.xml.h:114 ui/evolution-tasks.xml.h:20
+#: calendar/gui/e-calendar-table.c:966 calendar/gui/e-day-view.c:3710
+#: calendar/gui/e-day-view.c:3746 calendar/gui/e-week-view.c:3592
+#: calendar/gui/e-week-view.c:3622 ui/evolution-addressbook.xml.h:37
+#: ui/evolution-calendar.xml.h:32 ui/evolution-composer-entries.xml.h:9
+#: ui/evolution-mail-list.xml.h:29 ui/evolution-tasks.xml.h:19
 msgid "_Paste"
 msgstr "_Itsatsi"
 
-#: calendar/gui/e-calendar-table.c:1001
+#: calendar/gui/e-calendar-table.c:970
 #, fuzzy
 msgid "_Assign Task"
 msgstr "Esleitu zeregina"
 
-#: calendar/gui/e-calendar-table.c:1002
+#: calendar/gui/e-calendar-table.c:971
 #, fuzzy
 msgid "_Forward as iCalendar"
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-calendar-table.c:1003
+#: calendar/gui/e-calendar-table.c:972
 msgid "_Mark as Complete"
 msgstr "_Markatu 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1004
+#: calendar/gui/e-calendar-table.c:973
 #, fuzzy
 msgid "_Mark Selected Tasks as Complete"
 msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
 
-#: calendar/gui/e-calendar-table.c:1009 calendar/gui/e-calendar-table.c:1027
+#: calendar/gui/e-calendar-table.c:978
 msgid "_Delete Selected Tasks"
 msgstr "_Ezabatu hautatutako zereginak"
 
-#: calendar/gui/e-calendar-table.c:1341 calendar/gui/e-cal-view.c:253
+#: calendar/gui/e-calendar-table.c:1265 calendar/gui/e-day-view.c:7929
+#: calendar/gui/e-week-view.c:4335
 msgid "Updating objects"
 msgstr "Objektuak eguneratzen"
 
-#: calendar/gui/e-calendar-table.c:1424
+#: calendar/gui/e-calendar-table.c:1348
 #: calendar/gui/e-calendar-table.etspec.h:6
 msgid "Click to add a task"
 msgstr "Egin klik zeregina gehitzeko"
 
-#: calendar/gui/e-calendar-table.etspec.h:2
-#, no-c-format
-msgid "% Complete"
-msgstr "% Osatuta"
-
 #: calendar/gui/e-calendar-table.etspec.h:3
 msgid "Alarms"
 msgstr "Alarmak"
 
-#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1173
-#: camel/camel-filter-driver.c:1268 mail/mail-send-recv.c:578
+#: calendar/gui/e-calendar-table.etspec.h:7 camel/camel-filter-driver.c:1156
+#: camel/camel-filter-driver.c:1251
 msgid "Complete"
 msgstr "Eginda"
 
@@ -5395,14 +5427,13 @@ msgid "Completion Date"
 msgstr "Egite-data"
 
 #: calendar/gui/e-calendar-table.etspec.h:9
-#, fuzzy
-msgid "Description"
-msgstr "Azalpena:"
-
-#: calendar/gui/e-calendar-table.etspec.h:10
 msgid "Due Date"
 msgstr "Mugaeguna"
 
+#: calendar/gui/e-calendar-table.etspec.h:10
+msgid "End Date"
+msgstr "Amaiera-eguna"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Geographical Position"
 msgstr "Kokaleku geografikoa"
@@ -5411,650 +5442,598 @@ msgstr "Kokaleku geografikoa"
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: calendar/gui/e-calendar-table.etspec.h:13
+#: calendar/gui/e-calendar-table.etspec.h:14
 msgid "Start Date"
 msgstr "Hasiera-data"
 
-#: calendar/gui/e-calendar-table.etspec.h:14
-#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:36
-#: mail/message-list.etspec.h:12
-msgid "Status"
-msgstr "Egoera"
-
-#: calendar/gui/e-calendar-table.etspec.h:15
+#: calendar/gui/e-calendar-table.etspec.h:16
 #: my-evolution/component-factory.c:56 shell/e-shell.c:750
 #: shell/e-shortcuts.c:1082
 msgid "Summary"
 msgstr "Laburpena"
 
-#: calendar/gui/e-calendar-table.etspec.h:16
+#: calendar/gui/e-calendar-table.etspec.h:17
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-table.etspec.h:19 mail/mail-config.glade.h:171
-#, fuzzy
-msgid "color"
-msgstr "kolorea"
-
-#: calendar/gui/e-calendar-table.etspec.h:20
-#, fuzzy
-msgid "component"
-msgstr "Hitzordua"
-
-#: calendar/gui/e-cal-model.c:293 calendar/gui/e-cal-model.c:296
-#: calendar/gui/e-itip-control.c:1062 calendar/gui/e-itip-control.c:1278
-#: camel/camel-gpg-context.c:1574 camel/camel-gpg-context.c:1625
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227
-#: widgets/misc/e-charset-picker.c:60
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: calendar/gui/e-cal-model.c:828
-msgid "Recurring"
-msgstr "Errepikatua"
-
-#: calendar/gui/e-cal-model.c:830
-msgid "Assigned"
-msgstr "Esleitua"
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:167
+#: e-util/e-time-utils.c:380
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %Y/%m/%d %H:%M:%S"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "Yes"
-msgstr "Bai"
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:162
+#: e-util/e-time-utils.c:389
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %Y/%m/%d %I:%M:%S %p"
 
-#: calendar/gui/e-cal-model.c:832 calendar/gui/e-cal-model-tasks.c:933
-msgid "No"
-msgstr "Ez"
+#: calendar/gui/e-cell-date-edit-text.c:126
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"\n"
+"%s"
+msgstr ""
+"Data formatu honetan idatzi behar da: \n"
+"\n"
+"%s"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "N"
-msgstr "I"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutu-zatiketa"
 
-#: calendar/gui/e-cal-model-tasks.c:275
-msgid "S"
-msgstr "H"
+#. 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-top-item.c:261 calendar/gui/e-day-view.c:1421
+#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1525
+msgid "%A %d %B"
+msgstr "%A, %B %d"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "E"
-msgstr "E"
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. Don't use any other specifiers.
+#: calendar/gui/e-day-view-top-item.c:269 calendar/gui/e-day-view.c:1454
+#: calendar/gui/e-week-view-main-item.c:339
+msgid "%d %b"
+msgstr "%b %d"
 
-#: calendar/gui/e-cal-model-tasks.c:277
-msgid "W"
-msgstr "M"
+#. String to use in 12-hour time format for times in the morning.
+#: calendar/gui/e-day-view.c:636 calendar/gui/e-week-view.c:350
+#: calendar/gui/print.c:809
+msgid "am"
+msgstr "am"
 
-#: calendar/gui/e-cal-model-tasks.c:550
-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"
+#. String to use in 12-hour time format for times in the afternoon.
+#: calendar/gui/e-day-view.c:639 calendar/gui/e-week-view.c:353
+#: calendar/gui/print.c:811
+msgid "pm"
+msgstr "pm"
 
-#: calendar/gui/e-cal-view.c:1094 calendar/gui/e-cal-view.c:1184
-msgid "New _Appointment..."
-msgstr "Hitz_ordu berria..."
+#: calendar/gui/e-day-view.c:3694
+msgid "New _Appointment"
+msgstr "Hitz_ordu berria"
 
-#: calendar/gui/e-cal-view.c:1095 calendar/gui/e-cal-view.c:1186
+#: calendar/gui/e-day-view.c:3696 calendar/gui/e-week-view.c:3582
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-cal-view.c:1096 calendar/gui/e-cal-view.c:1188
+#: calendar/gui/e-day-view.c:3698 calendar/gui/e-week-view.c:3583
 #, fuzzy
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-cal-view.c:1097 calendar/gui/e-cal-view.c:1190
+#: calendar/gui/e-day-view.c:3700 calendar/gui/e-week-view.c:3584
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-cal-view.c:1111 calendar/gui/e-cal-view.c:1180
+#: calendar/gui/e-day-view.c:3705 ui/evolution-comp-editor.xml.h:11
+msgid "Print..."
+msgstr "Inprimatu..."
+
+#: calendar/gui/e-day-view.c:3717 calendar/gui/e-week-view.c:3598
 #: ui/evolution-calendar.xml.h:13
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-cal-view.c:1112 calendar/gui/e-cal-view.c:1182
+#: calendar/gui/e-day-view.c:3719 calendar/gui/e-week-view.c:3599
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-cal-view.c:1116 ui/evolution-calendar.xml.h:38
+#: calendar/gui/e-day-view.c:3724 calendar/gui/e-week-view.c:3603
+#: ui/evolution-calendar.xml.h:34
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-cal-view.c:1120 calendar/gui/e-cal-view.c:1200
+#: calendar/gui/e-day-view.c:3729 calendar/gui/e-week-view.c:3607
 #: ui/evolution.xml.h:60
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Postaren ezarpenak..."
 
-#: calendar/gui/e-cal-view.c:1139
+#: calendar/gui/e-day-view.c:3738 calendar/gui/e-week-view.c:3614
+#: mail/folder-browser.c:1765 ui/evolution-mail-message.xml.h:112
+msgid "_Save As..."
+msgstr "_Gorde honela..."
+
+#: calendar/gui/e-day-view.c:3750 calendar/gui/e-week-view.c:3626
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Antolatu _bilera"
 
-#: calendar/gui/e-cal-view.c:1140
+#: calendar/gui/e-day-view.c:3751 calendar/gui/e-week-view.c:3627
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Birbidali _iCalendar gisa"
 
-#: calendar/gui/e-cal-view.c:1145
+#: calendar/gui/e-day-view.c:3756 calendar/gui/e-week-view.c:3632
 msgid "Make this Occurrence _Movable"
 msgstr "Egin _agerraldi hau aldagarri"
 
-#: calendar/gui/e-cal-view.c:1146 calendar/gui/e-cal-view.c:1177
+#: calendar/gui/e-day-view.c:3757 calendar/gui/e-week-view.c:3633
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-cal-view.c:1147 calendar/gui/e-cal-view.c:1178
+#: calendar/gui/e-day-view.c:3758 calendar/gui/e-week-view.c:3634
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: calendar/gui/e-cell-date-edit-text.c:118 e-util/e-time-utils.c:180
-#: e-util/e-time-utils.c:393
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %Y/%m/%d %H:%M:%S"
-
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: calendar/gui/e-cell-date-edit-text.c:121 e-util/e-time-utils.c:175
-#: e-util/e-time-utils.c:402
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %Y/%m/%d %I:%M:%S %p"
-
-#: calendar/gui/e-cell-date-edit-text.c:126
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"\n"
-"%s"
-msgstr ""
-"Data formatu honetan idatzi behar da: \n"
-"\n"
-"%s"
-
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:600 calendar/gui/e-week-view.c:326
-#: calendar/gui/print.c:809
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:603 calendar/gui/e-week-view.c:329
-#: calendar/gui/print.c:811
-msgid "pm"
-msgstr "pm"
-
-#. 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:1347 calendar/gui/e-day-view-top-item.c:262
-#: calendar/gui/e-week-view-main-item.c:316 calendar/gui/print.c:1524
-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:1380 calendar/gui/e-day-view-top-item.c:270
-#: calendar/gui/e-week-view-main-item.c:339
-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"
-
-#: calendar/gui/e-itip-control.c:676
+#: calendar/gui/e-itip-control.c:706
 #, fuzzy
 msgid "Yes. (Complex Recurrence)"
 msgstr "Errepikapen _soila"
 
-#: calendar/gui/e-itip-control.c:688
+#: calendar/gui/e-itip-control.c:718
 #, fuzzy
 msgid "Every day"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:690
+#: calendar/gui/e-itip-control.c:720
 #, fuzzy, c-format
 msgid "Every %d days"
 msgstr "%d egun"
 
-#: calendar/gui/e-itip-control.c:696
+#: calendar/gui/e-itip-control.c:726
 #, fuzzy
 msgid "Every week"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:698
+#: calendar/gui/e-itip-control.c:728
 #, fuzzy, c-format
 msgid "Every %d weeks"
 msgstr "%d aste"
 
-#: calendar/gui/e-itip-control.c:701
+#: calendar/gui/e-itip-control.c:731
 #, fuzzy
 msgid "Every week on "
 msgstr "Evergreen"
 
-#: calendar/gui/e-itip-control.c:703
+#: calendar/gui/e-itip-control.c:733
 #, fuzzy, c-format
 msgid "Every %d weeks on "
 msgstr "%d aste"
 
-#: calendar/gui/e-itip-control.c:711
+#: calendar/gui/e-itip-control.c:741
 #, fuzzy
 msgid " and "
 msgstr "Harea"
 
-#: calendar/gui/e-itip-control.c:718
+#: calendar/gui/e-itip-control.c:748
 #, c-format
 msgid "The %s day of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:731
+#: calendar/gui/e-itip-control.c:761
 #, c-format
 msgid "The %s %s of "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:736
+#: calendar/gui/e-itip-control.c:766
 #, fuzzy
 msgid "every month"
 msgstr "Hi_labete"
 
-#: calendar/gui/e-itip-control.c:741
+#: calendar/gui/e-itip-control.c:771
 #, c-format
 msgid "every %d months"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:747
+#: calendar/gui/e-itip-control.c:777
 #, fuzzy
 msgid "Every year"
 msgstr "Errepikatze-aldia"
 
-#: calendar/gui/e-itip-control.c:749
+#: calendar/gui/e-itip-control.c:779
 #, c-format
 msgid "Every %d years"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:761
+#: calendar/gui/e-itip-control.c:791
 #, c-format
 msgid " a total of %d times"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:769
+#: calendar/gui/e-itip-control.c:799
 msgid ", ending on "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:793
+#: calendar/gui/e-itip-control.c:823
 msgid "<b>Starts:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:803
+#: calendar/gui/e-itip-control.c:833
 #, fuzzy
 msgid "<b>Ends:</b> "
 msgstr "Amaiera: <b>"
 
-#: calendar/gui/e-itip-control.c:823
+#: calendar/gui/e-itip-control.c:853
 #, fuzzy
 msgid "<b>Completed:</b> "
 msgstr "Eginda "
 
-#: calendar/gui/e-itip-control.c:833
+#: calendar/gui/e-itip-control.c:863
 msgid "<b>Due:</b> "
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:870 calendar/gui/e-itip-control.c:923
+#: calendar/gui/e-itip-control.c:900 calendar/gui/e-itip-control.c:953
 msgid "iCalendar Information"
 msgstr "iCalendar informazioa"
 
 #. Title
-#: calendar/gui/e-itip-control.c:885
+#: calendar/gui/e-itip-control.c:915
 msgid "iCalendar Error"
 msgstr "iCalendar errorea"
 
-#: calendar/gui/e-itip-control.c:954 calendar/gui/e-itip-control.c:970
-#: calendar/gui/e-itip-control.c:981 calendar/gui/e-itip-control.c:998
+#: calendar/gui/e-itip-control.c:984 calendar/gui/e-itip-control.c:1000
+#: calendar/gui/e-itip-control.c:1011 calendar/gui/e-itip-control.c:1028
 msgid "An unknown person"
 msgstr "Pertsona ezezaguna"
 
 #. Describe what the user can do
-#: calendar/gui/e-itip-control.c:1005
+#: calendar/gui/e-itip-control.c:1035
 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:1020
+#: calendar/gui/e-itip-control.c:1050
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:1031
+#: calendar/gui/e-itip-control.c:1061
 #, fuzzy
 msgid "Location:"
 msgstr "K_okalekua:"
 
-#. write status
-#: calendar/gui/e-itip-control.c:1045 calendar/gui/e-tasks.c:243
+#: calendar/gui/e-itip-control.c:1075
 msgid "Status:"
 msgstr "Egoera:"
 
-#: calendar/gui/e-itip-control.c:1050 calendar/gui/itip-utils.c:414
+#: calendar/gui/e-itip-control.c:1080 calendar/gui/e-meeting-model.c:286
+#: calendar/gui/e-meeting-model.c:309 calendar/gui/e-meeting-model.c:798
+#: calendar/gui/itip-utils.c:414
 msgid "Accepted"
 msgstr "Onartua"
 
-#: calendar/gui/e-itip-control.c:1054 calendar/gui/itip-utils.c:417
+#: calendar/gui/e-itip-control.c:1084 calendar/gui/itip-utils.c:417
 msgid "Tentatively Accepted"
 msgstr "Oraingoz onartua"
 
-#: calendar/gui/e-itip-control.c:1058 calendar/gui/itip-utils.c:420
-#: calendar/gui/itip-utils.c:446
+#: calendar/gui/e-itip-control.c:1088 calendar/gui/e-meeting-model.c:288
+#: calendar/gui/e-meeting-model.c:311 calendar/gui/e-meeting-model.c:799
+#: calendar/gui/itip-utils.c:420 calendar/gui/itip-utils.c:446
 msgid "Declined"
 msgstr "Ukatua"
 
-#: calendar/gui/e-itip-control.c:1117 calendar/gui/e-itip-control.c:1145
-#: calendar/gui/e-itip-control.c:1171 calendar/gui/e-itip-control.c:1184
-#: calendar/gui/e-itip-control.c:1197 calendar/gui/e-itip-control.c:1210
+#: calendar/gui/e-itip-control.c:1092 calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-meeting-model.c:222 calendar/gui/e-meeting-model.c:257
+#: calendar/gui/e-meeting-model.c:322 calendar/gui/e-meeting-model.c:756
+#: calendar/gui/e-meeting-model.c:772 camel/camel-gpg-context.c:1574
+#: camel/camel-gpg-context.c:1625 camel/camel-tcp-stream-openssl.c:634
+#: camel/providers/smtp/camel-smtp-transport.c:173
+#: camel/providers/smtp/camel-smtp-transport.c:228 mail/folder-browser.c:345
+#: mail/mail-display.c:953 widgets/misc/e-charset-picker.c:60
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: calendar/gui/e-itip-control.c:1147 calendar/gui/e-itip-control.c:1175
+#: calendar/gui/e-itip-control.c:1201 calendar/gui/e-itip-control.c:1214
+#: calendar/gui/e-itip-control.c:1227 calendar/gui/e-itip-control.c:1240
 msgid "Choose an action:"
 msgstr "Aukeratu ekintza bat:"
 
-#: calendar/gui/e-itip-control.c:1118
+#: calendar/gui/e-itip-control.c:1148
 msgid "Update"
 msgstr "Eguneratu"
 
-#: calendar/gui/e-itip-control.c:1119 calendar/gui/e-itip-control.c:1150
-#: calendar/gui/e-itip-control.c:1173 calendar/gui/e-itip-control.c:1186
-#: calendar/gui/e-itip-control.c:1199 calendar/gui/e-itip-control.c:1212
+#: calendar/gui/e-itip-control.c:1149 calendar/gui/e-itip-control.c:1180
+#: calendar/gui/e-itip-control.c:1203 calendar/gui/e-itip-control.c:1216
+#: calendar/gui/e-itip-control.c:1229 calendar/gui/e-itip-control.c:1242
 #: shell/e-shell.c:2067 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
-#: calendar/gui/e-itip-control.c:1146
+#: calendar/gui/e-itip-control.c:1176
 msgid "Accept"
 msgstr "Onartu"
 
-#: calendar/gui/e-itip-control.c:1147
+#: calendar/gui/e-itip-control.c:1177
 msgid "Tentatively accept"
 msgstr "Onartu oraingoz"
 
-#: calendar/gui/e-itip-control.c:1148
+#: calendar/gui/e-itip-control.c:1178
 msgid "Decline"
 msgstr "Ukatu"
 
-#: calendar/gui/e-itip-control.c:1149
-#: calendar/gui/e-meeting-time-sel.etspec.h:8
-msgid "RSVP"
-msgstr "RSVP"
-
-#: calendar/gui/e-itip-control.c:1172
+#: calendar/gui/e-itip-control.c:1202
 msgid "Send Free/Busy Information"
 msgstr "Bidali libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1185
+#: calendar/gui/e-itip-control.c:1215
 msgid "Update respondent status"
 msgstr "Eguneratu erantzun-emailearen egoera"
 
-#: calendar/gui/e-itip-control.c:1198
+#: calendar/gui/e-itip-control.c:1228
 msgid "Send Latest Information"
 msgstr "Bidali azken orduko informazioa"
 
-#: calendar/gui/e-itip-control.c:1211 calendar/gui/itip-utils.c:434
-#: mail/mail-send-recv.c:388 mail/mail-send-recv.c:440
-#: shell/e-shell-startup-wizard.c:781 shell/evolution-shell-component.c:1185
-#: ui/evolution-mail-global.xml.h:1
+#: calendar/gui/e-itip-control.c:1241 calendar/gui/itip-utils.c:434
+#: mail/mail-send-recv.c:387 mail/mail-send-recv.c:444
+#: shell/evolution-shell-component.c:1182 ui/evolution-mail-global.xml.h:1
 msgid "Cancel"
 msgstr "Utzi"
 
-#: calendar/gui/e-itip-control.c:1300
+#: calendar/gui/e-itip-control.c:1322
 #, 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:1301
+#: calendar/gui/e-itip-control.c:1323
 msgid "Meeting Information"
 msgstr "Bileraren informazioa"
 
-#: calendar/gui/e-itip-control.c:1306
+#: calendar/gui/e-itip-control.c:1328
 #, fuzzy, c-format
 msgid "<b>%s</b> requests the presence of %s at a meeting."
 msgstr "<b>%s</b>(e)k bilerarako deia egiten dizu."
 
-#: calendar/gui/e-itip-control.c:1308
+#: calendar/gui/e-itip-control.c:1330
 #, 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:1309
+#: calendar/gui/e-itip-control.c:1331
 msgid "Meeting Proposal"
 msgstr "Bilera-proposamena"
 
-#: calendar/gui/e-itip-control.c:1313
+#: calendar/gui/e-itip-control.c:1335
 #, 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:1314
+#: calendar/gui/e-itip-control.c:1336
 msgid "Meeting Update"
 msgstr "Bilera-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1318
+#: calendar/gui/e-itip-control.c:1340
 #, 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:1319
+#: calendar/gui/e-itip-control.c:1341
 msgid "Meeting Update Request"
 msgstr "Bilera-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1326
+#: calendar/gui/e-itip-control.c:1348
 #, 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:1327
+#: calendar/gui/e-itip-control.c:1349
 msgid "Meeting Reply"
 msgstr "Bilera-erantzuna"
 
-#: calendar/gui/e-itip-control.c:1334
+#: calendar/gui/e-itip-control.c:1356
 #, 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:1335
+#: calendar/gui/e-itip-control.c:1357
 msgid "Meeting Cancellation"
 msgstr "Bilera bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1342 calendar/gui/e-itip-control.c:1409
-#: calendar/gui/e-itip-control.c:1444
+#: calendar/gui/e-itip-control.c:1364 calendar/gui/e-itip-control.c:1431
+#: calendar/gui/e-itip-control.c:1466
 #, 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:1343
+#: calendar/gui/e-itip-control.c:1365
 msgid "Bad Meeting Message"
 msgstr "Bilera-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1367
+#: calendar/gui/e-itip-control.c:1389
 #, 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:1368
+#: calendar/gui/e-itip-control.c:1390
 msgid "Task Information"
 msgstr "Zereginaren informazioa"
 
-#: calendar/gui/e-itip-control.c:1373
+#: calendar/gui/e-itip-control.c:1395
 #, fuzzy, c-format
 msgid "<b>%s</b> requests %s to perform a task."
 msgstr "<b>%s</b>(e)k zeregin bat egiteko eskatzen dizu."
 
-#: calendar/gui/e-itip-control.c:1375
+#: calendar/gui/e-itip-control.c:1397
 #, 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:1376
+#: calendar/gui/e-itip-control.c:1398
 msgid "Task Proposal"
 msgstr "Zeregin-proposamena"
 
-#: calendar/gui/e-itip-control.c:1380
+#: calendar/gui/e-itip-control.c:1402
 #, 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:1381
+#: calendar/gui/e-itip-control.c:1403
 msgid "Task Update"
 msgstr "Zeregin-eguneratzea"
 
-#: calendar/gui/e-itip-control.c:1385
+#: calendar/gui/e-itip-control.c:1407
 #, 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:1386
+#: calendar/gui/e-itip-control.c:1408
 msgid "Task Update Request"
 msgstr "Zeregin-eguneratzearen eskaera"
 
-#: calendar/gui/e-itip-control.c:1393
+#: calendar/gui/e-itip-control.c:1415
 #, 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:1394
+#: calendar/gui/e-itip-control.c:1416
 msgid "Task Reply"
 msgstr "Zereginaren erantzuna"
 
-#: calendar/gui/e-itip-control.c:1401
+#: calendar/gui/e-itip-control.c:1423
 #, 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:1402
+#: calendar/gui/e-itip-control.c:1424
 msgid "Task Cancellation"
 msgstr "Zeregina bertan behera uztea"
 
-#: calendar/gui/e-itip-control.c:1410
+#: calendar/gui/e-itip-control.c:1432
 msgid "Bad Task Message"
 msgstr "Zeregin-mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1429
+#: calendar/gui/e-itip-control.c:1451
 #, 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:1430
+#: calendar/gui/e-itip-control.c:1452
 msgid "Free/Busy Information"
 msgstr "Libre/okupatuta informazioa"
 
-#: calendar/gui/e-itip-control.c:1434
+#: calendar/gui/e-itip-control.c:1456
 #, 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:1435
+#: calendar/gui/e-itip-control.c:1457
 msgid "Free/Busy Request"
 msgstr "Libre/okupatuta eskaera"
 
-#: calendar/gui/e-itip-control.c:1439
+#: calendar/gui/e-itip-control.c:1461
 #, 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:1440
+#: calendar/gui/e-itip-control.c:1462
 msgid "Free/Busy Reply"
 msgstr "Libre/okupatuta erantzuna"
 
-#: calendar/gui/e-itip-control.c:1445
+#: calendar/gui/e-itip-control.c:1467
 msgid "Bad Free/Busy Message"
 msgstr "Libre/okupatuta mezu txarra"
 
-#: calendar/gui/e-itip-control.c:1521
+#: calendar/gui/e-itip-control.c:1543
 #, fuzzy
 msgid "The message does not appear to be properly formed"
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: calendar/gui/e-itip-control.c:1584
+#: calendar/gui/e-itip-control.c:1606
 msgid "The message contains only unsupported requests."
 msgstr "Mezu honek onartzen ez diren eskaerak bakarrik ditu."
 
-#: calendar/gui/e-itip-control.c:1615 calendar/gui/e-itip-control.c:1621
+#: calendar/gui/e-itip-control.c:1637 calendar/gui/e-itip-control.c:1643
 msgid "The attachment does not contain a valid calendar message"
 msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 
-#: calendar/gui/e-itip-control.c:1646
+#: calendar/gui/e-itip-control.c:1668
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1887 calendar/gui/e-itip-control.c:1948
-#: calendar/gui/e-itip-control.c:1986
+#: calendar/gui/e-itip-control.c:1909 calendar/gui/e-itip-control.c:2001
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1890 calendar/gui/e-itip-control.c:1989
+#: calendar/gui/e-itip-control.c:1912 calendar/gui/e-itip-control.c:2004
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da datuak deskargatzean"
 
-#: calendar/gui/e-itip-control.c:1893 calendar/gui/e-itip-control.c:1992
+#: calendar/gui/e-itip-control.c:1915 calendar/gui/e-itip-control.c:2007
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:1896
+#: calendar/gui/e-itip-control.c:1918
 #, fuzzy
 msgid "You do not have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:1899
+#: calendar/gui/e-itip-control.c:1921
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1902
+#: calendar/gui/e-itip-control.c:1924
 msgid "Calendar file could not be updated!\n"
 msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
 
-#: calendar/gui/e-itip-control.c:1932 calendar/gui/e-itip-control.c:2004
+#: calendar/gui/e-itip-control.c:1953 calendar/gui/e-itip-control.c:2019
 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:1958
+#: calendar/gui/e-itip-control.c:1974
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1970
+#: calendar/gui/e-itip-control.c:1986
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Partaidearen egoera ezin da eguneratu egoera baliogabea dagoelako!\n"
 
-#: calendar/gui/e-itip-control.c:1995
+#: calendar/gui/e-itip-control.c:2010
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-itip-control.c:1998
+#: calendar/gui/e-itip-control.c:2013
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:2001
+#: calendar/gui/e-itip-control.c:2016
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:2038
+#: calendar/gui/e-itip-control.c:2053
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:2070 calendar/gui/e-itip-control.c:2120
+#: calendar/gui/e-itip-control.c:2085 calendar/gui/e-itip-control.c:2135
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:2072 calendar/gui/e-itip-control.c:2124
+#: calendar/gui/e-itip-control.c:2087 calendar/gui/e-itip-control.c:2139
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
-#: calendar/gui/e-itip-control.c:2215
+#: calendar/gui/e-itip-control.c:2212
 #, fuzzy
 msgid "Select Calendar Folder"
 msgstr "Hautatu karpeta"
 
-#: calendar/gui/e-itip-control.c:2221
+#: calendar/gui/e-itip-control.c:2219
 #, fuzzy
 msgid "Select Tasks Folder"
 msgstr "Hautatu karpeta"
@@ -6096,283 +6075,251 @@ msgstr "data-amaiera"
 msgid "date-start"
 msgstr "data-hasiera"
 
-#: calendar/gui/e-meeting-time-sel.c:392
+#: calendar/gui/e-meeting-model.c:79
+msgid "Chair Persons"
+msgstr "Mahaiburuak"
+
+#: calendar/gui/e-meeting-model.c:80 calendar/gui/e-meeting-model.c:1636
+msgid "Required Participants"
+msgstr "Beharrezko partaideak"
+
+#: calendar/gui/e-meeting-model.c:81
+msgid "Optional Participants"
+msgstr "Aukerako partaideak"
+
+#: calendar/gui/e-meeting-model.c:82
+#, fuzzy
+msgid "Resources"
+msgstr "Baliabidea"
+
+#: calendar/gui/e-meeting-model.c:197 calendar/gui/e-meeting-model.c:214
+#: calendar/gui/e-meeting-model.c:530 calendar/gui/e-meeting-model.c:752
+msgid "Individual"
+msgstr "Indibiduala"
+
+#: calendar/gui/e-meeting-model.c:199 calendar/gui/e-meeting-model.c:216
+#: calendar/gui/e-meeting-model.c:753
+msgid "Group"
+msgstr "Taldea"
+
+#: calendar/gui/e-meeting-model.c:201 calendar/gui/e-meeting-model.c:218
+#: calendar/gui/e-meeting-model.c:754
+msgid "Resource"
+msgstr "Baliabidea"
+
+#: calendar/gui/e-meeting-model.c:203 calendar/gui/e-meeting-model.c:220
+#: calendar/gui/e-meeting-model.c:755
+msgid "Room"
+msgstr "Gela"
+
+#: calendar/gui/e-meeting-model.c:232 calendar/gui/e-meeting-model.c:249
+#: calendar/gui/e-meeting-model.c:768
+msgid "Chair"
+msgstr "Mahaiburua"
+
+#: calendar/gui/e-meeting-model.c:234 calendar/gui/e-meeting-model.c:251
+#: calendar/gui/e-meeting-model.c:532 calendar/gui/e-meeting-model.c:769
+msgid "Required Participant"
+msgstr "Beharrezko partaidea"
+
+#: calendar/gui/e-meeting-model.c:236 calendar/gui/e-meeting-model.c:253
+#: calendar/gui/e-meeting-model.c:770
+msgid "Optional Participant"
+msgstr "Aukerako partaidea"
+
+#: calendar/gui/e-meeting-model.c:238 calendar/gui/e-meeting-model.c:255
+#: calendar/gui/e-meeting-model.c:771
+msgid "Non-Participant"
+msgstr "Ez-partaidea"
+
+#: calendar/gui/e-meeting-model.c:284 calendar/gui/e-meeting-model.c:307
+#: calendar/gui/e-meeting-model.c:540 calendar/gui/e-meeting-model.c:797
+msgid "Needs Action"
+msgstr "Ekintza behar du"
+
+#: calendar/gui/e-meeting-model.c:290 calendar/gui/e-meeting-model.c:313
+#: calendar/gui/e-meeting-model.c:800 calendar/gui/e-meeting-time-sel.c:405
 msgid "Tentative"
 msgstr "Behin-behinekoa"
 
-#: calendar/gui/e-meeting-time-sel.c:394 designs/OOA/ooa.glade.h:11
+#: calendar/gui/e-meeting-model.c:292 calendar/gui/e-meeting-model.c:315
+#: calendar/gui/e-meeting-model.c:801
+msgid "Delegated"
+msgstr "Delegatua"
+
+#: calendar/gui/e-meeting-model.c:296 calendar/gui/e-meeting-model.c:319
+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:458
+#: calendar/gui/e-meeting-time-sel.c:2098
+msgid "%A, %B %d, %Y"
+msgstr "%A, %B %d, %Y"
+
+#. 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:462
+#: calendar/gui/e-meeting-time-sel.c:2131 e-util/e-time-utils.c:190
+#: e-util/e-time-utils.c:283 e-util/e-time-utils.c:371
+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:466 e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:286 widgets/misc/e-dateedit.c:1582
+msgid "%m/%d/%Y"
+msgstr "%Y/%m/%d"
+
+#: calendar/gui/e-meeting-time-sel.c:407 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
 
-#: calendar/gui/e-meeting-time-sel.c:395
+#: calendar/gui/e-meeting-time-sel.c:408
 msgid "No Information"
 msgstr "Ez dago informaziorik"
 
-#: calendar/gui/e-meeting-time-sel.c:434
+#: calendar/gui/e-meeting-time-sel.c:447
 msgid "_Options"
 msgstr "Au_kerak"
 
-#: calendar/gui/e-meeting-time-sel.c:451
+#: calendar/gui/e-meeting-time-sel.c:464
 msgid "Show _Only Working Hours"
 msgstr "Erakutsi lan-orduak _bakarrik"
 
-#: calendar/gui/e-meeting-time-sel.c:461
+#: calendar/gui/e-meeting-time-sel.c:474
 msgid "Show _Zoomed Out"
 msgstr "Erakutsi _txikiagotuta"
 
-#: calendar/gui/e-meeting-time-sel.c:476
+#: calendar/gui/e-meeting-time-sel.c:489
 msgid "_Update Free/Busy"
 msgstr "_Eguneratu Libre/okupatuta"
 
-#: calendar/gui/e-meeting-time-sel.c:491
+#: calendar/gui/e-meeting-time-sel.c:504
 msgid "_<<"
 msgstr "_<<"
 
-#: calendar/gui/e-meeting-time-sel.c:509
+#: calendar/gui/e-meeting-time-sel.c:522
 msgid "_Autopick"
 msgstr "Au_tomatikoki hautatu"
 
-#: calendar/gui/e-meeting-time-sel.c:524
+#: calendar/gui/e-meeting-time-sel.c:537
 msgid ">_>"
 msgstr ">_>"
 
-#: calendar/gui/e-meeting-time-sel.c:541
+#: calendar/gui/e-meeting-time-sel.c:554
 msgid "_All People and Resources"
 msgstr "_Pertsona eta baliabide guztiak"
 
-#: calendar/gui/e-meeting-time-sel.c:550
+#: calendar/gui/e-meeting-time-sel.c:563
 msgid "All _People and One Resource"
 msgstr "Pert_sona guztiak eta baliabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:559
+#: calendar/gui/e-meeting-time-sel.c:572
 msgid "_Required People"
 msgstr "_Beharrezko pertsonak"
 
-#: calendar/gui/e-meeting-time-sel.c:568
+#: calendar/gui/e-meeting-time-sel.c:581
 msgid "Required People and _One Resource"
 msgstr "Beharrezko pertsonak eta ba_liabide bat"
 
-#: calendar/gui/e-meeting-time-sel.c:587
+#: calendar/gui/e-meeting-time-sel.c:600
 msgid "Meeting _start time:"
 msgstr "Bilera _hasteko ordua:"
 
-#: calendar/gui/e-meeting-time-sel.c:607
+#: calendar/gui/e-meeting-time-sel.c:620
 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:2054
-#: calendar/gui/e-meeting-time-sel-item.c:452
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-#. 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:2087
-#: 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"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:1
-msgid "Attendee"
-msgstr "Partaidea"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:2
-#, fuzzy
-msgid "Click here to add an attendee"
-msgstr "* Egin klik hemen kontaktua gehitzeko *"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:3
-msgid "Common Name"
-msgstr "Izen arrunta"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:4
-msgid "Delegated From"
-msgstr "Delegatzailea"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:5
-msgid "Delegated To"
-msgstr "Delegatua"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:6
-msgid "Language"
-msgstr "Hizkuntza"
-
-#: calendar/gui/e-meeting-time-sel.etspec.h:7
-msgid "Member"
-msgstr "Kidea"
-
-#. 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:1607
-msgid "%m/%d/%Y"
-msgstr "%Y/%m/%d"
-
-#: calendar/gui/e-tasks.c:151
-msgid "invalid time"
-msgstr "baliogabeko ordua"
-
-#: calendar/gui/e-tasks.c:221
-#, fuzzy
-msgid "Start Date:"
-msgstr "Ha_siera-data:"
-
-#: calendar/gui/e-tasks.c:237
-#, fuzzy
-msgid "Due Date:"
-msgstr "_Mugaeguna:"
-
-#. write priority
-#: calendar/gui/e-tasks.c:265
-#, fuzzy
-msgid "Priority:"
-msgstr "_Lehentasuna:"
-
-#. URL
-#: calendar/gui/e-tasks.c:321
-#, fuzzy
-msgid "Web Page:"
-msgstr "Orrialdea"
-
-#: calendar/gui/e-tasks.c:702
+#: calendar/gui/e-tasks.c:360 calendar/gui/gnome-cal.c:2006
+#: calendar/gui/gnome-cal.c:2017
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:731 calendar/gui/tasks-control.c:201
+#: calendar/gui/e-tasks.c:389 calendar/gui/tasks-control.c:201
 #, c-format
 msgid "Could not load the tasks in `%s'"
 msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:746
+#: calendar/gui/e-tasks.c:404
 #, c-format
 msgid "The method required to load `%s' is not supported"
 msgstr "`%s'kargatzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/e-tasks.c:760 calendar/gui/gnome-cal.c:1730
+#: calendar/gui/e-tasks.c:418 calendar/gui/gnome-cal.c:1509
 #, fuzzy, c-format
 msgid "You don't have permission to open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/e-tasks.c:828 calendar/gui/gnome-cal.c:1944
+#: calendar/gui/e-tasks.c:486 calendar/gui/gnome-cal.c:1728
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Errorea %s abiaraztean"
 
-#: calendar/gui/e-tasks.c:899
+#: calendar/gui/e-tasks.c:557
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Egite-data"
 
-#: calendar/gui/e-tasks.c:922
+#: calendar/gui/e-tasks.c:580
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-tasks.c:1017
+#: calendar/gui/e-tasks.c:675
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/gnome-cal.c:1702
+#: calendar/gui/e-week-view.c:3581
+msgid "New _Appointment..."
+msgstr "Hitz_ordu berria..."
+
+#: calendar/gui/gnome-cal.c:1481
 #, c-format
 msgid "Could not open the folder in `%s'"
 msgstr "Ezin izan da karpeta ireki`%s'(e)n"
 
-#: calendar/gui/gnome-cal.c:1716
+#: calendar/gui/gnome-cal.c:1495
 #, c-format
 msgid "The method required to open `%s' is not supported"
 msgstr "`%s'irekitzeko behar den metodoa ez da onartzen"
 
-#: calendar/gui/gnome-cal.c:1772
+#: calendar/gui/gnome-cal.c:1556
 #, fuzzy, c-format
 msgid "Adding alarms for %s"
 msgstr "%s alarma"
 
-#: calendar/gui/gnome-cal.c:1964
+#: calendar/gui/gnome-cal.c:1748
 #, c-format
 msgid ""
-"The task backend for\n"
+"The calendar backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1970
+#: calendar/gui/gnome-cal.c:1757
 #, c-format
 msgid ""
-"The calendar backend for\n"
+"The task backend for\n"
 "%s\n"
 " has crashed. You will have to restart Evolution in order to use it again"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2176
+#: calendar/gui/gnome-cal.c:1988
 #, c-format
 msgid "Opening calendar at %s"
 msgstr "%s - egutegia irekitzen"
 
-#: calendar/gui/gnome-cal.c:2197
+#: calendar/gui/gnome-cal.c:2028
 #, fuzzy
 msgid "Opening default tasks folder"
 msgstr "%s karpeta irekitzen"
 
-#: calendar/gui/gnome-cal.c:3094
-#, fuzzy, c-format
-msgid "Purging event %s"
-msgstr "%s eskaneatzen"
-
-#: calendar/gui/gnome-cal.c:3178
-#, fuzzy
-msgid "Purging"
-msgstr "Turin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Egutegiaren eta zereginen ezarpenak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Egutegiaren eta zereginen ezarpenak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks component"
-msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-en egutegiaren iTip/iMip ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-en berri-editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-en berri-editorea"
-
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -6481,7 +6428,7 @@ msgstr "Libre/okupatuta informazioa (%s - %s)"
 msgid "iCalendar information"
 msgstr "iCalendar informazioa"
 
-#: calendar/gui/itip-utils.c:668
+#: calendar/gui/itip-utils.c:667
 msgid "You must be an attendee of the event."
 msgstr "Gertaerako partaidea izan behar duzu."
 
@@ -6514,81 +6461,82 @@ msgid "Sa"
 msgstr "Lr"
 
 #. Day
-#: calendar/gui/print.c:1882
+#: calendar/gui/print.c:1875
 msgid "Selected day (%a %b %d %Y)"
 msgstr "Hautatutako eguna (%a, %Y %b %d)"
 
-#: calendar/gui/print.c:1907 calendar/gui/print.c:1911
+#: calendar/gui/print.c:1900 calendar/gui/print.c:1904
 msgid "%a %b %d"
 msgstr "%a, %b %d"
 
-#: calendar/gui/print.c:1908
+#: calendar/gui/print.c:1901
 msgid "%a %d %Y"
 msgstr "%a, %Y %d"
 
-#: calendar/gui/print.c:1912 calendar/gui/print.c:1914
-#: calendar/gui/print.c:1915
+#: calendar/gui/print.c:1905 calendar/gui/print.c:1907
+#: calendar/gui/print.c:1908
 msgid "%a %b %d %Y"
 msgstr "%a, %Y %b %d"
 
-#: calendar/gui/print.c:1919
+#: calendar/gui/print.c:1912
 #, c-format
 msgid "Selected week (%s - %s)"
 msgstr "Hautatutako astea (%s - %s)"
 
 #. Month
-#: calendar/gui/print.c:1927
+#: calendar/gui/print.c:1920
 msgid "Selected month (%b %Y)"
 msgstr "Hautatutako hilabetea (%Y %b)"
 
 #. Year
-#: calendar/gui/print.c:1934
+#: calendar/gui/print.c:1927
 msgid "Selected year (%Y)"
 msgstr "Hautatutako urtea (%Y)"
 
-#: calendar/gui/print.c:2262
+#: calendar/gui/print.c:2255
 msgid "Task"
 msgstr "Zeregina"
 
-#: calendar/gui/print.c:2321
+#: calendar/gui/print.c:2314
 #, c-format
 msgid "Status: %s"
 msgstr "Egoera: %s"
 
-#: calendar/gui/print.c:2338
+#: calendar/gui/print.c:2331
 #, fuzzy, c-format
 msgid "Priority: %s"
 msgstr "_Lehentasuna:"
 
-#: calendar/gui/print.c:2350
+#: calendar/gui/print.c:2343
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Osatutako ehunekoa: %i"
 
-#: calendar/gui/print.c:2362
+#: calendar/gui/print.c:2355
 #, c-format
 msgid "URL: %s"
 msgstr "URLa: %s"
 
-#: calendar/gui/print.c:2376
+#: calendar/gui/print.c:2369
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategoriak: %s"
 
-#: calendar/gui/print.c:2387
+#: calendar/gui/print.c:2380
 msgid "Contacts: "
 msgstr "Kontaktuak "
 
-#: calendar/gui/print.c:2525 calendar/gui/print.c:2611
-#: calendar/gui/tasks-control.c:564 my-evolution/e-summary.c:649
+#: calendar/gui/print.c:2518 calendar/gui/print.c:2604
+#: calendar/gui/tasks-control.c:581 mail/mail-callbacks.c:2948
+#: my-evolution/e-summary.c:649
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
-#: calendar/gui/print.c:2559
+#: calendar/gui/print.c:2552
 msgid "Print Item"
 msgstr "Inprimatu elementua"
 
-#: calendar/gui/print.c:2632
+#: calendar/gui/print.c:2625
 msgid "Print Setup"
 msgstr "Prestatu inprimaketa"
 
@@ -6596,7 +6544,7 @@ msgstr "Prestatu inprimaketa"
 msgid "The URI of the tasks folder to display"
 msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
 
-#: calendar/gui/tasks-control.c:448
+#: calendar/gui/tasks-control.c:465
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -6608,11 +6556,11 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:451
+#: calendar/gui/tasks-control.c:468
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: calendar/gui/tasks-control.c:593
+#: calendar/gui/tasks-control.c:610
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Inprimatu txartelak"
@@ -8319,28 +8267,28 @@ msgstr "Pazifikoa/Wallis"
 msgid "Pacific/Yap"
 msgstr "Pazifikoa/Yap"
 
-#: camel/camel-cipher-context.c:167
+#: camel/camel-cipher-context.c:178
 msgid "Signing is not supported by this cipher"
 msgstr "Zifraketa honek ez du sinatzerik onartzen"
 
-#: camel/camel-cipher-context.c:207
+#: camel/camel-cipher-context.c:218
 msgid "Verifying is not supported by this cipher"
 msgstr "Zifraketa honek ez du egiaztatzerik onartzen"
 
-#: camel/camel-cipher-context.c:251
+#: camel/camel-cipher-context.c:262
 msgid "Encryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:293
+#: camel/camel-cipher-context.c:304
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:331
+#: camel/camel-cipher-context.c:342
 #, fuzzy
 msgid "You may not import keys with this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: camel/camel-cipher-context.c:363
+#: camel/camel-cipher-context.c:374
 #, fuzzy
 msgid "You may not export keys with this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
@@ -8380,11 +8328,7 @@ msgstr ""
 msgid "Resynchronizing with server"
 msgstr "Zerbitzariarekin birsinkronizatzen"
 
-#: camel/camel-disco-folder.c:90
-msgid "Downloading new messages for offline mode"
-msgstr ""
-
-#: camel/camel-disco-folder.c:351
+#: camel/camel-disco-folder.c:278
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s karpeta biltegiratzen"
@@ -8405,57 +8349,57 @@ msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 msgid "Failed to create create child process '%s': %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: camel/camel-filter-driver.c:759
+#: camel/camel-filter-driver.c:744
 #, fuzzy, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/camel-filter-driver.c:940 camel/camel-filter-driver.c:949
+#: camel/camel-filter-driver.c:923 camel/camel-filter-driver.c:932
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1038 camel/camel-filter-driver.c:1411
+#: camel/camel-filter-driver.c:1021 camel/camel-filter-driver.c:1394
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1047 camel/camel-filter-driver.c:1417
+#: camel/camel-filter-driver.c:1030 camel/camel-filter-driver.c:1400
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: camel/camel-filter-driver.c:1114
+#: camel/camel-filter-driver.c:1097
 msgid "Unable to open spool folder"
 msgstr "Ezin da spool-karpeta ireki"
 
-#: camel/camel-filter-driver.c:1123
+#: camel/camel-filter-driver.c:1106
 msgid "Unable to process spool folder"
 msgstr "Ezin da spool-karpeta prozesatu"
 
-#: camel/camel-filter-driver.c:1138
+#: camel/camel-filter-driver.c:1121
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: camel/camel-filter-driver.c:1142
+#: camel/camel-filter-driver.c:1125
 msgid "Cannot open message"
 msgstr "Ezin da mezua ireki"
 
-#: camel/camel-filter-driver.c:1143 camel/camel-filter-driver.c:1155
+#: camel/camel-filter-driver.c:1126 camel/camel-filter-driver.c:1138
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: camel/camel-filter-driver.c:1169 camel/camel-filter-driver.c:1263
+#: camel/camel-filter-driver.c:1152 camel/camel-filter-driver.c:1246
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: camel/camel-filter-driver.c:1230
+#: camel/camel-filter-driver.c:1213
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: camel/camel-filter-driver.c:1245
+#: camel/camel-filter-driver.c:1228
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
@@ -8479,36 +8423,7 @@ msgstr "Argumentu baliogabeak"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder.c:585
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
-
-#: camel/camel-folder.c:1163
-#, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1203
-#, c-format
-msgid "Unsupported operation: search by uids: for %s"
-msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
-
-#: camel/camel-folder.c:1321
-msgid "Moving messages"
-msgstr "Mezuak eramaten"
-
-#: camel/camel-folder.c:1321
-#, fuzzy
-msgid "Copying messages"
-msgstr "Mezuak %s(e)n kopiatzen"
-
-#: camel/camel-folder.c:1571
-#, fuzzy
-msgid "Filtering new message(s)"
-msgstr "%d mezu berreskuratzen"
-
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:346
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8517,7 +8432,7 @@ msgstr ""
 "Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: camel/camel-folder-search.c:356
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -8526,15 +8441,39 @@ msgstr ""
 "Errorea bilaketa-adierazpena exekutatzean: %s:\n"
 "%s"
 
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
+#: camel/camel-folder-search.c:573 camel/camel-folder-search.c:601
 msgid "(match-all) requires a single bool result"
 msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:653
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Kontsulta egiten goiburuko ezezagunean: %s"
 
+#: camel/camel-folder.c:583
+#, c-format
+msgid "Unsupported operation: append message: for %s"
+msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
+
+#: camel/camel-folder.c:1161
+#, c-format
+msgid "Unsupported operation: search by expression: for %s"
+msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1201
+#, c-format
+msgid "Unsupported operation: search by uids: for %s"
+msgstr "Eragiketa hau ez da onartzen: uid bidezko bilaketa: %s"
+
+#: camel/camel-folder.c:1319
+msgid "Moving messages"
+msgstr "Mezuak eramaten"
+
+#: camel/camel-folder.c:1319
+#, fuzzy
+msgid "Copying messages"
+msgstr "Mezuak %s(e)n kopiatzen"
+
 #: camel/camel-gpg-context.c:762
 #, c-format
 msgid ""
@@ -8560,7 +8499,7 @@ msgstr ""
 
 #: camel/camel-gpg-context.c:821 camel/camel-gpg-context.c:1297
 #: camel/camel-gpg-context.c:1403 camel/camel-gpg-context.c:1473
-#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:574
+#: camel/camel-gpg-context.c:1529 mail/mail-send-recv.c:577
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
@@ -8616,6 +8555,26 @@ msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da mezua egiaztatu: ezin izan da aldi baterako fitxategia sortu: %s"
 
+#: camel/camel-lock-client.c:111
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik eraiki: %s"
+
+#: camel/camel-lock-client.c:124
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ezin da blokeo-laguntzailearen fork-a egin: %s"
+
+#: camel/camel-lock-client.c:202 camel/camel-lock-client.c:225
+#, 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:215
+#, 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"
@@ -8638,26 +8597,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 eraiki: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ezin da blokeo-laguntzailearen fork-a egin: %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"
@@ -8726,11 +8665,11 @@ msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Huts egin du desenkriptatzean: Ezezaguna"
 
-#: camel/camel-multipart-signed.c:646
+#: camel/camel-multipart-signed.c:644
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-multipart-signed.c:700
+#: camel/camel-multipart-signed.c:698
 #, fuzzy
 msgid "parse error"
 msgstr "Beste errore bat"
@@ -8804,11 +8743,11 @@ msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu CRAM-MD5 pasahitz segurua "
 "erabiliz, zerbitzariak onartzen badu."
 
-#: camel/camel-sasl-digest-md5.c:48
+#: camel/camel-sasl-digest-md5.c:46
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: camel/camel-sasl-digest-md5.c:50
+#: camel/camel-sasl-digest-md5.c:48
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -8904,7 +8843,7 @@ msgstr ""
 #: 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:1207
+#: camel/providers/imap/camel-imap-store.c:1052
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -8967,23 +8906,23 @@ msgstr ""
 msgid "PLAIN"
 msgstr ""
 
-#: camel/camel-sasl-popb4smtp.c:36
+#: camel/camel-sasl-popb4smtp.c:34
 msgid "POP before SMTP"
 msgstr "POP SMTPren aurretik"
 
-#: camel/camel-sasl-popb4smtp.c:38
+#: camel/camel-sasl-popb4smtp.c:36
 msgid "This option will authorise a POP connection before attempting SMTP"
 msgstr "Aukera honek POP konexioa baimenduko du SMTPrekin saiatu aurretik"
 
-#: camel/camel-sasl-popb4smtp.c:103
+#: camel/camel-sasl-popb4smtp.c:107
 msgid "POP Source URI"
 msgstr "POP Source URI"
 
-#: camel/camel-sasl-popb4smtp.c:107
+#: camel/camel-sasl-popb4smtp.c:111
 msgid "POP Before SMTP auth using an unknown transport"
 msgstr "POP Before SMTP auth using an unknown transport"
 
-#: camel/camel-sasl-popb4smtp.c:112
+#: camel/camel-sasl-popb4smtp.c:116
 msgid "POP Before SMTP auth using a non-pop source"
 msgstr "POP Before SMTP auth using a non-pop source"
 
@@ -8992,57 +8931,57 @@ 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:277
+#: camel/camel-service.c:282
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: camel/camel-service.c:285
+#: camel/camel-service.c:290
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: camel/camel-service.c:293
+#: camel/camel-service.c:298
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: camel/camel-service.c:738
+#: camel/camel-service.c:750
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:769 camel/camel-service.c:893
+#: camel/camel-service.c:783 camel/camel-service.c:915
 #, c-format
 msgid "Failure in name lookup: %s"
 msgstr "Huts egin du izen-bilaketan: %s"
 
-#: camel/camel-service.c:790 camel/camel-service.c:914
+#: camel/camel-service.c:804
 #, fuzzy, c-format
 msgid "Host lookup failed: cannot create thread: %s"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:803
+#: camel/camel-service.c:818
 #, 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:806
+#: camel/camel-service.c:821
 #, c-format
 msgid "Host lookup failed: %s: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
 
-#: camel/camel-service.c:860
+#: camel/camel-service.c:880
 #, fuzzy
 msgid "Resolving address"
 msgstr "Ebazten: %s"
 
-#: camel/camel-service.c:929
+#: camel/camel-service.c:949
 #, fuzzy
 msgid "Host lookup failed: host not found"
 msgstr "Ostalari-bilaketak huts egin du: %s: ez da ostalaria aurkitu"
 
-#: camel/camel-service.c:932
+#: camel/camel-service.c:952
 #, fuzzy
 msgid "Host lookup failed: unknown reason"
 msgstr "Ostalari-bilaketak huts egin du: %s: arrazoi ezezaguna"
@@ -9055,12 +8994,12 @@ msgstr "Karpeta birtualen posta-hornitzailea"
 msgid "For reading mail as a query of another set of folders"
 msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
 
-#: camel/camel-session.c:350 camel/camel-session.c:400
+#: camel/camel-session.c:355 camel/camel-session.c:405
 #, c-format
 msgid "No provider available for protocol `%s'"
 msgstr "Ez dago hornitzailerik `%s' protokolorako"
 
-#: camel/camel-session.c:523
+#: camel/camel-session.c:528
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -9106,142 +9045,142 @@ msgstr "Huts egin du mezua deskodetzean."
 msgid "Failed to verify certificates."
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-store.c:212
+#: camel/camel-store.c:215
 msgid "Cannot get folder: Invalid operation on this store"
 msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:266
+#: camel/camel-store.c:269
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-tcp-stream-openssl.c:568
+#: camel/camel-tcp-stream-openssl.c:571
 #, fuzzy
 msgid "Unable to get issuer's certificate"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:570
+#: camel/camel-tcp-stream-openssl.c:573
 msgid "Unable to get Certificate Revocation List"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:572
+#: camel/camel-tcp-stream-openssl.c:575
 #, fuzzy
 msgid "Unable to decrypt certificate signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:574
+#: camel/camel-tcp-stream-openssl.c:577
 msgid "Unable to decrypt Certificate Revocation List signature"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:576
+#: camel/camel-tcp-stream-openssl.c:579
 msgid "Unable to decode issuer's public key"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:578
+#: camel/camel-tcp-stream-openssl.c:581
 #, fuzzy
 msgid "Certificate signature failure"
 msgstr "Sinadura-fitxategia:"
 
-#: camel/camel-tcp-stream-openssl.c:580
+#: camel/camel-tcp-stream-openssl.c:583
 msgid "Certificate Revocation List signature failure"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:582
+#: camel/camel-tcp-stream-openssl.c:585
 msgid "Certificate not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:584
+#: camel/camel-tcp-stream-openssl.c:587
 #, fuzzy
 msgid "Certificate has expired"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:586
+#: camel/camel-tcp-stream-openssl.c:589
 msgid "CRL not yet valid"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:588
+#: camel/camel-tcp-stream-openssl.c:591
 msgid "CRL has expired"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:593
+#: camel/camel-tcp-stream-openssl.c:596
 #, fuzzy
 msgid "Error in CRL"
 msgstr "Errorea %s kargatzean"
 
-#: camel/camel-tcp-stream-openssl.c:595
+#: camel/camel-tcp-stream-openssl.c:598
 #, fuzzy
 msgid "Out of memory"
 msgstr "Bulegotik kanpo"
 
-#: camel/camel-tcp-stream-openssl.c:597
+#: camel/camel-tcp-stream-openssl.c:600
 msgid "Zero-depth self-signed certificate"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:599
+#: camel/camel-tcp-stream-openssl.c:602
 msgid "Self-signed certificate in chain"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:601
+#: camel/camel-tcp-stream-openssl.c:604
 msgid "Unable to get issuer's certificate locally"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:603
+#: camel/camel-tcp-stream-openssl.c:606
 #, fuzzy
 msgid "Unable to verify leaf signature"
 msgstr "Huts egin du ziurtagiriak egiaztatzean."
 
-#: camel/camel-tcp-stream-openssl.c:605
+#: camel/camel-tcp-stream-openssl.c:608
 msgid "Certificate chain too long"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:607
+#: camel/camel-tcp-stream-openssl.c:610
 #, fuzzy
 msgid "Certificate Revoked"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:609
+#: camel/camel-tcp-stream-openssl.c:612
 msgid "Invalid Certificate Authority (CA)"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:611
+#: camel/camel-tcp-stream-openssl.c:614
 msgid "Path length exceeded"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:613
+#: camel/camel-tcp-stream-openssl.c:616
 #, fuzzy
 msgid "Invalid purpose"
 msgstr "Argumentu baliogabea"
 
-#: camel/camel-tcp-stream-openssl.c:615
+#: camel/camel-tcp-stream-openssl.c:618
 #, fuzzy
 msgid "Certificate untrusted"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:617
+#: camel/camel-tcp-stream-openssl.c:620
 #, fuzzy
 msgid "Certificate rejected"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-openssl.c:620
+#: camel/camel-tcp-stream-openssl.c:623
 msgid "Subject/Issuer mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:622
+#: camel/camel-tcp-stream-openssl.c:625
 msgid "AKID/SKID mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:624
+#: camel/camel-tcp-stream-openssl.c:627
 msgid "AKID/Issuer serial mismatch"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:626
+#: camel/camel-tcp-stream-openssl.c:629
 msgid "Key usage does not support certificate signing"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:629
+#: camel/camel-tcp-stream-openssl.c:632
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:699 camel/camel-tcp-stream-ssl.c:823
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9254,15 +9193,15 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:705 camel/camel-tcp-stream-ssl.c:829
 msgid "BAD"
 msgstr "TXARRA"
 
-#: camel/camel-tcp-stream-openssl.c:704
+#: camel/camel-tcp-stream-openssl.c:707
 #, fuzzy, c-format
 msgid ""
 "Bad certificate from %s:\n"
@@ -9280,7 +9219,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:833
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9295,28 +9234,28 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:877
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:929
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:947
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Ziurtagiri-IDa:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:964
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9328,17 +9267,17 @@ msgstr "_Ziurtagiri-IDa:"
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
 
-#: camel/camel-vee-folder.c:611
+#: camel/camel-vee-folder.c:618
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Errorea %s abiaraztean"
 
-#: camel/camel-vee-folder.c:649
+#: camel/camel-vee-folder.c:656
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:812 camel/camel-vee-folder.c:818
+#: camel/camel-vee-folder.c:819 camel/camel-vee-folder.c:825
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
@@ -9367,12 +9306,12 @@ msgstr ""
 #: camel/providers/imap/camel-imap-command.c:221
 #: camel/providers/imap/camel-imap-command.c:260
 #: camel/providers/imap/camel-imap-command.c:450
-#: camel/providers/imap/camel-imap-store.c:2806
+#: camel/providers/imap/camel-imap-store.c:2644
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:305
-#: camel/providers/imap/camel-imap-store.c:2809
+#: camel/providers/imap/camel-imap-store.c:2647
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
@@ -9409,38 +9348,38 @@ msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:223
+#: camel/providers/imap/camel-imap-folder.c:222
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:242
+#: camel/providers/imap/camel-imap-folder.c:241
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: camel/providers/imap/camel-imap-folder.c:308
+#: camel/providers/imap/camel-imap-folder.c:307
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:550
+#: camel/providers/imap/camel-imap-folder.c:549
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1886
+#: camel/providers/imap/camel-imap-folder.c:1883
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-maildir-folder.c:224
-#: camel/providers/local/camel-maildir-folder.c:233
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
-#: camel/providers/local/camel-mh-folder.c:210
-#: camel/providers/local/camel-mh-folder.c:219
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-maildir-folder.c:225
+#: camel/providers/local/camel-maildir-folder.c:234
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
+#: camel/providers/local/camel-mh-folder.c:211
+#: camel/providers/local/camel-mh-folder.c:220
 #, c-format
 msgid ""
 "Cannot get message: %s\n"
@@ -9449,24 +9388,24 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1923
-#: camel/providers/local/camel-maildir-folder.c:211
-#: camel/providers/local/camel-mbox-folder.c:422
-#: camel/providers/local/camel-mh-folder.c:200
+#: camel/providers/imap/camel-imap-folder.c:1920
+#: camel/providers/local/camel-maildir-folder.c:212
+#: camel/providers/local/camel-mbox-folder.c:351
+#: camel/providers/local/camel-mh-folder.c:201
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
-#: camel/providers/imap/camel-imap-folder.c:1946
-#: camel/providers/imap/camel-imap-folder.c:2542
+#: camel/providers/imap/camel-imap-folder.c:1943
+#: camel/providers/imap/camel-imap-folder.c:2539
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri "
 
-#: camel/providers/imap/camel-imap-folder.c:2206
-#: camel/providers/imap/camel-imap-folder.c:2276
+#: camel/providers/imap/camel-imap-folder.c:2203
+#: camel/providers/imap/camel-imap-folder.c:2273
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2580
+#: camel/providers/imap/camel-imap-folder.c:2577
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -9516,108 +9455,92 @@ msgstr "Izena"
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
 
-#: camel/providers/imap/camel-imap-provider.c:59
-#, fuzzy
-msgid "Automatically synchronize remote mail locally"
-msgstr "_Automatikoki begiratu mezu berririk"
-
-#: camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap/camel-imap-provider.c:63
 msgid "IMAP"
 msgstr "IMAP"
 
-#: camel/providers/imap/camel-imap-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:65
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
-#: camel/providers/imap/camel-imap-provider.c:82
-#: camel/providers/imapp/camel-imapp-provider.c:65
-#: camel/providers/nntp/camel-nntp-store.c:265
+#: camel/providers/imap/camel-imap-provider.c:80
+#: camel/providers/nntp/camel-nntp-store.c:267
 #: camel/providers/pop3/camel-pop3-provider.c:71 mail/mail-config.glade.h:83
 msgid "Password"
 msgstr "Pasahitza"
 
-#: camel/providers/imap/camel-imap-provider.c:84
-#: camel/providers/imapp/camel-imapp-provider.c:67
+#: camel/providers/imap/camel-imap-provider.c:82
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr ""
 "Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/imap/camel-imap-store.c:459
+#: camel/providers/imap/camel-imap-store.c:457
 #, fuzzy, c-format
 msgid "IMAP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/imap/camel-imap-store.c:461
+#: camel/providers/imap/camel-imap-store.c:459
 #, fuzzy, c-format
 msgid "IMAP service for %s on %s"
 msgstr "%s zerbitzua %s(e)rako %s(e)n"
 
-#: camel/providers/imap/camel-imap-store.c:589
-#: camel/providers/imap/camel-imap-store.c:821
-#: camel/providers/imapp/camel-imapp-store.c:233
-#: camel/providers/nntp/camel-nntp-store.c:128
-#: camel/providers/nntp/camel-nntp-store.c:146
+#: camel/providers/imap/camel-imap-store.c:587
+#: camel/providers/nntp/camel-nntp-store.c:130
+#: camel/providers/nntp/camel-nntp-store.c:148
 #: camel/providers/pop3/camel-pop3-store.c:184
 msgid "Connection cancelled"
 msgstr "Konexioa etenda"
 
-#: camel/providers/imap/camel-imap-store.c:592
-#: camel/providers/imapp/camel-imapp-store.c:236
-#: camel/providers/nntp/camel-nntp-store.c:131
-#: camel/providers/smtp/camel-smtp-transport.c:275
+#: camel/providers/imap/camel-imap-store.c:590
+#: camel/providers/nntp/camel-nntp-store.c:133
+#: camel/providers/smtp/camel-smtp-transport.c:276
 #, 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:655
-#: camel/providers/imap/camel-imap-store.c:686
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/imap/camel-imap-store.c:656
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:220
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Eragiketa ez da onartzen"
 
-#: camel/providers/imap/camel-imap-store.c:687
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:261
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Autentifikazioak huts egin du."
 
-#: camel/providers/imap/camel-imap-store.c:824
-#, 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:1237
+#: camel/providers/imap/camel-imap-store.c:1075
 #, 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:1247
-#: camel/providers/smtp/camel-smtp-transport.c:485
+#: camel/providers/imap/camel-imap-store.c:1085
+#: 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:1270
-#: camel/providers/imapp/camel-imapp-store.c:349
+#: camel/providers/imap/camel-imap-store.c:1108
 #, 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:1284
+#: camel/providers/imap/camel-imap-store.c:1122
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1151
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9628,70 +9551,42 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1660
-#: camel/providers/imap/camel-imap-store.c:1802
+#: camel/providers/imap/camel-imap-store.c:1498
+#: camel/providers/imap/camel-imap-store.c:1640
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:2003
+#: camel/providers/imap/camel-imap-store.c:1841
 #, fuzzy, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it containes the character \"%c\""
 msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 
-#: camel/providers/imap/camel-imap-store.c:2015
+#: camel/providers/imap/camel-imap-store.c:1853
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2051
+#: camel/providers/imap/camel-imap-store.c:1889
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
-#: camel/providers/imapp/camel-imapp-provider.c:39
-#: camel/providers/pop3/camel-pop3-provider.c:38
-msgid "Message storage"
-msgstr "Mezu-biltegiratzea"
-
-#: camel/providers/imapp/camel-imapp-provider.c:47
-#, fuzzy
-msgid "IMAP+"
-msgstr "IMAP"
-
-#: camel/providers/imapp/camel-imapp-provider.c:49
-msgid ""
-"Experimental IMAP 4(.1) client\n"
-"This is untested and unsupported code, you want to use plain imap instead.\n"
-"\n"
-" !!! DO NOT USE THIS FOR PRODUCTION EMAIL  !!!\n"
-msgstr ""
-
-#: camel/providers/imapp/camel-imapp-store.c:333
-#, fuzzy, c-format
-msgid "Could not connect to POP server on %s"
-msgstr "Ezin izan da POP zerbitzariarekin konektatu %s(e)n."
-
-#: camel/providers/local/camel-local-folder.c:179
-#, fuzzy
-msgid "Index message body data"
-msgstr "Bidali mezua kontaktuari"
-
 #. $HOME relative path + protocol string
-#: camel/providers/local/camel-local-folder.c:379
+#: camel/providers/local/camel-local-folder.c:354
 #, fuzzy, c-format
 msgid "~%s (%s)"
 msgstr "%s (%d)"
 
 #. /var/spool/mail relative path + protocol
-#: camel/providers/local/camel-local-folder.c:383
-#: camel/providers/local/camel-local-folder.c:386
+#: camel/providers/local/camel-local-folder.c:358
+#: camel/providers/local/camel-local-folder.c:361
 #, fuzzy, c-format
 msgid "mailbox:%s (%s)"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
 #. a full path + protocol
-#: camel/providers/local/camel-local-folder.c:390
+#: camel/providers/local/camel-local-folder.c:365
 #, fuzzy, c-format
 msgid "%s (%s)"
 msgstr "%s (%d)"
@@ -9749,54 +9644,50 @@ msgid ""
 msgstr ""
 "Posta lokala irakurri eta gordetzeko mbox spool fitxategi estandarretan."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:227
-#: camel/providers/local/camel-mbox-store.c:305
+#: camel/providers/local/camel-local-store.c:139
+#: camel/providers/local/camel-local-store.c:228
 #: camel/providers/local/camel-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:146
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s gordetze-erroa ez da direktorio erregularra"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:170
-#: camel/providers/local/camel-local-store.c:238
+#: camel/providers/local/camel-local-store.c:155
+#: camel/providers/local/camel-local-store.c:171
+#: camel/providers/local/camel-local-store.c:239
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:187
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: camel/providers/local/camel-local-store.c:198
+#: camel/providers/local/camel-local-store.c:199
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:307 mail/mail-local.c:949
+#: camel/providers/local/camel-local-store.c:308 mail/mail-local.c:909
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-local-store.c:364
-#: camel/providers/local/camel-mbox-store.c:474
+#: camel/providers/local/camel-local-store.c:365
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-local-store.c:387
-#: camel/providers/local/camel-mbox-store.c:258
+#: camel/providers/local/camel-local-store.c:388
 #, c-format
 msgid "Could not delete folder summary file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'laburpen-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-store.c:397
-#: camel/providers/local/camel-mbox-store.c:270
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not delete folder index file `%s': %s"
 msgstr "Ezin izan da karpetaren `%s'indize-fitxategia ezabatu: %s"
@@ -9810,17 +9701,17 @@ 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
+#: camel/providers/local/camel-maildir-folder.c:184
 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:187
 #, 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:234
-#: camel/providers/local/camel-mh-folder.c:220
+#: camel/providers/local/camel-maildir-folder.c:235
+#: camel/providers/local/camel-mh-folder.c:221
 msgid "Invalid message contents"
 msgstr "Mezu-eduki baliogabea"
 
@@ -9836,7 +9727,7 @@ msgstr ""
 "%s"
 
 #: camel/providers/local/camel-maildir-store.c:110
-#: camel/providers/local/camel-mbox-store.c:157
+#: camel/providers/local/camel-mbox-store.c:101
 #: camel/providers/local/camel-mh-store.c:209
 #: camel/providers/local/camel-spool-store.c:167
 #, c-format
@@ -9901,29 +9792,29 @@ msgstr "Mezu berrien bila eskaneatzen"
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
-#: camel/providers/local/camel-mbox-folder.c:230
-#: camel/providers/local/camel-spool-folder.c:148
+#: camel/providers/local/camel-mbox-folder.c:159
+#: camel/providers/local/camel-spool-folder.c:149
 #, c-format
 msgid "Cannot create folder lock on %s: %s"
 msgstr "Ezin da karpeta-blokeoa sortu %s(e)n: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:289
+#: camel/providers/local/camel-mbox-folder.c:218
 #, c-format
 msgid "Cannot open mailbox: %s: %s\n"
 msgstr "Ezin da postontzia ireki: %s: %s\n"
 
-#: camel/providers/local/camel-mbox-folder.c:349
+#: camel/providers/local/camel-mbox-folder.c:278
 msgid "Mail append cancelled"
 msgstr "Posta eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mbox-folder.c:352
+#: camel/providers/local/camel-mbox-folder.c:281
 #, c-format
 msgid "Cannot append message to mbox file: %s: %s"
 msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
 
-#: camel/providers/local/camel-mbox-folder.c:440
-#: camel/providers/local/camel-mbox-folder.c:471
-#: camel/providers/local/camel-mbox-folder.c:479
+#: camel/providers/local/camel-mbox-folder.c:369
+#: camel/providers/local/camel-mbox-folder.c:400
+#: camel/providers/local/camel-mbox-folder.c:408
 #, c-format
 msgid ""
 "Cannot get message: %s from folder %s\n"
@@ -9932,15 +9823,15 @@ msgstr ""
 "Ezin da mezua hartu: %s %s karpetatik\n"
 "  %s"
 
-#: camel/providers/local/camel-mbox-folder.c:472
+#: camel/providers/local/camel-mbox-folder.c:401
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: camel/providers/local/camel-mbox-folder.c:480
+#: camel/providers/local/camel-mbox-folder.c:409
 msgid "Message construction failed: Corrupt mailbox?"
 msgstr "Mezu-eraikuntzak huts egin du: Postontzia hondatuta?"
 
-#: camel/providers/local/camel-mbox-store.c:149
+#: camel/providers/local/camel-mbox-store.c:94
 #, c-format
 msgid ""
 "Could not open file `%s':\n"
@@ -9949,16 +9840,7 @@ msgstr ""
 "Ezin izan da `%s' fitxategia ireki:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:166
-#, fuzzy, c-format
-msgid ""
-"Could not create directory `%s':\n"
-"%s"
-msgstr ""
-"Ezin izan da %s direktorioa sortu:\n"
-"%s"
-
-#: camel/providers/local/camel-mbox-store.c:178
+#: camel/providers/local/camel-mbox-store.c:110
 #, c-format
 msgid ""
 "Could not create file `%s':\n"
@@ -9967,15 +9849,14 @@ msgstr ""
 "Ezin izan da `%s' fitxategia sortu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:188
-#: camel/providers/local/camel-mbox-store.c:229
+#: camel/providers/local/camel-mbox-store.c:119
+#: camel/providers/local/camel-mbox-store.c:146
 #, c-format
 msgid "`%s' is not a regular file."
 msgstr "`%s' ez da fitxategi erregularra."
 
-#: camel/providers/local/camel-mbox-store.c:210
-#: camel/providers/local/camel-mbox-store.c:221
-#: camel/providers/local/camel-mbox-store.c:244
+#: camel/providers/local/camel-mbox-store.c:138
+#: camel/providers/local/camel-mbox-store.c:161
 #, c-format
 msgid ""
 "Could not delete folder `%s':\n"
@@ -9984,36 +9865,11 @@ msgstr ""
 "Ezin izan da `%s' karpeta ezabatu:\n"
 "%s"
 
-#: camel/providers/local/camel-mbox-store.c:236
+#: camel/providers/local/camel-mbox-store.c:153
 #, c-format
 msgid "Folder `%s' is not empty. Not deleted."
 msgstr "`%s' karpeta ez dago hutsik. Ez da ezabatu."
 
-#: camel/providers/local/camel-mbox-store.c:311
-#, fuzzy
-msgid "Cannot create a folder by this name."
-msgstr "Ezin da izen horretako karpetarik sortu"
-
-#: camel/providers/local/camel-mbox-store.c:324
-#, fuzzy, c-format
-msgid "Cannot create directory `%s': %s."
-msgstr "Ezin izan da %s direktorioa sortu: %s"
-
-#: camel/providers/local/camel-mbox-store.c:338
-#, fuzzy, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ezin da karpeta hartu: %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:408
-#, fuzzy, c-format
-msgid "Could not rename %s to %s: %s"
-msgstr "Ezin izan zaio karpeta-izena aldatu %s --> %s: %s"
-
-#: camel/providers/local/camel-mbox-store.c:427
-#, fuzzy
-msgid "The new folder name is illegal."
-msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
-
 #: camel/providers/local/camel-mbox-summary.c:343
 #, c-format
 msgid "Could not open folder: %s: %s"
@@ -10045,7 +9901,7 @@ msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:540
-#: camel/providers/local/camel-mbox-summary.c:704
+#: camel/providers/local/camel-mbox-summary.c:702
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
@@ -10062,38 +9918,38 @@ msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
 #: camel/providers/local/camel-mbox-summary.c:644
 #: camel/providers/local/camel-mbox-summary.c:652
-#: camel/providers/local/camel-mbox-summary.c:845
-#: camel/providers/local/camel-mbox-summary.c:853
+#: camel/providers/local/camel-mbox-summary.c:843
+#: camel/providers/local/camel-mbox-summary.c:851
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Sinkronizatu arren, laburpena eta karpeta ez datoz bat"
 
-#: camel/providers/local/camel-mbox-summary.c:779
+#: camel/providers/local/camel-mbox-summary.c:777
 #: camel/providers/local/camel-spool-summary.c:334
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:814
+#: camel/providers/local/camel-mbox-summary.c:812
 #, fuzzy, c-format
 msgid "Could not store folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:908
-#: camel/providers/local/camel-mbox-summary.c:934
+#: camel/providers/local/camel-mbox-summary.c:906
+#: camel/providers/local/camel-mbox-summary.c:932
 #, c-format
 msgid "Error writing to temp mailbox: %s"
 msgstr "Errorea aldi baterako postontzian idaztean: %s"
 
-#: camel/providers/local/camel-mbox-summary.c:925
+#: camel/providers/local/camel-mbox-summary.c:923
 #, c-format
 msgid "Writing to tmp mailbox failed: %s: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
 
-#: camel/providers/local/camel-mh-folder.c:174
+#: camel/providers/local/camel-mh-folder.c:175
 msgid "MH append message cancelled"
 msgstr "MH mezua eranstea bertan behera utzi da"
 
-#: camel/providers/local/camel-mh-folder.c:177
+#: camel/providers/local/camel-mh-folder.c:178
 #, c-format
 msgid "Cannot append message to mh folder: %s: %s"
 msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
@@ -10173,61 +10029,6 @@ msgstr ""
 "Ezin izan da %s spool-karpeta sinkronizatu: %s\n"
 "Karpeta hondatuta egon liteke, kopia `%s'(e)n gorde da"
 
-#: camel/providers/nntp/camel-nntp-auth.c:44
-#, c-format
-msgid "Please enter the NNTP password for %s@%s"
-msgstr "Idatzi %s@%s(r)en NNTP pasahitza"
-
-#: camel/providers/nntp/camel-nntp-auth.c:64
-msgid "Server rejected username"
-msgstr "Zerbitzariak erabiltzaile-izena ezetsi du"
-
-#: camel/providers/nntp/camel-nntp-auth.c:70
-msgid "Failed to send username to server"
-msgstr "Huts egin du erabiltzaile-izena zerbitzarira bidaltzean"
-
-#: camel/providers/nntp/camel-nntp-auth.c:79
-msgid "Server rejected username/password"
-msgstr "Zerbitzariak erabiltzaile-izena/pasahitza ezetsi du"
-
-#: camel/providers/nntp/camel-nntp-folder.c:114
-#, c-format
-msgid "Internal error: uid in invalid format: %s"
-msgstr "Barne-errorea: uid formatu baliogabean: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:155
-#: camel/providers/nntp/camel-nntp-folder.c:161
-#: camel/providers/pop3/camel-pop3-folder.c:433
-#: camel/providers/pop3/camel-pop3-folder.c:494
-#: camel/providers/pop3/camel-pop3-folder.c:501
-#: camel/providers/pop3/camel-pop3-folder.c:512
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ezin da %s mezua hartu: %s"
-
-#: camel/providers/nntp/camel-nntp-folder.c:159
-#: camel/providers/pop3/camel-pop3-folder.c:262
-#: camel/providers/pop3/camel-pop3-folder.c:430
-#: camel/providers/pop3/camel-pop3-folder.c:491
-#: camel/providers/pop3/camel-pop3-folder.c:509
-msgid "User cancelled"
-msgstr "Erabiltzaileak bertan behera utzi du"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:45
-msgid "Could not get group list from server."
-msgstr "Ezin izan da talde-zerrenda hartu zerbitzaritik."
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:98
-#: camel/providers/nntp/camel-nntp-grouplist.c:107
-#, c-format
-msgid "Unable to load grouplist file for %s: %s"
-msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia kargatu: %s"
-
-#: camel/providers/nntp/camel-nntp-grouplist.c:158
-#, c-format
-msgid "Unable to save grouplist file for %s: %s"
-msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia gorde: %s"
-
 #: camel/providers/nntp/camel-nntp-provider.c:41
 msgid "USENET news"
 msgstr "USENET berriak"
@@ -10237,22 +10038,22 @@ msgid "This is a provider for reading from and posting toUSENET newsgroups."
 msgstr ""
 "Hau USENET berri-taldeetako mezuak irakurri eta bidaltzeko hornitzailea da."
 
-#: camel/providers/nntp/camel-nntp-store.c:149
+#: camel/providers/nntp/camel-nntp-store.c:151
 #, fuzzy, c-format
 msgid "Could not read greeting from %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: camel/providers/nntp/camel-nntp-store.c:161
+#: camel/providers/nntp/camel-nntp-store.c:163
 #, c-format
 msgid "NNTP server %s returned error code %d: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-store.c:260
+#: camel/providers/nntp/camel-nntp-store.c:262
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET berriak %s bidez"
 
-#: camel/providers/nntp/camel-nntp-store.c:267
+#: camel/providers/nntp/camel-nntp-store.c:269
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -10260,37 +10061,37 @@ msgstr ""
 "Aukera honek NNTP zerbitzariarekin autentifikatuko du testu arrunteko "
 "pasahitzaren bidez."
 
-#: camel/providers/nntp/camel-nntp-summary.c:237
+#: camel/providers/nntp/camel-nntp-summary.c:234
 #, c-format
 msgid "No such folder: %s"
 msgstr "Karpeta ez dago: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:241
+#: camel/providers/nntp/camel-nntp-summary.c:238
 #, c-format
 msgid "Could not get group: %s"
 msgstr "Ezin izan da taldea hartu: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:347
+#: camel/providers/nntp/camel-nntp-summary.c:344
 #, c-format
 msgid "NNTP Command failed: %s"
 msgstr "NNTP komandoak huts egin du: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:407
-#: camel/providers/nntp/camel-nntp-summary.c:508
+#: camel/providers/nntp/camel-nntp-summary.c:404
+#: camel/providers/nntp/camel-nntp-summary.c:505
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mezu berrien bila eskaneatzen"
 
-#: camel/providers/nntp/camel-nntp-summary.c:523
+#: camel/providers/nntp/camel-nntp-summary.c:520
 #, c-format
 msgid "Unknown server response: %s"
 msgstr "Zerbitzari-erantzun ezezaguna: %s"
 
-#: camel/providers/nntp/camel-nntp-summary.c:569
+#: camel/providers/nntp/camel-nntp-summary.c:566
 msgid "Use cancel"
 msgstr "Utzi bertan behera"
 
-#: camel/providers/nntp/camel-nntp-summary.c:571
+#: camel/providers/nntp/camel-nntp-summary.c:568
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
@@ -10299,6 +10100,13 @@ msgstr "Eragiketak huts egin du: %s"
 msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
+#: camel/providers/pop3/camel-pop3-folder.c:262
+#: camel/providers/pop3/camel-pop3-folder.c:429
+#: camel/providers/pop3/camel-pop3-folder.c:490
+#: camel/providers/pop3/camel-pop3-folder.c:508
+msgid "User cancelled"
+msgstr "Erabiltzaileak bertan behera utzi du"
+
 #: camel/providers/pop3/camel-pop3-folder.c:265
 #, c-format
 msgid "Cannot get POP summary: %s"
@@ -10308,22 +10116,34 @@ msgstr "Ezin da POP laburpena hartu: %s"
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:404
+#: camel/providers/pop3/camel-pop3-folder.c:403
 #, c-format
 msgid "No message with uid %s"
 msgstr "Ez dago %s uid-a duen mezurik"
 
 #. Sigh, most of the crap in this function is so that the cancel button
 #. returns the proper exception code.  Sigh.
-#: camel/providers/pop3/camel-pop3-folder.c:411
+#: camel/providers/pop3/camel-pop3-folder.c:410
 #, c-format
 msgid "Retrieving POP message %d"
 msgstr "%d POP mezua berreskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501
+#: camel/providers/pop3/camel-pop3-folder.c:432
+#: camel/providers/pop3/camel-pop3-folder.c:493
+#: camel/providers/pop3/camel-pop3-folder.c:500
+#: camel/providers/pop3/camel-pop3-folder.c:511
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ezin da %s mezua hartu: %s"
+
+#: camel/providers/pop3/camel-pop3-folder.c:500
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
+#: camel/providers/pop3/camel-pop3-provider.c:38
+msgid "Message storage"
+msgstr "Mezu-biltegiratzea"
+
 #: camel/providers/pop3/camel-pop3-provider.c:40
 msgid "Leave messages on server"
 msgstr "Utzi mezuak zerbitzarian"
@@ -10490,147 +10310,147 @@ msgstr "SMTP"
 msgid "For delivering mail by connecting to a remote mailhub using SMTP.\n"
 msgstr "SMTP erabiliz urruneko mailhub batekin konektatuta posta banatzeko.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:174
+#: camel/providers/smtp/camel-smtp-transport.c:175
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaxi-errorea; komandoa ezezaguna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:176
+#: camel/providers/smtp/camel-smtp-transport.c:177
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaxi-errorea parametroetan edo argumentuetan"
 
-#: camel/providers/smtp/camel-smtp-transport.c:178
+#: camel/providers/smtp/camel-smtp-transport.c:179
 msgid "Command not implemented"
 msgstr "Komandoa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:180
+#: camel/providers/smtp/camel-smtp-transport.c:181
 msgid "Command parameter not implemented"
 msgstr "Komando-parametroa inplementatu gabe"
 
-#: camel/providers/smtp/camel-smtp-transport.c:182
+#: camel/providers/smtp/camel-smtp-transport.c:183
 msgid "System status, or system help reply"
 msgstr "Sistema-egoera, edo sistema-laguntzaren erantzuna"
 
-#: camel/providers/smtp/camel-smtp-transport.c:184
+#: camel/providers/smtp/camel-smtp-transport.c:185
 msgid "Help message"
 msgstr "Laguntza-mezua"
 
-#: camel/providers/smtp/camel-smtp-transport.c:186
+#: camel/providers/smtp/camel-smtp-transport.c:187
 msgid "Service ready"
 msgstr "Zerbitzua prest"
 
-#: camel/providers/smtp/camel-smtp-transport.c:188
+#: camel/providers/smtp/camel-smtp-transport.c:189
 msgid "Service closing transmission channel"
 msgstr "Zerbitzua transmisio-kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:190
+#: camel/providers/smtp/camel-smtp-transport.c:191
 msgid "Service not available, closing transmission channel"
 msgstr "Zerbitzua ez dago erabilgarri; transmisio kanala ixten"
 
-#: camel/providers/smtp/camel-smtp-transport.c:192
+#: camel/providers/smtp/camel-smtp-transport.c:193
 msgid "Requested mail action okay, completed"
 msgstr "Eskatutako posta-ekintza ondo; eginda"
 
-#: camel/providers/smtp/camel-smtp-transport.c:194
+#: camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; will forward to <forward-path>"
 msgstr "Erabiltzailea ez da lokala;<forward-path>-era birbidaliko da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:196
+#: camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested mail action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako posta-ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:198
+#: camel/providers/smtp/camel-smtp-transport.c:199
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako ekintza: postontzia ez dago erabilgarri"
 
-#: camel/providers/smtp/camel-smtp-transport.c:200
+#: camel/providers/smtp/camel-smtp-transport.c:201
 msgid "Requested action aborted: error in processing"
 msgstr "Eskatutako ekintza abortatu egin da: errorea prozesatzean"
 
-#: camel/providers/smtp/camel-smtp-transport.c:202
+#: camel/providers/smtp/camel-smtp-transport.c:203
 msgid "User not local; please try <forward-path>"
 msgstr "Erabiltzailea ez da lokala; proba egin <forward-path>-ekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:204
+#: camel/providers/smtp/camel-smtp-transport.c:205
 msgid "Requested action not taken: insufficient system storage"
 msgstr "Ez da egin eskatutako ekintza: sistema-biltegia ez da nahikoa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:206
+#: camel/providers/smtp/camel-smtp-transport.c:207
 msgid "Requested mail action aborted: exceeded storage allocation"
 msgstr ""
 "Eskatutako posta-ekintza abortatu egin da: biltegi-esleipena gaindituta"
 
-#: camel/providers/smtp/camel-smtp-transport.c:208
+#: camel/providers/smtp/camel-smtp-transport.c:209
 msgid "Requested action not taken: mailbox name not allowed"
 msgstr "Ez da egin eskatutako ekintza: postontzi-izena ez da onartu"
 
-#: camel/providers/smtp/camel-smtp-transport.c:210
+#: camel/providers/smtp/camel-smtp-transport.c:211
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Hasi posta-sarrera; bukatu <CRLF>.<CRLF>-rekin"
 
-#: camel/providers/smtp/camel-smtp-transport.c:212
+#: camel/providers/smtp/camel-smtp-transport.c:213
 msgid "Transaction failed"
 msgstr "Transakzioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:216
+#: camel/providers/smtp/camel-smtp-transport.c:217
 msgid "A password transition is needed"
 msgstr "Pasahitz-trantsizioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:218
+#: camel/providers/smtp/camel-smtp-transport.c:219
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikazio-mekanismoa ahulegia da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:220
+#: camel/providers/smtp/camel-smtp-transport.c:221
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Eskatutako autentifikazio-mekanismoak beharrezkoa du enkriptatzea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:222
+#: camel/providers/smtp/camel-smtp-transport.c:223
 msgid "Temporary authentication failure"
 msgstr "Aldi baterako autentifikazioak huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:224
+#: camel/providers/smtp/camel-smtp-transport.c:225
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: camel/providers/smtp/camel-smtp-transport.c:298
+#: camel/providers/smtp/camel-smtp-transport.c:299
 #, fuzzy
 msgid "Welcome response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:342
-#: camel/providers/smtp/camel-smtp-transport.c:381
+#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:382
 #, fuzzy, c-format
 msgid "Failed to connect to SMTP server %s in secure mode: %s"
 msgstr ""
 "Ezin da POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:343
+#: camel/providers/smtp/camel-smtp-transport.c:344
 #, fuzzy
 msgid "server does not appear to support SSL"
 msgstr "Ez dirudi mezua behar bezala osatuta dagoenik"
 
-#: camel/providers/smtp/camel-smtp-transport.c:357
+#: camel/providers/smtp/camel-smtp-transport.c:358
 #, fuzzy, c-format
 msgid "STARTTLS request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:372
+#: camel/providers/smtp/camel-smtp-transport.c:373
 #, fuzzy
 msgid "STARTTLS response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:475
+#: camel/providers/smtp/camel-smtp-transport.c:476
 #, fuzzy, c-format
 msgid "SMTP server %s does not support requested authentication type %s."
 msgstr ""
 "%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:513
+#: camel/providers/smtp/camel-smtp-transport.c:514
 #, c-format
 msgid "%sPlease enter the SMTP password for %s@%s"
 msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
 
-#: camel/providers/smtp/camel-smtp-transport.c:532
+#: camel/providers/smtp/camel-smtp-transport.c:533
 #, c-format
 msgid ""
 "Unable to authenticate to SMTP server.\n"
@@ -10641,88 +10461,88 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:665
+#: camel/providers/smtp/camel-smtp-transport.c:666
 #, c-format
 msgid "SMTP server %s"
 msgstr "%s SMTP zerbitzaria"
 
-#: camel/providers/smtp/camel-smtp-transport.c:667
+#: camel/providers/smtp/camel-smtp-transport.c:668
 #, c-format
 msgid "SMTP mail delivery via %s"
 msgstr "SMTP posta-banaketa %s bidez"
 
-#: camel/providers/smtp/camel-smtp-transport.c:685
+#: camel/providers/smtp/camel-smtp-transport.c:686
 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:690 mail/mail-ops.c:631
+#: camel/providers/smtp/camel-smtp-transport.c:691 mail/mail-ops.c:613
 msgid "Sending message"
 msgstr "Mezua bidaltzen"
 
-#: camel/providers/smtp/camel-smtp-transport.c:705
+#: camel/providers/smtp/camel-smtp-transport.c:706
 msgid "Cannot send message: no recipients defined."
 msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
 
-#: camel/providers/smtp/camel-smtp-transport.c:714
+#: camel/providers/smtp/camel-smtp-transport.c:715
 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:879
+#: camel/providers/smtp/camel-smtp-transport.c:880
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: camel/providers/smtp/camel-smtp-transport.c:928
+#: camel/providers/smtp/camel-smtp-transport.c:927
 #, fuzzy, c-format
 msgid "HELO request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:950
+#: camel/providers/smtp/camel-smtp-transport.c:949
 #, fuzzy
 msgid "HELO response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1016
+#: camel/providers/smtp/camel-smtp-transport.c:1015
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1022
+#: camel/providers/smtp/camel-smtp-transport.c:1021
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1039
-#: camel/providers/smtp/camel-smtp-transport.c:1051
+#: camel/providers/smtp/camel-smtp-transport.c:1038
+#: camel/providers/smtp/camel-smtp-transport.c:1050
 #, c-format
 msgid "AUTH request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1060
+#: camel/providers/smtp/camel-smtp-transport.c:1059
 msgid "AUTH request failed."
 msgstr "AUTH eskaerak huts egin du."
 
-#: camel/providers/smtp/camel-smtp-transport.c:1121
+#: camel/providers/smtp/camel-smtp-transport.c:1120
 msgid "Bad authentication response from server.\n"
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1146
+#: camel/providers/smtp/camel-smtp-transport.c:1145
 #, c-format
 msgid "MAIL FROM request timed out: %s: mail not sent"
 msgstr "MAIL FROM eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1166
+#: camel/providers/smtp/camel-smtp-transport.c:1165
 msgid "MAIL FROM response error"
 msgstr "MAIL FROM erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1190
+#: camel/providers/smtp/camel-smtp-transport.c:1189
 #, c-format
 msgid "RCPT TO request timed out: %s: mail not sent"
 msgstr "RCTP TO eskaera denboraz kanpo: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1212
+#: camel/providers/smtp/camel-smtp-transport.c:1211
 #, c-format
 msgid "RCPT TO <%s> failed"
 msgstr "RCPT TO <%s> huts egin du"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1251
+#: camel/providers/smtp/camel-smtp-transport.c:1250
 #, c-format
 msgid "DATA request timed out: %s: mail not sent"
 msgstr "DATA eskaera denboraz kanpo: %s: posta ez da bidali"
@@ -10730,67 +10550,68 @@ 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:1271
+#: camel/providers/smtp/camel-smtp-transport.c:1270
 msgid "DATA response error"
 msgstr "DATA erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1312
-#: camel/providers/smtp/camel-smtp-transport.c:1335
+#: camel/providers/smtp/camel-smtp-transport.c:1311
+#: camel/providers/smtp/camel-smtp-transport.c:1334
 #, c-format
 msgid "DATA send timed out: message termination: %s: mail not sent"
 msgstr ""
 "DATA bidalketa denboraz kanpo: mezuaren amaiera: %s: posta ez da bidali"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1355
+#: camel/providers/smtp/camel-smtp-transport.c:1354
 msgid "DATA termination response error"
 msgstr "DATA amaitze-erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1378
+#: camel/providers/smtp/camel-smtp-transport.c:1377
 #, c-format
 msgid "RSET request timed out: %s"
 msgstr "RSET eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1398
+#: camel/providers/smtp/camel-smtp-transport.c:1397
 msgid "RSET response error"
 msgstr "RSET erantzunaren errorea"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1421
+#: camel/providers/smtp/camel-smtp-transport.c:1420
 #, fuzzy, c-format
 msgid "QUIT request timed out: %s"
 msgstr "AUTH eskaera denboraz kanpo: %s"
 
-#: camel/providers/smtp/camel-smtp-transport.c:1441
+#: camel/providers/smtp/camel-smtp-transport.c:1440
 msgid "QUIT response error"
 msgstr "QUIT erantzunaren errorea"
 
-#: composer/e-msg-composer-attachment-bar.c:103
+#: composer/e-msg-composer-attachment-bar.c:102
 #, fuzzy, c-format
 msgid "%.0fK"
 msgstr "%.1fK"
 
-#: composer/e-msg-composer-attachment-bar.c:106
+#: composer/e-msg-composer-attachment-bar.c:105
 #, fuzzy, c-format
 msgid "%.0fM"
 msgstr "%.1fM"
 
-#: composer/e-msg-composer-attachment-bar.c:109
+#: composer/e-msg-composer-attachment-bar.c:108
 #, fuzzy, c-format
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:300
+#. This is a filename. Translators take note.
+#: composer/e-msg-composer-attachment-bar.c:370 mail/mail-display.c:227
 msgid "attachment"
 msgstr "eranskina"
 
-#: composer/e-msg-composer-attachment-bar.c:445
+#: composer/e-msg-composer-attachment-bar.c:508
 msgid "Remove selected items from the attachment list"
 msgstr "Kendu hautatutako elementuak eranskin-zerrendatik"
 
-#: composer/e-msg-composer-attachment-bar.c:475
+#: composer/e-msg-composer-attachment-bar.c:538
 msgid "Add attachment..."
 msgstr "Gehitu eranskina..."
 
-#: composer/e-msg-composer-attachment-bar.c:476
+#: composer/e-msg-composer-attachment-bar.c:539
 msgid "Attach a file to the message"
 msgstr "Erantsi fitxategi bat mezuari"
 
@@ -10823,12 +10644,92 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
-#: composer/e-msg-composer.c:562
+#: composer/e-msg-composer-hdrs.c:290
+msgid "Hey you, dunce. You need an account to send mail doncha know."
+msgstr ""
+
+#: composer/e-msg-composer-hdrs.c:483
+msgid "Click here for the address book"
+msgstr "Egin klik hemen helbide-liburura joateko"
+
+#.
+#. * Reply-To:
+#. *
+#. * Create this before we call create_from_optionmenu,
+#. * because that causes from_changed to be called, which
+#. * expects the reply_to fields to be initialized.
+#.
+#: composer/e-msg-composer-hdrs.c:514
+msgid "Reply-To:"
+msgstr "Erantzun honi:"
+
+#.
+#. * From
+#.
+#: composer/e-msg-composer-hdrs.c:520
+msgid "From:"
+msgstr "Nork:"
+
+#.
+#. * Subject
+#.
+#: composer/e-msg-composer-hdrs.c:526
+msgid "Subject:"
+msgstr "Gaia:"
+
+#: composer/e-msg-composer-hdrs.c:535
+msgid "To:"
+msgstr "Nori: "
+
+#: composer/e-msg-composer-hdrs.c:536
+msgid "Enter the recipients of the message"
+msgstr "Idatzi mezuaren hartzaileak"
+
+#: composer/e-msg-composer-hdrs.c:539
+msgid "Cc:"
+msgstr "Cc:"
+
+#: composer/e-msg-composer-hdrs.c:540
+msgid "Enter the addresses that will receive a carbon copy of the message"
+msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
+
+#: composer/e-msg-composer-hdrs.c:543
+msgid "Bcc:"
+msgstr "Bcc:"
+
+#: composer/e-msg-composer-hdrs.c:544
+msgid ""
+"Enter the addresses that will receive a carbon copy of the message without "
+"appearing in the recipient list of the message."
+msgstr ""
+"Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
+"helbideak."
+
+#.
+#. * Post-To
+#.
+#: composer/e-msg-composer-hdrs.c:551
+#, fuzzy
+msgid "Post To:"
+msgstr "Porto"
+
+#: composer/e-msg-composer-hdrs.c:553
+#, fuzzy
+msgid "Posting destination"
+msgstr "Azalpenik ez"
+
+#: composer/e-msg-composer-select-file.c:102
+#: composer/e-msg-composer-select-file.c:119
+#, fuzzy
+msgid "Attach file(s)"
+msgstr "Erantsi fitxategi bat"
+
+#: composer/e-msg-composer.c:535
 #, fuzzy
 msgid "Could not create a PGP signature context"
 msgstr "Ezin izan da PGP sinadura-testuingurua sortu."
 
-#: composer/e-msg-composer.c:841
+#: composer/e-msg-composer.c:814
 #, c-format
 msgid ""
 "Error while reading file %s:\n"
@@ -10837,30 +10738,30 @@ msgstr ""
 "Errorea %s fitxategia irakurtzean:\n"
 "%s"
 
-#: composer/e-msg-composer.c:1206
+#: composer/e-msg-composer.c:1177
 msgid "File exists, overwrite?"
 msgstr "Fitxategia badago; gainidatzi?"
 
-#: composer/e-msg-composer.c:1217 composer/e-msg-composer.c:1233
+#: composer/e-msg-composer.c:1195
 #, c-format
 msgid "Error saving file: %s"
 msgstr "Errorea fitxategia gordetzean: %s"
 
-#: composer/e-msg-composer.c:1256
+#: composer/e-msg-composer.c:1218
 #, c-format
 msgid "Error loading file: %s"
 msgstr "Errorea fitxategia kargatzean: %s"
 
-#: composer/e-msg-composer.c:1294
+#: composer/e-msg-composer.c:1256
 #, c-format
 msgid "Error accessing file: %s"
 msgstr "Errorea fitxategia atzitzean: %s"
 
-#: composer/e-msg-composer.c:1302
+#: composer/e-msg-composer.c:1264
 msgid "Unable to retrieve message from editor"
 msgstr "Ezin da mezua editoretik berreskuratu"
 
-#: composer/e-msg-composer.c:1309
+#: composer/e-msg-composer.c:1271
 #, c-format
 msgid ""
 "Unable to seek on file: %s\n"
@@ -10869,7 +10770,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1316
+#: composer/e-msg-composer.c:1278
 #, c-format
 msgid ""
 "Unable to truncate file: %s\n"
@@ -10878,7 +10779,7 @@ msgstr ""
 "Ezin da fitxategia trunkatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1325
+#: composer/e-msg-composer.c:1287
 #, fuzzy, c-format
 msgid ""
 "Unable to copy file descriptor: %s\n"
@@ -10887,7 +10788,7 @@ msgstr ""
 "Ezin da fitxategian bilatu: %s\n"
 "%s"
 
-#: composer/e-msg-composer.c:1334
+#: composer/e-msg-composer.c:1296
 #, c-format
 msgid ""
 "Error autosaving message: %s\n"
@@ -10896,7 +10797,7 @@ msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 " %s"
 
-#: composer/e-msg-composer.c:1431
+#: composer/e-msg-composer.c:1390
 msgid ""
 "Ximian Evolution has found unsaved files from a previous session.\n"
 "Would you like to try to recover them?"
@@ -10904,7 +10805,7 @@ msgstr ""
 "Aurreko saioko fitxategi gorde gabeak aurkitu ditu Ximian Evolution-ek.\n"
 "Berreskuratzen saiatu nahi duzu?"
 
-#: composer/e-msg-composer.c:1594
+#: composer/e-msg-composer.c:1552
 #, fuzzy, c-format
 msgid ""
 "The message \"%s\" has not been sent.\n"
@@ -10915,29 +10816,29 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: composer/e-msg-composer.c:1603
+#: composer/e-msg-composer.c:1561
 msgid "Warning: Modified Message"
 msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/e-msg-composer.c:1635
+#: composer/e-msg-composer.c:1593
 msgid "Open file"
 msgstr "Ireki fitxategia"
 
-#: composer/e-msg-composer.c:2054
+#: composer/e-msg-composer.c:2017
 #, fuzzy
 msgid "Signature:"
 msgstr "Gorde sinadura"
 
-#: composer/e-msg-composer.c:2094 mail/mail-account-gui.c:1261
+#: composer/e-msg-composer.c:2057 mail/mail-account-gui.c:1261
 msgid "Autogenerated"
 msgstr ""
 
-#: composer/e-msg-composer.c:2274 composer/e-msg-composer.c:2970
-#: composer/e-msg-composer.c:2971
+#: composer/e-msg-composer.c:2233 composer/e-msg-composer.c:2902
+#: composer/e-msg-composer.c:2903
 msgid "Compose a message"
 msgstr "Prestatu mezua"
 
-#: composer/e-msg-composer.c:3002
+#: composer/e-msg-composer.c:2934
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -10945,7 +10846,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:3030
+#: composer/e-msg-composer.c:2962
 #, fuzzy
 msgid ""
 "Could not create composer window:\n"
@@ -10956,7 +10857,7 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:3100
+#: composer/e-msg-composer.c:3029
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -10964,94 +10865,12 @@ msgstr ""
 "Ezin izan da mezua prestatzeko leihoa sortu:\n"
 "Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:4110
+#: composer/e-msg-composer.c:4045
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
 msgstr ""
 
-#: composer/e-msg-composer-hdrs.c:290
-#, fuzzy
-msgid "You need to configure an account before you can compose mail."
-msgstr ""
-"Identitatea konfiguratu behar duzu\n"
-"mezua idatzi ahal izateko."
-
-#: composer/e-msg-composer-hdrs.c:483
-msgid "Click here for the address book"
-msgstr "Egin klik hemen helbide-liburura joateko"
-
-#.
-#. * Reply-To:
-#. *
-#. * Create this before we call create_from_optionmenu,
-#. * because that causes from_changed to be called, which
-#. * expects the reply_to fields to be initialized.
-#.
-#: composer/e-msg-composer-hdrs.c:514
-msgid "Reply-To:"
-msgstr "Erantzun honi:"
-
-#.
-#. * From
-#.
-#: composer/e-msg-composer-hdrs.c:520
-msgid "From:"
-msgstr "Nork:"
-
-#.
-#. * Subject
-#.
-#: composer/e-msg-composer-hdrs.c:526
-msgid "Subject:"
-msgstr "Gaia:"
-
-#: composer/e-msg-composer-hdrs.c:535
-msgid "To:"
-msgstr "Nori: "
-
-#: composer/e-msg-composer-hdrs.c:536
-msgid "Enter the recipients of the message"
-msgstr "Idatzi mezuaren hartzaileak"
-
-#: composer/e-msg-composer-hdrs.c:539
-msgid "Cc:"
-msgstr "Cc:"
-
-#: composer/e-msg-composer-hdrs.c:540
-msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Idatzi mezuaren kopia jasoko dutenen helbideak"
-
-#: composer/e-msg-composer-hdrs.c:543
-msgid "Bcc:"
-msgstr "Bcc:"
-
-#: composer/e-msg-composer-hdrs.c:544
-msgid ""
-"Enter the addresses that will receive a carbon copy of the message without "
-"appearing in the recipient list of the message."
-msgstr ""
-"Idatzi hartzaileen zerrendan agertu gabe mezuaren kopia jasoko dutenen "
-"helbideak."
-
-#.
-#. * Post-To
-#.
-#: composer/e-msg-composer-hdrs.c:551
-#, fuzzy
-msgid "Post To:"
-msgstr "Porto"
-
-#: composer/e-msg-composer-hdrs.c:553
-#, fuzzy
-msgid "Posting destination"
-msgstr "Azalpenik ez"
-
-#: composer/e-msg-composer-select-file.c:119
-#, fuzzy
-msgid "Attach file(s)"
-msgstr "Erantsi fitxategi bat"
-
 #: data/evolution.desktop.in.h:1
 msgid "The Evolution groupware suite"
 msgstr "Evolution-en talde-lanerako tresna"
@@ -11215,7 +11034,7 @@ msgstr ""
 "Izen hori duen fitxategia badago lehendik.\n"
 "Gainidatzi?"
 
-#: e-util/e-dialog-utils.c:249
+#: e-util/e-dialog-utils.c:249 mail/mail-display.c:200
 msgid "Overwrite file?"
 msgstr "Fitxategia gainidatzi?"
 
@@ -11237,212 +11056,90 @@ msgstr "Sinkronizatu kategoriak:"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without seconds.
-#: e-util/e-time-utils.c:185 e-util/e-time-utils.c:398
+#: e-util/e-time-utils.c:172 e-util/e-time-utils.c:385
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %Y/%m/%d %I:%M %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without seconds.
-#: e-util/e-time-utils.c:190 e-util/e-time-utils.c:389
+#: e-util/e-time-utils.c:177 e-util/e-time-utils.c:376
 msgid "%a %m/%d/%Y %H:%M"
 msgstr "%a, %Y/%m/%d %H:%M"
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:195
+#: e-util/e-time-utils.c:182
 msgid "%a %m/%d/%Y %I %p"
 msgstr "%a, %Y/%m/%d %I %p"
 
 #. strptime format of a weekday, a date and a time,
 #. in 24-hour format, without minutes or seconds.
-#: e-util/e-time-utils.c:200
+#: e-util/e-time-utils.c:187
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %Y/%m/%d %H"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: e-util/e-time-utils.c:211
+#: e-util/e-time-utils.c:198
 msgid "%m/%d/%Y %I:%M:%S %p"
 msgstr "%Y/%m/%d %I:%M:%S %p"
 
 #. strptime format of a date and a time, in 24-hour format.
-#: e-util/e-time-utils.c:215
+#: e-util/e-time-utils.c:202
 msgid "%m/%d/%Y %H:%M:%S"
 msgstr "%Y/%m/%d %H:%M:%S"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:220
+#: e-util/e-time-utils.c:207
 msgid "%m/%d/%Y %I:%M %p"
 msgstr "%Y/%m/%d %I:%M %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without seconds.
-#: e-util/e-time-utils.c:225
+#: e-util/e-time-utils.c:212
 msgid "%m/%d/%Y %H:%M"
 msgstr "%Y/%m/%d %H:%M"
 
 #. strptime format of a date and a time, in 12-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:230
+#: e-util/e-time-utils.c:217
 msgid "%m/%d/%Y %I %p"
 msgstr "%Y/%m/%d %I %p"
 
 #. strptime format of a date and a time, in 24-hour format,
 #. without minutes or seconds.
-#: e-util/e-time-utils.c:235
+#: e-util/e-time-utils.c:222
 msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H"
 
 #. strptime format for a time of day, in 12-hour format.
-#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:438
+#: e-util/e-time-utils.c:326 e-util/e-time-utils.c:425
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
-#: e-util/e-time-utils.c:343 e-util/e-time-utils.c:430
+#: e-util/e-time-utils.c:330 e-util/e-time-utils.c:417
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
 #. strptime format for time of day, without seconds,
 #. in 12-hour format.
-#: e-util/e-time-utils.c:348 e-util/e-time-utils.c:435
-#: widgets/misc/e-dateedit.c:1417 widgets/misc/e-dateedit.c:1642
+#: e-util/e-time-utils.c:335 e-util/e-time-utils.c:422
+#: widgets/misc/e-dateedit.c:1404 widgets/misc/e-dateedit.c:1617
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
-#: e-util/e-time-utils.c:352 e-util/e-time-utils.c:427
-#: widgets/misc/e-dateedit.c:1414 widgets/misc/e-dateedit.c:1639
+#: e-util/e-time-utils.c:339 e-util/e-time-utils.c:414
+#: widgets/misc/e-dateedit.c:1401 widgets/misc/e-dateedit.c:1614
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: e-util/e-time-utils.c:356
+#: e-util/e-time-utils.c:343
 msgid "%I %p"
 msgstr "%I %p"
 
-#: executive-summary/component/component-factory.c:151
-msgid "Cannot initialize Evolution's Executive Summary component."
-msgstr "Ezin da hasieratu Evolution-en laneko laburpena egiteko osagaia."
-
-#: executive-summary/component/e-summary.c:925
-#, c-format
-msgid ""
-"Cannot open the HTML file:\n"
-"%s"
-msgstr ""
-"Ezin da HTML fitxategia ireki:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:939
-#, c-format
-msgid ""
-"Error reading data:\n"
-"%s"
-msgstr ""
-"Errorea datuak irakurtzean:\n"
-"%s"
-
-#: executive-summary/component/e-summary.c:957
-msgid "File does not have a place for the services.\n"
-msgstr "Fitxategiak ez du lekurik zerbitzuentzat.\n"
-
-#: executive-summary/component/e-summary-callbacks.c:125
-#, fuzzy
-msgid "Select a service"
-msgstr "Hautatu fitxategia"
-
-#: executive-summary/component/e-summary-callbacks.c:289
-msgid ""
-"You can select a different HTML page for the background of the Executive "
-"Summary.\n"
-"\n"
-"Just leave it blank for the default"
-msgstr ""
-"Beste HTML orri bat hauta dezakezu Laneko Laburpenaren atzeko planorako.\n"
-"\n"
-"Utzi hutsik lehenetsirako"
-
-#: executive-summary/component/e-summary-url.c:69
-#: executive-summary/component/e-summary-url.c:74
-#: executive-summary/component/e-summary-url.c:81
-#, c-format
-msgid "Open %s with the default GNOME application"
-msgstr "Ireki %s GNOME aplikazio lehenetsiarekin"
-
-#: executive-summary/component/e-summary-url.c:70
-#, c-format
-msgid "Open %s with the default GNOME web browser"
-msgstr "Ireki %s GNOME web arakatzaile lehenetsiarekin"
-
-#: executive-summary/component/e-summary-url.c:71
-#, c-format
-msgid "Send an email to %s"
-msgstr "Bidali mezua -> %s"
-
-#: executive-summary/component/e-summary-url.c:72
-#, fuzzy, c-format
-msgid "Change the view to %s"
-msgstr "Aldatu ikuspegia -> %s"
-
-#: executive-summary/component/e-summary-url.c:73
-#, c-format
-msgid "Run %s"
-msgstr "Exekutatu %s"
-
-#: executive-summary/component/e-summary-url.c:75
-#, c-format
-msgid "Close %s"
-msgstr "Itxi %s"
-
-#: executive-summary/component/e-summary-url.c:76
-#, c-format
-msgid "Move %s to the left"
-msgstr "Eraman %s ezkerrera"
-
-#: executive-summary/component/e-summary-url.c:77
-#, c-format
-msgid "Move %s to the right"
-msgstr "Eraman %s eskuinera"
-
-#: executive-summary/component/e-summary-url.c:78
-#, c-format
-msgid "Move %s into the previous row"
-msgstr "Eraman %s aurreko errenkadara"
-
-#: executive-summary/component/e-summary-url.c:79
-#, c-format
-msgid "Move %s into the next row"
-msgstr "Eraman %s hurrengo errenkadara"
-
-#: executive-summary/component/e-summary-url.c:80
-#, fuzzy, c-format
-msgid "Configure %s"
-msgstr "Birkonfiguratu /%s"
-
-#
-#: executive-summary/component/e-summary-url.c:553
-msgid "page"
-msgstr "orrialdea"
-
-#: executive-summary/test-service/rdf-summary.c:512
-#: executive-summary/test-service/rdf-summary.c:549
-#: executive-summary/test-service/rdf-summary.c:594
-msgid "Error"
-msgstr "Errorea"
-
-#: executive-summary/test-service/rdf-summary.c:775
-msgid "Update automatically"
-msgstr "Eguneratu automatikoki"
-
-#: executive-summary/test-service/rdf-summary.c:785
-msgid "Update now"
-msgstr "Eguneratu orain"
-
-#: executive-summary/test-service/rdf-summary.c:795
-msgid "Update every "
-msgstr "Eguneratze-maiztasuna"
-
 #: filter/filter-datespec.c:65
 #, fuzzy
 msgid "1 second ago"
@@ -11569,6 +11266,89 @@ msgstr "Zehaztu fitxategi-izena:"
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
+#: filter/filter-input.c:191
+#, c-format
+msgid ""
+"Error in regular expression '%s':\n"
+"%s"
+msgstr ""
+"Errorea '%s' adierazpen erregularrean:\n"
+"%s"
+
+#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/mail-config.c:65
+#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1411
+msgid "Important"
+msgstr "Garrantzitsua"
+
+#. red
+#: filter/filter-label.c:122 mail/mail-config.c:66
+#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1412
+#, fuzzy
+msgid "Work"
+msgstr "Cork"
+
+#. orange
+#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
+#: shell/e-config-upgrade.c:1413
+#, fuzzy
+msgid "Personal"
+msgstr "Pownal"
+
+#. forest green
+#: filter/filter-label.c:124 mail/mail-config.c:68
+#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1414
+#, fuzzy
+msgid "To Do"
+msgstr "Togo"
+
+#. blue
+#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
+#: shell/e-config-upgrade.c:1415
+#, fuzzy
+msgid "Later"
+msgstr "geroago"
+
+#: filter/filter-part.c:531 shell/evolution-test-component.c:63
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:219
+msgid "You must name this filter."
+msgstr "Iragazkiari izena eman behar diozu."
+
+#: filter/filter-rule.c:751
+msgid "Rule name: "
+msgstr "Arau-izena: "
+
+#: filter/filter-rule.c:755
+msgid "Untitled"
+msgstr "Izengabea"
+
+#: filter/filter-rule.c:772
+msgid "If"
+msgstr "Baldin eta"
+
+#: filter/filter-rule.c:791
+msgid "Execute actions"
+msgstr "Exekutatu ekintzak"
+
+#: filter/filter-rule.c:795
+msgid "if all criteria are met"
+msgstr "irizpide guztiak betetzen badira"
+
+#: filter/filter-rule.c:800
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "irizpideren bat betetzen bada"
+
+#: filter/filter-rule.c:895
+msgid "incoming"
+msgstr "sarrerakoa"
+
+#: filter/filter-rule.c:895
+msgid "outgoing"
+msgstr "irteerakoa"
+
 #: filter/filter.glade.h:1
 msgid "Compare against"
 msgstr "Konparazio-ordua:"
@@ -11674,89 +11454,6 @@ msgstr "karpeta lokal guztiekin"
 msgid "years"
 msgstr "urte "
 
-#: filter/filter-input.c:191
-#, c-format
-msgid ""
-"Error in regular expression '%s':\n"
-"%s"
-msgstr ""
-"Errorea '%s' adierazpen erregularrean:\n"
-"%s"
-
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:17 mail/mail-config.c:65
-#: mail/mail-config.glade.h:62 shell/e-config-upgrade.c:1454
-msgid "Important"
-msgstr "Garrantzitsua"
-
-#. red
-#: filter/filter-label.c:122 mail/mail-config.c:66
-#: mail/mail-config.glade.h:129 shell/e-config-upgrade.c:1455
-#, fuzzy
-msgid "Work"
-msgstr "Cork"
-
-#. orange
-#: filter/filter-label.c:123 mail/mail-config.c:67 mail/mail-config.glade.h:84
-#: shell/e-config-upgrade.c:1456
-#, fuzzy
-msgid "Personal"
-msgstr "Pownal"
-
-#. forest green
-#: filter/filter-label.c:124 mail/mail-config.c:68
-#: mail/mail-config.glade.h:120 shell/e-config-upgrade.c:1457
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: filter/filter-label.c:125 mail/mail-config.c:69 mail/mail-config.glade.h:66
-#: shell/e-config-upgrade.c:1458
-#, fuzzy
-msgid "Later"
-msgstr "geroago"
-
-#: filter/filter-part.c:531 shell/evolution-test-component.c:63
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:219
-msgid "You must name this filter."
-msgstr "Iragazkiari izena eman behar diozu."
-
-#: filter/filter-rule.c:751
-msgid "Rule name: "
-msgstr "Arau-izena: "
-
-#: filter/filter-rule.c:755
-msgid "Untitled"
-msgstr "Izengabea"
-
-#: filter/filter-rule.c:772
-msgid "If"
-msgstr "Baldin eta"
-
-#: filter/filter-rule.c:791
-msgid "Execute actions"
-msgstr "Exekutatu ekintzak"
-
-#: filter/filter-rule.c:795
-msgid "if all criteria are met"
-msgstr "irizpide guztiak betetzen badira"
-
-#: filter/filter-rule.c:800
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "irizpideren bat betetzen bada"
-
-#: filter/filter-rule.c:895
-msgid "incoming"
-msgstr "sarrerakoa"
-
-#: filter/filter-rule.c:895
-msgid "outgoing"
-msgstr "irteerakoa"
-
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -11781,226 +11478,226 @@ msgid "Beep"
 msgstr "Belem"
 
 #: filter/libfilter-i18n.h:7
+msgid "contains"
+msgstr "hau dauka"
+
+#: filter/libfilter-i18n.h:8
 msgid "Copy to Folder"
 msgstr "Kopiatu karpeta honetan"
 
-#: filter/libfilter-i18n.h:8
+#: filter/libfilter-i18n.h:9
 msgid "Date received"
 msgstr "Jasotze-data"
 
-#: filter/libfilter-i18n.h:9
+#: filter/libfilter-i18n.h:10
 msgid "Date sent"
 msgstr "Bidaltze-data"
 
-#: filter/libfilter-i18n.h:11
+#: filter/libfilter-i18n.h:12
 msgid "Deleted"
 msgstr "Ezabatuta"
 
-#: filter/libfilter-i18n.h:12
+#: filter/libfilter-i18n.h:13
+msgid "does not contain"
+msgstr "ez dauka hau"
+
+#: filter/libfilter-i18n.h:14
+msgid "does not end with"
+msgstr "ez da honela amaitzen"
+
+#: filter/libfilter-i18n.h:15
+msgid "does not exist"
+msgstr "ez dago"
+
+#: filter/libfilter-i18n.h:16
+#, fuzzy
+msgid "does not return"
+msgstr "ez dago"
+
+#: filter/libfilter-i18n.h:17
+msgid "does not sound like"
+msgstr "ez da honen antzekoa"
+
+#: filter/libfilter-i18n.h:18
+msgid "does not start with"
+msgstr "ez da honela hasten"
+
+#: filter/libfilter-i18n.h:19
 msgid "Do Not Exist"
 msgstr "Ez"
 
-#: filter/libfilter-i18n.h:13
+#: filter/libfilter-i18n.h:20
 msgid "Draft"
 msgstr "Zirriborroa"
 
-#: filter/libfilter-i18n.h:14
+#: filter/libfilter-i18n.h:21
+msgid "ends with"
+msgstr "honela amaitzen da"
+
+#: filter/libfilter-i18n.h:22
 msgid "Exist"
 msgstr "Bai"
 
-#: filter/libfilter-i18n.h:15
+#: filter/libfilter-i18n.h:23
+msgid "exists"
+msgstr "badago"
+
+#: filter/libfilter-i18n.h:24
 msgid "Expression"
 msgstr "Adierazpena"
 
-#: filter/libfilter-i18n.h:16
+#: filter/libfilter-i18n.h:25
 msgid "Follow Up"
 msgstr "Jarraitu"
 
-#: filter/libfilter-i18n.h:18
+#: filter/libfilter-i18n.h:27
+msgid "is"
+msgstr "da"
+
+#: filter/libfilter-i18n.h:28
+msgid "is after"
+msgstr "honen ondorengoa da"
+
+#: filter/libfilter-i18n.h:29
+msgid "is before"
+msgstr "honen aurrekoa da"
+
+#: filter/libfilter-i18n.h:30
+msgid "is Flagged"
+msgstr "Banderaduna da"
+
+#: filter/libfilter-i18n.h:31
+msgid "is greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:32
+msgid "is less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:33
+msgid "is not"
+msgstr "ez da"
+
+#: filter/libfilter-i18n.h:34
+msgid "is not Flagged"
+msgstr "ez da Banderaduna"
+
+#: filter/libfilter-i18n.h:35 mail/folder-browser.c:1800
 #, fuzzy
 msgid "Label"
 msgstr "Laurel"
 
-#: filter/libfilter-i18n.h:19
+#: filter/libfilter-i18n.h:36
 msgid "Mailing list"
 msgstr "Posta-zerrenda"
 
-#: filter/libfilter-i18n.h:20
+#: filter/libfilter-i18n.h:37
 msgid "Message Body"
 msgstr "Mezuaren gorputza"
 
-#: filter/libfilter-i18n.h:21
+#: filter/libfilter-i18n.h:38
 msgid "Message Header"
 msgstr "Mezuaren goiburukoa"
 
-#: filter/libfilter-i18n.h:22
+#: filter/libfilter-i18n.h:39
 msgid "Move to Folder"
 msgstr "Eraman karpeta honetara"
 
-#: filter/libfilter-i18n.h:23
+#: filter/libfilter-i18n.h:40
 #, fuzzy
 msgid "Pipe Message to Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:24
+#: filter/libfilter-i18n.h:41
 #, fuzzy
 msgid "Play Sound"
 msgstr "Jo soinua:"
 
-#: filter/libfilter-i18n.h:25 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:42 mail/message-tag-followup.c:68
 msgid "Read"
 msgstr "Irakurrita"
 
-#: filter/libfilter-i18n.h:26
+#: filter/libfilter-i18n.h:43
 msgid "Recipients"
 msgstr "Hartzailea"
 
-#: filter/libfilter-i18n.h:27
+#: filter/libfilter-i18n.h:44
 msgid "Regex Match"
 msgstr "Adierazpen erregularra"
 
-#: filter/libfilter-i18n.h:28
+#: filter/libfilter-i18n.h:45
 msgid "Replied to"
 msgstr "Erantzunda"
 
-#: filter/libfilter-i18n.h:29 filter/score-rule.c:184 filter/score-rule.c:186
+#: filter/libfilter-i18n.h:46
+#, fuzzy
+msgid "returns"
+msgstr "Burns"
+
+#: filter/libfilter-i18n.h:47
+#, fuzzy
+msgid "returns greater than"
+msgstr "hau baino handiagoa da"
+
+#: filter/libfilter-i18n.h:48
+#, fuzzy
+msgid "returns less than"
+msgstr "hau baino txikiagoa da"
+
+#: filter/libfilter-i18n.h:49 filter/score-rule.c:184 filter/score-rule.c:186
 #: mail/message-list.etspec.h:10
 msgid "Score"
 msgstr "Puntuazioa"
 
-#: filter/libfilter-i18n.h:30
+#: filter/libfilter-i18n.h:50 mail/mail-callbacks.c:1820
 msgid "Sender"
 msgstr "Bidaltzailea"
 
-#: filter/libfilter-i18n.h:31
+#: filter/libfilter-i18n.h:51
 msgid "Set Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:32
+#: filter/libfilter-i18n.h:52
 #, fuzzy
 msgid "Shell Command"
 msgstr "Exekutatu shell komandoa"
 
-#: filter/libfilter-i18n.h:33
+#: filter/libfilter-i18n.h:53
 msgid "Size (kB)"
 msgstr "Tamaina (kB)"
 
-#: filter/libfilter-i18n.h:34
+#: filter/libfilter-i18n.h:54
+msgid "sounds like"
+msgstr "honen antzekoa da"
+
+#: filter/libfilter-i18n.h:55
 msgid "Source Account"
 msgstr "Iturburu-kontua"
 
-#: filter/libfilter-i18n.h:35
+#: filter/libfilter-i18n.h:56
 msgid "Specific header"
 msgstr "Goiburuko espezifikoa"
 
-#: filter/libfilter-i18n.h:37
+#: filter/libfilter-i18n.h:57
+msgid "starts with"
+msgstr "honela hasten da"
+
+#: filter/libfilter-i18n.h:59
 msgid "Stop Processing"
 msgstr "Gelditu prozesatzea"
 
-#: filter/libfilter-i18n.h:38 mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:305
+#: filter/libfilter-i18n.h:60 mail/mail-format.c:934
+#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:305
 msgid "Subject"
 msgstr "Gaia"
 
-#: filter/libfilter-i18n.h:39
+#: filter/libfilter-i18n.h:61
 #, fuzzy
 msgid "Unset Status"
 msgstr "Ezarri egoera"
 
-#: filter/libfilter-i18n.h:40
-msgid "contains"
-msgstr "hau dauka"
-
-#: filter/libfilter-i18n.h:41
-msgid "does not contain"
-msgstr "ez dauka hau"
-
-#: filter/libfilter-i18n.h:42
-msgid "does not end with"
-msgstr "ez da honela amaitzen"
-
-#: filter/libfilter-i18n.h:43
-msgid "does not exist"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:44
-#, fuzzy
-msgid "does not return"
-msgstr "ez dago"
-
-#: filter/libfilter-i18n.h:45
-msgid "does not sound like"
-msgstr "ez da honen antzekoa"
-
-#: filter/libfilter-i18n.h:46
-msgid "does not start with"
-msgstr "ez da honela hasten"
-
-#: filter/libfilter-i18n.h:47
-msgid "ends with"
-msgstr "honela amaitzen da"
-
-#: filter/libfilter-i18n.h:48
-msgid "exists"
-msgstr "badago"
-
-#: filter/libfilter-i18n.h:49
-msgid "is Flagged"
-msgstr "Banderaduna da"
-
-#: filter/libfilter-i18n.h:50
-msgid "is after"
-msgstr "honen ondorengoa da"
-
-#: filter/libfilter-i18n.h:51
-msgid "is before"
-msgstr "honen aurrekoa da"
-
-#: filter/libfilter-i18n.h:52
-msgid "is greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:53
-msgid "is less than"
-msgstr "hau baino txikiagoa da"
-
-#: filter/libfilter-i18n.h:54
-msgid "is not Flagged"
-msgstr "ez da Banderaduna"
-
-#: filter/libfilter-i18n.h:55
-msgid "is not"
-msgstr "ez da"
-
-#: filter/libfilter-i18n.h:56
-msgid "is"
-msgstr "da"
-
-#: filter/libfilter-i18n.h:57
-#, fuzzy
-msgid "returns greater than"
-msgstr "hau baino handiagoa da"
-
-#: filter/libfilter-i18n.h:58
-#, fuzzy
-msgid "returns less than"
-msgstr "hau baino txikiagoa da"
-
-#: filter/libfilter-i18n.h:59
-#, fuzzy
-msgid "returns"
-msgstr "Burns"
-
-#: filter/libfilter-i18n.h:60
-msgid "sounds like"
-msgstr "honen antzekoa da"
-
-#: filter/libfilter-i18n.h:61
-msgid "starts with"
-msgstr "honela hasten da"
-
-#: filter/rule-context.c:684 filter/rule-editor.c:241 filter/rule-editor.c:326
-#: mail/mail-vfolder.c:916
+#: filter/rule-context.c:664 filter/rule-editor.c:241 filter/rule-editor.c:326
+#: mail/mail-vfolder.c:917
 #, c-format
 msgid "Rule name '%s' is not unique, choose another."
 msgstr ""
@@ -12070,9 +11767,10 @@ msgid "Scanning %s"
 msgstr "%s eskaneatzen"
 
 #: importers/elm-importer.c:525 importers/netscape-importer.c:2128
-#: importers/pine-importer.c:637 mail/component-factory.c:116
-#: mail/importers/elm-importer.c:526 mail/importers/netscape-importer.c:2085
-#: mail/importers/pine-importer.c:572 my-evolution/my-evolution.glade.h:4
+#: importers/pine-importer.c:637 mail/component-factory.c:117
+#: mail/folder-browser-ui.c:360 mail/importers/elm-importer.c:526
+#: mail/importers/netscape-importer.c:2085 mail/importers/pine-importer.c:572
+#: my-evolution/my-evolution.glade.h:4
 msgid "Mail"
 msgstr "Posta"
 
@@ -12139,7 +11837,7 @@ msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
 #. Fill in the new fields
 #: importers/netscape-importer.c:1872 mail/importers/netscape-importer.c:1842
-#: mail/mail-ops.c:1106 shell/e-local-storage.c:184
+#: mail/mail-ops.c:1092 shell/e-local-storage.c:184
 msgid "Trash"
 msgstr "Zakarrontzia"
 
@@ -12154,7 +11852,7 @@ msgid "Scanning directory"
 msgstr "Direktorioa eskaneatzen"
 
 #: importers/netscape-importer.c:2047 mail/importers/netscape-importer.c:2015
-#: shell/e-shell-startup-wizard.c:556
+#: shell/e-shell-startup-wizard.c:541
 msgid "Starting import"
 msgstr "Inportatzen hasten"
 
@@ -12191,41 +11889,110 @@ msgstr ""
 msgid "Pine"
 msgstr "Pine"
 
-#: mail/component-factory.c:116
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#, fuzzy
+msgid "Composer Preferences"
+msgstr "Egutegi-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#, fuzzy
+msgid "Configure your email accounts here"
+msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution "
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail configuration interface"
+msgstr "Posta konfiguratzeko interfazea"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail folder viewer"
+msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren laneko laburpenaren osagaia."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Kontuak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Egutegi-hobespenak"
+
+#: mail/component-factory.c:117
 msgid "Folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public Mail"
 msgstr "Publikoa"
 
-#: mail/component-factory.c:117
+#: mail/component-factory.c:118
 #, fuzzy
 msgid "Public folder containing mail"
 msgstr "Posta duen karpeta"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash"
 msgstr "Zakarrontzi birtualak"
 
-#: mail/component-factory.c:118
+#: mail/component-factory.c:119
 msgid "Virtual Trash folder"
 msgstr "Zakarrontzi birtualaren karpeta"
 
-#: mail/component-factory.c:146
+#: mail/component-factory.c:147
 msgid "This folder cannot contain messages."
 msgstr "Karpeta honek ezin du mezurik eduki."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Properties..."
 msgstr "Propietateak..."
 
-#: mail/component-factory.c:444
+#: mail/component-factory.c:441
 msgid "Change this folder's properties"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: mail/component-factory.c:826
+#: mail/component-factory.c:819
 msgid ""
 "Some of your mail settings seem corrupt, please check that everything is in "
 "order."
@@ -12233,123 +12000,251 @@ msgstr ""
 "Posta-ezarpen batzuk hondatuta daudela ematen du, begira ezazu dena ondo "
 "dagoen."
 
-#: mail/component-factory.c:1008
+#: mail/component-factory.c:1000
 msgid "You have not set a mail transport method"
 msgstr "Ez duzu ezarri posta garraiatzeko metodorik"
 
-#: mail/component-factory.c:1031
+#: mail/component-factory.c:1023
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1071
+#: mail/component-factory.c:1063
 msgid "_Mail Message"
 msgstr "_Posta-mezua"
 
-#: mail/component-factory.c:1072
+#: mail/component-factory.c:1064
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Prestatu mezua"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "New Message Post"
 msgstr "Mezu berria"
 
-#: mail/component-factory.c:1080
+#: mail/component-factory.c:1072
 #, fuzzy
 msgid "_Post Message"
 msgstr "Aurreko mezua"
 
-#: mail/component-factory.c:1081
+#: mail/component-factory.c:1073
 #, fuzzy
 msgid "Post a new mail message"
 msgstr "Posta-mezu berria"
 
-#: mail/component-factory.c:1373
+#: mail/component-factory.c:1365
 #, fuzzy
 msgid "Connecting..."
 msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/component-factory.c:1384
+#: mail/component-factory.c:1376
 msgid "Cannot register storage with shell"
 msgstr "Ezin da biltegia shell-arekin erregistratu"
 
-#: mail/folder-info.c:70
-msgid "Getting Folder Information"
-msgstr "Karpeta-informazioa hartzen"
+#: mail/folder-browser-ui.c:486
+#, c-format
+msgid "Properties for \"%s\""
+msgstr "\"%s\" - propietateak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+#: mail/folder-browser-ui.c:488
+msgid "Properties"
+msgstr "Propietateak"
+
+#: mail/folder-browser.c:327 mail/mail-display.c:394 mail/mail-display.c:942
+#, c-format
+msgid "Could not create temporary directory: %s"
+msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+
+#: mail/folder-browser.c:782
+#, c-format
+msgid "%d new"
+msgstr "%d berri"
+
+#: mail/folder-browser.c:785 mail/folder-browser.c:793
+#: mail/folder-browser.c:796
+msgid ", "
+msgstr ", "
+
+#: mail/folder-browser.c:787
+#, c-format
+msgid "%d hidden"
+msgstr "%d ezkutu"
+
+#: mail/folder-browser.c:789
+#, c-format
+msgid "%d visible"
+msgstr "%d ikusgarri"
+
+#: mail/folder-browser.c:794
+#, c-format
+msgid "%d selected"
+msgstr "%d hautatuta"
+
+#: mail/folder-browser.c:799
+#, c-format
+msgid "%d unsent"
+msgstr "%d bidali gabe"
+
+#: mail/folder-browser.c:801
+#, c-format
+msgid "%d sent"
+msgstr "%d bidali"
+
+#: mail/folder-browser.c:803
+#, c-format
+msgid "%d total"
+msgstr "%d guztira"
+
+#: mail/folder-browser.c:1182
 #, fuzzy
-msgid "Composer Preferences"
-msgstr "Egutegi-hobespenak"
+msgid "Create _Virtual Folder From Search..."
+msgstr "Sortu _karpeta birtuala mezutik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
+#: mail/folder-browser.c:1736
+msgid "VFolder on _Subject"
+msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
+#: mail/folder-browser.c:1737
+msgid "VFolder on Se_nder"
+msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/folder-browser.c:1738
+msgid "VFolder on _Recipients"
+msgstr "_Hartzailearen araberako karpeta birtuala"
+
+#: mail/folder-browser.c:1739
+msgid "VFolder on Mailing _List"
+msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
+
+#: mail/folder-browser.c:1743
+msgid "Filter on Sub_ject"
+msgstr "G_aiaren araberako iragazkia"
+
+#: mail/folder-browser.c:1744
+msgid "Filter on Sen_der"
+msgstr "Bi_daltzailearen araberako iragazkia"
+
+#: mail/folder-browser.c:1745
+msgid "Filter on Re_cipients"
+msgstr "Hart_zailearen araberako iragazkia"
+
+#: mail/folder-browser.c:1746 mail/folder-browser.c:2070
+msgid "Filter on _Mailing List"
+msgstr "Po_sta-zerrendaren araberako iragazkia"
+
+#: mail/folder-browser.c:1764
+msgid "_Edit as New Message..."
+msgstr "_Editatu mezu berri gisa..."
+
+#: mail/folder-browser.c:1766
+msgid "_Print"
+msgstr "_Inprimatu"
+
+#: mail/folder-browser.c:1770 ui/evolution-mail-message.xml.h:110
+msgid "_Reply to Sender"
+msgstr "Erantzun bidal_tzaileari"
+
+#: mail/folder-browser.c:1771 ui/evolution-mail-message.xml.h:75
+msgid "Reply to _List"
+msgstr "Erantzun zerre_ndari"
+
+#: mail/folder-browser.c:1772 ui/evolution-mail-message.xml.h:74
+msgid "Reply to _All"
+msgstr "Erantzun g_uztiei"
+
+#: mail/folder-browser.c:1773
+msgid "_Forward"
+msgstr "_Birbidali"
+
+#: mail/folder-browser.c:1777
 #, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Sortu edo editatu posta-kontuak eta bestelako hobespenak"
+msgid "Follo_w Up..."
+msgstr "Jarrait_u..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/folder-browser.c:1778
 #, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution "
+msgid "Fla_g Completed"
+msgstr "Bandera o_satuta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/folder-browser.c:1779
 #, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
+msgid "Cl_ear Flag"
+msgstr "Garbitu ban_dera"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#. separator here?
+#: mail/folder-browser.c:1783 ui/evolution-mail-message.xml.h:43
+msgid "Mar_k as Read"
+msgstr "Mar_katu irakurritako gisa"
+
+#: mail/folder-browser.c:1784
 #, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution-en mezu-prestatzailea."
+msgid "Mark as _Unread"
+msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/folder-browser.c:1785
+msgid "Mark as _Important"
+msgstr "Markatu garrantz_itsu gisa"
+
+#: mail/folder-browser.c:1786
 #, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution-en mezu-prestatzailea."
+msgid "_Mark as Unimportant"
+msgstr "Markatu ez-garra_ntzitsu gisa"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/folder-browser.c:1791
 #, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
+msgid "U_ndelete"
+msgstr "_Desezabatu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/folder-browser.c:1795
 #, fuzzy
-msgid "Evolution Mail configuration interface"
-msgstr "Posta konfiguratzeko interfazea"
+msgid "Mo_ve to Folder..."
+msgstr "Eraman karpeta honetara..."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: mail/folder-browser.c:1796 ui/evolution-addressbook.xml.h:31
+msgid "_Copy to Folder..."
+msgstr "K_opiatu karpeta honetan..."
+
+#: mail/folder-browser.c:1804
 #, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Posta-karpetak bistaratzeko Evolution-en osagaia."
+msgid "Add Sender to Address_book"
+msgstr "Gehitu bidaltzailea _helbide-liburuan"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/folder-browser.c:1808
 #, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-en postaren laneko laburpenaren osagaia."
+msgid "Appl_y Filters"
+msgstr "Aplikatu iragazkiak"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#: mail/folder-browser.c:1812
 #, fuzzy
-msgid "Mail Accounts"
-msgstr "Kontuak"
+msgid "Crea_te Rule From Message"
+msgstr "Sortu _araua mezutik"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:69
+#: mail/folder-browser.c:2071
 #, fuzzy
-msgid "Mail Preferences"
-msgstr "Egutegi-hobespenak"
+msgid "VFolder on M_ailing List"
+msgstr "Posta-zerrendaren araberako karpeta birtuala"
+
+#: mail/folder-browser.c:2073
+#, fuzzy, c-format
+msgid "Filter on _Mailing List (%s)"
+msgstr "Posta-zerrendaren araberako iragazkia (%s)"
+
+#: mail/folder-browser.c:2074
+#, fuzzy, c-format
+msgid "VFolder on M_ailing List (%s)"
+msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
+
+#: mail/folder-browser.h:26 mail/mail-config.glade.h:39
+msgid "Default"
+msgstr "Lehenetsi"
+
+#: mail/folder-info.c:70
+msgid "Getting Folder Information"
+msgstr "Karpeta-informazioa hartzen"
 
 #: mail/importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.server.in.in.h:1
 #, fuzzy
@@ -12440,7 +12335,7 @@ msgstr "_Erabiltzaile-izena:"
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-account-gui.c:1886
+#: mail/mail-account-gui.c:1887
 msgid "You may not create two accounts with the same name."
 msgstr "Ezin dituzu izen bereko bi kontu izan."
 
@@ -12472,17 +12367,17 @@ msgstr "Lehenetsi"
 
 #. FIXME: This routine should just be a "toggled" event handler on the checkbox cell renderer which
 #. has "activatable" set.
-#: mail/mail-accounts.c:481 mail/mail-composer-prefs.c:708
-#: mail/mail-composer-prefs.c:854
+#: mail/mail-accounts.c:481 mail/mail-accounts.etspec.h:2
+#: mail/mail-composer-prefs.c:708 mail/mail-composer-prefs.c:854
 msgid "Enabled"
 msgstr "Gaituta"
 
-#: mail/mail-accounts.c:487
+#: mail/mail-accounts.c:487 mail/mail-accounts.etspec.h:1
 #, fuzzy
 msgid "Account name"
 msgstr "_Kontu-izena:"
 
-#: mail/mail-accounts.c:489
+#: mail/mail-accounts.c:489 mail/mail-accounts.etspec.h:3
 #, fuzzy
 msgid "Protocol"
 msgstr "Puerto Rico"
@@ -12527,6 +12422,222 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
+#. Add the "Don't show this message again." checkbox
+#: mail/mail-callbacks.c:101 widgets/misc/e-messagebox.c:226
+msgid "Don't show this message again."
+msgstr "Ez erakutsi mezu hau berriro."
+
+#: mail/mail-callbacks.c:190
+msgid ""
+"You have not configured the mail client.\n"
+"You need to do this before you can send,\n"
+"receive or compose mail.\n"
+"Would you like to configure it now?"
+msgstr ""
+"Ez duzu konfiguratu posta-bezeroa.\n"
+"Konfiguratu egin behar duzu mezuak bidali,\n"
+"jaso edo prestatu ahal izateko.\n"
+"Orain konfiguratu nahi duzu?"
+
+#: mail/mail-callbacks.c:212
+#, fuzzy
+msgid ""
+"You need to configure an account\n"
+"before you can compose mail."
+msgstr ""
+"Identitatea konfiguratu behar duzu\n"
+"mezua idatzi ahal izateko."
+
+#: mail/mail-callbacks.c:226
+msgid ""
+"You need to configure an identity\n"
+"before you can compose mail."
+msgstr ""
+"Identitatea konfiguratu behar duzu\n"
+"mezua idatzi ahal izateko."
+
+#: mail/mail-callbacks.c:233
+msgid ""
+"You need to configure a mail transport\n"
+"before you can compose mail."
+msgstr ""
+"Posta-garraioa konfiguratu behar duzu\n"
+"mezua idatzi ahal izateko."
+
+#. FIXME: this wording sucks
+#: mail/mail-callbacks.c:255
+#, fuzzy
+msgid ""
+"You are sending an HTML-formatted message. Please make sure that\n"
+"the following recipients are willing and able to receive HTML mail:\n"
+msgstr ""
+"HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
+"formatuko mezurik jaso nahi:\n"
+
+#: mail/mail-callbacks.c:267
+msgid "Send anyway?"
+msgstr "Hala ere bidali nahi duzu?"
+
+#: mail/mail-callbacks.c:288
+msgid ""
+"This message has no subject.\n"
+"Really send?"
+msgstr ""
+"Mezu honek ez du gairik.\n"
+"Ziur zaude bidali nahi duzula?"
+
+#: mail/mail-callbacks.c:314
+msgid ""
+"Since the contact list you are sending to is configured to hide the list's "
+"addresses, this message will contain only Bcc recipients."
+msgstr ""
+"Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
+"konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
+
+#: mail/mail-callbacks.c:318
+msgid "This message contains only Bcc recipients."
+msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
+
+#: mail/mail-callbacks.c:323
+msgid ""
+"It is possible that the mail server may reveal the recipients by adding an "
+"Apparently-To header.\n"
+"Send anyway?"
+msgstr ""
+"Beharbada posta-zerbitzariak hartzaileak agerian utziko ditu Apparently-To "
+"goiburukoa gehituz.\n"
+"Hala ere bidali nahi duzu?"
+
+#: mail/mail-callbacks.c:472
+msgid "You must specify recipients in order to send this message."
+msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
+
+#: mail/mail-callbacks.c:724
+msgid ""
+"Unable to open the drafts folder for this account.\n"
+"Would you like to use the default drafts folder?"
+msgstr ""
+"Ezin da kontu honetako zirriborroen karpeta ireki.\n"
+"Zirriborroen karpeta lehenetsia erabili nahi duzu?"
+
+#: mail/mail-callbacks.c:1189
+msgid "an unknown sender"
+msgstr "bidaltzaile ezezaguna"
+
+#: mail/mail-callbacks.c:1193
+msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
+msgstr ""
+"Jatorrizko mezua:\n"
+"data: %a, %Y-%m-%d %H:%M, egilea: %%s"
+
+#: mail/mail-callbacks.c:1700 mail/message-browser.c:132
+msgid "Move message(s) to"
+msgstr "Eraman mezua(k) hona"
+
+#: mail/mail-callbacks.c:1702 mail/message-browser.c:134
+msgid "Copy message(s) to"
+msgstr "Kopiatu mezua(k) hemen"
+
+#: mail/mail-callbacks.c:2344
+#, c-format
+msgid "Are you sure you want to edit all %d messages?"
+msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
+
+#: mail/mail-callbacks.c:2360
+msgid ""
+"You may only edit messages saved\n"
+"in the Drafts folder."
+msgstr ""
+"Zirriborroen karpetan gordetako mezuak bakarrik\n"
+"edita ditzakezu."
+
+#: mail/mail-callbacks.c:2393
+msgid ""
+"You may only resend messages\n"
+"in the Sent folder."
+msgstr ""
+"Bidalitako mezuen karpetako mezuak bakarrik\n"
+"bidal ditzakezu berriro."
+
+#: mail/mail-callbacks.c:2403
+#, c-format
+msgid "Are you sure you want to resend all %d messages?"
+msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+
+#: mail/mail-callbacks.c:2424
+msgid "No Message Selected"
+msgstr "Ez duzu mezurik hautatu"
+
+#: mail/mail-callbacks.c:2465
+#, fuzzy, c-format
+msgid ""
+"Cannot save to `%s'\n"
+" %s"
+msgstr ""
+"Ezin da mezua hartu: %s\n"
+"  %s"
+
+#: mail/mail-callbacks.c:2470
+#, fuzzy, c-format
+msgid ""
+"`%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"%s badago lehendik\n"
+"Gainidatzi nahi duzu?"
+
+#: mail/mail-callbacks.c:2511
+msgid "Save Message As..."
+msgstr "Gorde mezua honela..."
+
+#: mail/mail-callbacks.c:2513
+msgid "Save Messages As..."
+msgstr "Gorde mezuak honela..."
+
+#: mail/mail-callbacks.c:2686
+#, fuzzy
+msgid ""
+"This operation will permanently erase all messages marked as\n"
+"deleted. If you continue, you will not be able to recover these messages.\n"
+"\n"
+"Really erase these messages?"
+msgstr ""
+"Eragiketa honek betiko borratuko ditu ezabatutako gisa markatutako mezuak. "
+"Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
+"\n"
+"Benetan borratu nahi dituzu?"
+
+#: mail/mail-callbacks.c:2781
+#, c-format
+msgid ""
+"Error loading filter information:\n"
+"%s"
+msgstr ""
+"Errorea iragazki-informazioa kargatzean:\n"
+"%s"
+
+#: mail/mail-callbacks.c:2789
+msgid "Filters"
+msgstr "Iragazkiak"
+
+#: mail/mail-callbacks.c:2830
+#, c-format
+msgid "Page %d of %d"
+msgstr "%d/%d orria"
+
+#: mail/mail-callbacks.c:2886
+msgid "Print Message"
+msgstr "Inprimatu mezua"
+
+#: mail/mail-callbacks.c:2954
+msgid "Printing of message failed"
+msgstr "Huts egin du mezua inprimatzean"
+
+#: mail/mail-callbacks.c:3147
+#, c-format
+msgid "Are you sure you want to open all %d messages in separate windows?"
+msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
+
 #: mail/mail-composer-prefs.c:226 mail/mail-composer-prefs.c:349
 #: mail/mail-config.c:1376
 #, fuzzy
@@ -12558,19 +12669,11 @@ msgstr "Gehitu irizpidea"
 msgid "Signature(s)"
 msgstr "_Sinadura-fitxategia:"
 
-#: mail/mail-config.c:1080
-msgid "Checking Service"
-msgstr "Zerbitzua egiaztatzen"
-
-#: mail/mail-config.c:1158 mail/mail-config.c:1162
-msgid "Connecting to server..."
-msgstr "Zerbitzariarekin konektatzen..."
-
-#: mail/mail-config-druid.c:367 mail/mail-config.glade.h:61
+#: mail/mail-config-druid.c:380 mail/mail-config.glade.h:61
 msgid "Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config-druid.c:369
+#: mail/mail-config-druid.c:382
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -12581,12 +12684,12 @@ msgstr ""
 "eremuak bete gabe utz ditzakezu.\n"
 "Betetzen badituzu, datu horiek zuk bidaltzen dituzun mezuetan agertuko dira."
 
-#: mail/mail-config-druid.c:375 mail/mail-config-druid.c:382
+#: mail/mail-config-druid.c:388 mail/mail-config-druid.c:395
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Mezuak jaso"
 
-#: mail/mail-config-druid.c:377
+#: mail/mail-config-druid.c:390
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -12596,16 +12699,16 @@ msgstr ""
 "bazaude, galdetu sistemaren\n"
 "administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:384
+#: mail/mail-config-druid.c:397
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: mail/mail-config-druid.c:387
+#: mail/mail-config-druid.c:400
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config-druid.c:389
+#: mail/mail-config-druid.c:402
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -12615,11 +12718,11 @@ msgstr ""
 "bazaude, galdetu\n"
 "sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:394 mail/mail-config.glade.h:10
+#: mail/mail-config-druid.c:407 mail/mail-config.glade.h:10
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: mail/mail-config-druid.c:396
+#: mail/mail-config-druid.c:409
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -12636,6 +12739,14 @@ msgstr ""
 "Bistaratzeko \n"
 "bakarrik erabiliko da kontu-izen hori."
 
+#: mail/mail-config.c:1080
+msgid "Checking Service"
+msgstr "Zerbitzua egiaztatzen"
+
+#: mail/mail-config.c:1158 mail/mail-config.c:1162
+msgid "Connecting to server..."
+msgstr "Zerbitzariarekin konektatzen..."
+
 #: mail/mail-config.glade.h:3
 msgid " _Check for supported types "
 msgstr "_Begiratu zein mota onartzen diren"
@@ -12766,10 +12877,6 @@ msgstr ""
 msgid "De_fault"
 msgstr "Le_henetsi"
 
-#: mail/mail-config.glade.h:39
-msgid "Default"
-msgstr "Lehenetsi"
-
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Default Behavior"
@@ -13261,25 +13368,219 @@ msgstr "Erabili konexio segurua (_SSL)"
 msgid "_Use the same fonts as other applications"
 msgstr ""
 
+#: mail/mail-config.glade.h:171
+#, fuzzy
+msgid "color"
+msgstr "kolorea"
+
 #: mail/mail-config.glade.h:172
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-folder-cache.c:832
+#: mail/mail-crypto.c:84
+msgid "Could not create a S/MIME signature context."
+msgstr "Ezin izan da S/MIME sinadura-testuingurua sortu."
+
+#: mail/mail-crypto.c:116
+msgid "Could not create a S/MIME certsonly context."
+msgstr "Ezin izan da S/MIME ziurtagiri-testuingurua sortu."
+
+#: mail/mail-crypto.c:148
+msgid "Could not create a S/MIME encryption context."
+msgstr "Ezin izan da S/MIME enkriptatze-testuingurua sortu."
+
+#: mail/mail-crypto.c:180
+msgid "Could not create a S/MIME envelope context."
+msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
+
+#: mail/mail-crypto.c:211
+msgid "Could not create a S/MIME decode context."
+msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
+
+#: mail/mail-display.c:197
+#, fuzzy, c-format
+msgid ""
+"File `%s' already exists.\n"
+"Overwrite it?"
+msgstr ""
+"Izen hori duen fitxategia badago lehendik.\n"
+"Gainidatzi?"
+
+#: mail/mail-display.c:336
+msgid "Save Attachment"
+msgstr "Gorde eranskina"
+
+#: mail/mail-display.c:409
+#, c-format
+msgid "Could not create temporary file '%s': %s"
+msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
+
+#: mail/mail-display.c:457
+#, fuzzy
+msgid "Save Attachment..."
+msgstr "Gorde eranskina"
+
+#: mail/mail-display.c:458
+msgid "View Inline"
+msgstr "Ikusi barnean"
+
+#: mail/mail-display.c:459
+#, c-format
+msgid "Open in %s..."
+msgstr "Ireki honekin: %s..."
+
+#: mail/mail-display.c:515
+#, c-format
+msgid "View Inline (via %s)"
+msgstr "Ikusi barnean (%s bidez)"
+
+#: mail/mail-display.c:519
+msgid "Hide"
+msgstr "Ezkutatu"
+
+#: mail/mail-display.c:539
+msgid "External Viewer"
+msgstr "Kanpoko ikustailea"
+
+#: mail/mail-display.c:1368
+#, fuzzy
+msgid "Downloading images"
+msgstr "Kargatu iru_diak"
+
+#: mail/mail-display.c:1545
+msgid "Loading message content"
+msgstr "Mezuaren edukia kargatzen"
+
+#: mail/mail-display.c:1887
+#, fuzzy
+msgid "Overdue:"
+msgstr "A_tzeratutako zereginak:"
+
+#: mail/mail-display.c:1891
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %P"
+msgstr "%b %d %l:%M %p"
+
+#: mail/mail-display.c:2255
+msgid "Open Link in Browser"
+msgstr "Ireki esteka arakatzailean"
+
+#: mail/mail-display.c:2256
+msgid "Copy Link Location"
+msgstr "Kopiatu estekaren helbidea"
+
+#: mail/mail-display.c:2258
+msgid "Save Link as (FIXME)"
+msgstr "Gorde esteka honela (FIXME) "
+
+#: mail/mail-display.c:2260
+msgid "Save Image as..."
+msgstr "Gorde irudia honela..."
+
+#: mail/mail-folder-cache.c:745
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "%s eskaneatzen"
 
+#: mail/mail-format.c:665
+#, c-format
+msgid "%s attachment"
+msgstr "%s eranskina"
+
+#: mail/mail-format.c:707 mail/mail-format.c:1370 mail/mail-format.c:1439
+#: mail/mail-format.c:1559 mail/mail-format.c:1683 mail/mail-format.c:1708
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+
+#: mail/mail-format.c:785 mail/message-list.etspec.h:2
+msgid "Date"
+msgstr "Data"
+
+#: mail/mail-format.c:871
+msgid "Bad Address"
+msgstr "Helbide okerra"
+
+#: mail/mail-format.c:912 mail/message-list.etspec.h:7
+#: mail/message-tag-followup.c:301
+msgid "From"
+msgstr "Nork"
+
+#: mail/mail-format.c:916
+msgid "Reply-To"
+msgstr "Erantzun honi"
+
+#: mail/mail-format.c:921 mail/message-list.etspec.h:14
+msgid "To"
+msgstr "Nori"
+
+#: mail/mail-format.c:926
+msgid "Cc"
+msgstr "Cc"
+
+#: mail/mail-format.c:931
+msgid "Bcc"
+msgstr "Bcc"
+
+#: mail/mail-format.c:1482
+msgid ""
+"This message is digitally signed. Click the lock icon for more information."
+msgstr ""
+"Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
+"giltzarrapoaren ikonoan."
+
+#: mail/mail-format.c:1510
+#, fuzzy
+msgid "Could not create a PGP verfication context"
+msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
+
+#: mail/mail-format.c:1518
+msgid "This message is digitally signed and has been found to be authentic."
+msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
+
+#: mail/mail-format.c:1525
+msgid "This message is digitally signed but can not be proven to be authentic."
+msgstr ""
+"Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa dela."
+
+#: mail/mail-format.c:1789
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP gunerako erakuslea (%s)"
+
+#: mail/mail-format.c:1800
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
+
+#: mail/mail-format.c:1803
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "(%s) fitxategi lokalerako erakuslea"
+
+#: mail/mail-format.c:1830
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "(%s)urruneko datuetarako erakuslea"
+
+#: mail/mail-format.c:1836
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
+
+#: mail/mail-format.c:1838
+msgid "Malformed external-body part."
+msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
+
 #: mail/mail-local.c:541 mail/mail-local.c:543
 #, fuzzy, c-format
 msgid "Local folders/%s"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-local.c:711
+#: mail/mail-local.c:671
 msgid "Reconfiguring folder"
 msgstr "Karpeta birkonfiguratzen"
 
-#: mail/mail-local.c:792
+#: mail/mail-local.c:752
 #, fuzzy, c-format
 msgid ""
 "Cannot save folder metainfo; you may find you can't\n"
@@ -13288,22 +13589,22 @@ msgstr ""
 "Ezin da gorde karpetaren metainformazioa; beharbada karpeta\n"
 "hau ezingo duzu gehiago ireki: %s: %s"
 
-#: mail/mail-local.c:848
+#: mail/mail-local.c:808
 #, c-format
 msgid "Cannot save folder metainfo to %s: %s"
 msgstr "Ezin da karpetaren metainformazioa gorde %s(e)n: %s"
 
-#: mail/mail-local.c:900
+#: mail/mail-local.c:860
 #, c-format
 msgid "Cannot delete folder metadata %s: %s"
 msgstr "Ezin dira %s karpetaren metadatuak ezabatu: %s"
 
-#: mail/mail-local.c:1363
+#: mail/mail-local.c:1323
 #, c-format
 msgid "Changing folder \"%s\" to \"%s\" format"
 msgstr "\"%s\" karpeta\"%s\" formatura aldatzen"
 
-#: mail/mail-local.c:1388
+#: mail/mail-local.c:1348
 msgid ""
 "If you can no longer open this mailbox, then\n"
 "you may need to repair it manually."
@@ -13311,16 +13612,16 @@ msgstr ""
 "Aurrerantzean ezin baduzu postontzi hau ireki,\n"
 "eskuz konpondu beharko duzu."
 
-#: mail/mail-local.c:1488
+#: mail/mail-local.c:1448
 #, c-format
 msgid "Reconfigure /%s"
 msgstr "Birkonfiguratu /%s"
 
-#: mail/mail-local.c:1552
+#: mail/mail-local.c:1512
 msgid "You cannot change the format of a non-local folder."
 msgstr "Ezin duzu aldatu lokala ez den karpeta baten formatua."
 
-#: mail/mail-mt.c:259
+#: mail/mail-mt.c:257
 #, c-format
 msgid ""
 "Error while '%s':\n"
@@ -13329,7 +13630,7 @@ msgstr ""
 "Errorea '%s' saiatu denean:\n"
 "%s"
 
-#: mail/mail-mt.c:262
+#: mail/mail-mt.c:260
 #, c-format
 msgid ""
 "Error while performing operation:\n"
@@ -13338,131 +13639,118 @@ msgstr ""
 "Errorea eragiketa egitean:\n"
 "%s"
 
-#: mail/mail-mt.c:913
+#: mail/mail-mt.c:904
 msgid "Working"
 msgstr "Lanean"
 
-#: mail/mail-ops.c:87
+#: mail/mail-ops.c:86
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:260
+#: mail/mail-ops.c:264
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:557
-#, fuzzy, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
-
-#: mail/mail-ops.c:578
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local `Sent' folder instead."
-msgstr ""
-
-#: mail/mail-ops.c:587
-#, fuzzy, c-format
-msgid "Failed to append to local `Sent' folder: %s"
-msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
+#: mail/mail-ops.c:550 mail/mail-ops.c:579
+msgid "However, the message was successfully sent."
+msgstr "Hala ere, mezua ongi bidali da."
 
-#: mail/mail-ops.c:629
+#: mail/mail-ops.c:611
 #, c-format
 msgid "Sending \"%s\""
 msgstr "\"%s\" bidaltzen"
 
-#: mail/mail-ops.c:747
+#: mail/mail-ops.c:729
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:766
+#: mail/mail-ops.c:748
 #, c-format
 msgid "Failed on message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: mail/mail-ops.c:768
+#: mail/mail-ops.c:750 mail/mail-send-recv.c:581
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:862
+#: mail/mail-ops.c:844
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:943
+#: mail/mail-ops.c:925
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:1056
+#: mail/mail-ops.c:1042
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1244
+#: mail/mail-ops.c:1225
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1287
+#: mail/mail-ops.c:1268
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1359
+#: mail/mail-ops.c:1340
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1437
+#: mail/mail-ops.c:1413
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1531
+#: mail/mail-ops.c:1507
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1582
+#: mail/mail-ops.c:1558
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1618 mail/mail-ops.c:1669
+#: mail/mail-ops.c:1594 mail/mail-ops.c:1645
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1666
+#: mail/mail-ops.c:1642
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "%s inportatzen %s gisa."
 
-#: mail/mail-ops.c:1667 my-evolution/e-summary-mail.c:483
+#: mail/mail-ops.c:1643 my-evolution/e-summary-mail.c:483
 #: shell/e-local-storage.c:1151
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1742
+#: mail/mail-ops.c:1718
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua berreskuratzen"
 
-#: mail/mail-ops.c:1814
+#: mail/mail-ops.c:1790
 #, c-format
 msgid "Retrieving %d message(s)"
 msgstr "%d mezu berreskuratzen"
 
-#: mail/mail-ops.c:1898
+#: mail/mail-ops.c:1876
 #, c-format
 msgid "Saving %d messsage(s)"
 msgstr "%d mezu gordetzen"
 
-#: mail/mail-ops.c:1946
+#: mail/mail-ops.c:1924
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -13471,7 +13759,7 @@ msgstr ""
 "Ezin da sortu irteerako fitxategia: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1974
+#: mail/mail-ops.c:1952
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -13480,11 +13768,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2045
+#: mail/mail-ops.c:2026
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2062
+#: mail/mail-ops.c:2043
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -13493,75 +13781,107 @@ msgstr ""
 "Ezin da irteerako fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2092
+#: mail/mail-ops.c:2073
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s(e)tik deskonektatzen"
 
-#: mail/mail-ops.c:2240
+#: mail/mail-ops.c:2221
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(r)ekin berriro konektatzen"
 
-#: mail/mail-send-recv.c:147
+#: mail/mail-search.c:154
+msgid "(Untitled Message)"
+msgstr "(Mezu izengabea)"
+
+#: mail/mail-search.c:236
+msgid "Untitled Message"
+msgstr "Mezu izengabea"
+
+#: mail/mail-search.c:238
+msgid "Empty Message"
+msgstr "Mezu hutsa"
+
+#: mail/mail-search.c:287
+msgid "Find in Message"
+msgstr "Bilatu mezuan"
+
+#: mail/mail-search.c:320
+msgid "Case Sensitive"
+msgstr "Maiuskula/minuskula"
+
+#: mail/mail-search.c:322
+msgid "Search Forward"
+msgstr "Bilatu aurrerantz"
+
+#: mail/mail-search.c:342
+msgid "Find:"
+msgstr "Bilatu:"
+
+#: mail/mail-search.c:346
+msgid "Matches:"
+msgstr "Bat datozenak:"
+
+#: mail/mail-send-recv.c:146
 msgid "Cancelling..."
 msgstr "Bertan behera uzten..."
 
-#: mail/mail-send-recv.c:255
+#: mail/mail-send-recv.c:254
 #, c-format
 msgid "Server: %s, Type: %s"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:257
+#: mail/mail-send-recv.c:256
 #, c-format
 msgid "Path: %s, Type: %s"
 msgstr "Bide-izena: %s, Mota: %s"
 
-#: mail/mail-send-recv.c:259
+#: mail/mail-send-recv.c:258
 #, c-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: mail/mail-send-recv.c:308
+#: mail/mail-send-recv.c:306
 msgid "Send & Receive Mail"
 msgstr "Mezuak bidali eta jaso"
 
-#: mail/mail-send-recv.c:309
+#: mail/mail-send-recv.c:307
 #, fuzzy
 msgid "Cancel _All"
 msgstr "Utzi dena"
 
-#: mail/mail-send-recv.c:390
+#: mail/mail-send-recv.c:389
 msgid "Updating..."
 msgstr "Eguneratzen..."
 
-#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:442
+#: mail/mail-send-recv.c:390 mail/mail-send-recv.c:446
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:229
+#: mail/mail-session.c:226
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:262
+#: mail/mail-session.c:259
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:264
+#: mail/mail-session.c:261
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:287
+#: mail/mail-session.c:284
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:288
+#: mail/mail-session.c:285
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Gogoratu pasahitz hau saio hau amaitu arte"
@@ -13612,17 +13932,21 @@ msgstr "Birbidalitako mezua - %s"
 msgid "Forwarded message"
 msgstr "Birbidalitako mezua"
 
-#: mail/mail-vfolder.c:91
+#: mail/mail-tools.c:438
+msgid "Forwarded Message"
+msgstr "Birbidalitako mezua"
+
+#: mail/mail-vfolder.c:92
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:209
+#: mail/mail-vfolder.c:210
 #, c-format
 msgid "Updating vfolders for uri: %s"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:467
+#: mail/mail-vfolder.c:468
 #, c-format
 msgid ""
 "The following vFolder(s):\n"
@@ -13635,95 +13959,100 @@ msgstr ""
 "    '%s'\n"
 "Eta eguneratu egin dira."
 
-#: mail/mail-vfolder.c:776
+#: mail/mail-vfolder.c:777
 msgid "VFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:834
+#: mail/mail-vfolder.c:835
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:873
+#: mail/mail-vfolder.c:874
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:893
+#: mail/mail-vfolder.c:894
 #, c-format
 msgid "Trying to edit a vfolder '%s' which doesn't exist."
 msgstr "'%s' kBirtuala editatu nahian dabil, baina ez dago."
 
-#: mail/mail-vfolder.c:965
+#: mail/mail-vfolder.c:966
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-list.c:900
+#: mail/message-browser.c:233
+msgid "(No subject)"
+msgstr "(Gairik ez)"
+
+#: mail/message-browser.c:235
+#, c-format
+msgid "%s - Message"
+msgstr "%s - Mezua"
+
+#: mail/message-list.c:741
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:901
+#: mail/message-list.c:742
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:902
+#: mail/message-list.c:743
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:903
+#: mail/message-list.c:744
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:904
+#: mail/message-list.c:745
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:908
+#: mail/message-list.c:749
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:909
+#: mail/message-list.c:750
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:754
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:755
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1231
+#: mail/message-list.c:1072
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1238
+#: mail/message-list.c:1079
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1247
+#: mail/message-list.c:1088
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1259
+#: mail/message-list.c:1100
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1267
+#: mail/message-list.c:1108
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1269
+#: mail/message-list.c:1110
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3062
+#: mail/message-list.c:2649
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
-#: mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
 #: mail/message-list.etspec.h:3
 msgid "Due By"
 msgstr "Noizko: "
@@ -13740,10 +14069,6 @@ msgstr "Banderaduna"
 msgid "Follow Up Flag"
 msgstr "Jarraitu banderari"
 
-#: mail/message-list.etspec.h:7 mail/message-tag-followup.c:301
-msgid "From"
-msgstr "Nork"
-
 #: mail/message-list.etspec.h:8
 #, fuzzy
 msgid "Original Location"
@@ -13757,10 +14082,6 @@ msgstr "Jasotze-data"
 msgid "Size"
 msgstr "Tamaina"
 
-#: mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Nori"
-
 #: mail/message-tag-followup.c:62
 #, fuzzy
 msgid "Call"
@@ -13781,7 +14102,7 @@ msgstr "Jarraitu"
 msgid "For Your Information"
 msgstr "Iturburu-informazioa"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:40
+#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:36
 msgid "Forward"
 msgstr "Birbidali"
 
@@ -13789,11 +14110,11 @@ msgstr "Birbidali"
 msgid "No Response Necessary"
 msgstr ""
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:77
+#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:72
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:78
+#: mail/message-tag-followup.c:70 ui/evolution-mail-message.xml.h:73
 msgid "Reply to All"
 msgstr "Erantzun denei"
 
@@ -13828,6 +14149,39 @@ msgstr "Noizko: "
 msgid "_Flag:"
 msgstr "Fitxategi-izena:"
 
+#: mail/subscribe-dialog.c:230
+#, c-format
+msgid "Scanning folders under %s on \"%s\""
+msgstr "\"%2$s\"(e)ko %1$s(r)en azpian dauden karpetak eskaneatzen"
+
+#: mail/subscribe-dialog.c:232
+#, c-format
+msgid "Scanning root-level folders on \"%s\""
+msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
+
+#: mail/subscribe-dialog.c:329
+#, c-format
+msgid "Subscribing to folder \"%s\""
+msgstr "\"%s\" karpetan harpidetzen"
+
+#: mail/subscribe-dialog.c:331
+#, c-format
+msgid "Unsubscribing to folder \"%s\""
+msgstr "\"%s\" karpetaren harpidetza kentzen"
+
+#: mail/subscribe-dialog.c:1270 mail/subscribe-dialog.etspec.h:1
+#: shell/e-storage-set-view.etspec.h:2
+msgid "Folder"
+msgstr "Karpeta"
+
+#: mail/subscribe-dialog.c:1499
+msgid "No server has been selected"
+msgstr "Ez da zerbitzaririk hautatu"
+
+#: mail/subscribe-dialog.c:1598
+msgid "Please select a server."
+msgstr "Hautatu zerbitzari bat."
+
 #: mail/subscribe-dialog.glade.h:1
 #, fuzzy
 msgid "Folder Subscriptions"
@@ -13844,128 +14198,18 @@ msgid "S_erver:"
 msgstr "Zer_bitzariaren izena:"
 
 #: mail/subscribe-dialog.glade.h:4
+#, fuzzy
+msgid "Scanning folders ..."
+msgstr "Gorde karpetan..."
+
+#: mail/subscribe-dialog.glade.h:5
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: mail/subscribe-dialog.glade.h:5
+#: mail/subscribe-dialog.glade.h:6
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
-#: my-evolution/component-factory.c:56
-msgid "Folder containing the Evolution Summary"
-msgstr "Evolution-en laburpena daukan karpeta"
-
-#: my-evolution/e-summary.c:204
-msgid "%A, %B %e %Y"
-msgstr "%A, %Y %B %e"
-
-#: my-evolution/e-summary.c:533
-msgid "Please wait..."
-msgstr "Itxaron..."
-
-#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
-msgid "Print Summary"
-msgstr "Inprimatu laburpena"
-
-#: my-evolution/e-summary.c:655
-msgid "Printing of Summary failed"
-msgstr "Huts egin du laburpena inprimatzean"
-
-#: my-evolution/e-summary-calendar.c:384
-msgid "Appointments"
-msgstr "Hitzorduak"
-
-#: my-evolution/e-summary-calendar.c:392
-#, fuzzy
-msgid "No appointments."
-msgstr "Hitzordurik ez"
-
-#: my-evolution/e-summary-calendar.c:409
-msgid "%k:%M %d %B"
-msgstr "%k:%M %B %d"
-
-#: my-evolution/e-summary-calendar.c:411
-#, fuzzy
-msgid "%l:%M%p %d %B"
-msgstr "%l:%M %B %d"
-
-#: my-evolution/e-summary-calendar.c:429
-msgid "No description"
-msgstr "Azalpenik ez"
-
-#: my-evolution/e-summary-mail.c:189
-msgid "Mail summary"
-msgstr "Posta-laburpena"
-
-#: my-evolution/e-summary-preferences.c:355
-msgid "Dictionary.com Word of the Day"
-msgstr "Dictionary.com-en Eguneko Hitza"
-
-#: my-evolution/e-summary-preferences.c:373
-msgid "Quotes of the Day"
-msgstr "Eguneko aipuak"
-
-#: my-evolution/e-summary-preferences.c:565
-#, fuzzy
-msgid "New News Feed"
-msgstr "Berri-iturriak"
-
-#: my-evolution/e-summary-preferences.c:581
-#, fuzzy
-msgid "_URL:"
-msgstr "URLa:"
-
-#: my-evolution/e-summary-rdf.c:315
-msgid "Error downloading RDF"
-msgstr "Errorea RDF deskargatzean"
-
-#: my-evolution/e-summary-rdf.c:453
-msgid "News Feed"
-msgstr "Berri-iturriak"
-
-#: my-evolution/e-summary-shown.c:496
-#, fuzzy
-msgid "All"
-msgstr "McAllen"
-
-#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
-#, fuzzy
-msgid "Shown"
-msgstr "Shannon"
-
-#: my-evolution/e-summary-tasks.c:349
-msgid "No tasks"
-msgstr "Zereginik ez"
-
-#: my-evolution/e-summary-tasks.c:387
-#, fuzzy
-msgid "blue"
-msgstr "Ambler"
-
-#: my-evolution/e-summary-tasks.c:387
-msgid "(No Description)"
-msgstr "(Azalpenik ez)"
-
-#: my-evolution/e-summary-weather.c:72
-msgid "My Weather"
-msgstr "Eguraldia"
-
-#: my-evolution/e-summary-weather.c:261
-msgid "There was an error downloading data for"
-msgstr "Errorea izan da datuak deskargatzean"
-
-#: my-evolution/e-summary-weather.c:478 my-evolution/my-evolution.glade.h:16
-msgid "Weather"
-msgstr "Eguraldia"
-
-#. translators: Put here a list of codes for locations you want to
-#. see in My Evolution by default. You can find the list of all
-#. stations and their codes in Evolution sources
-#. (evolution/my-evolution/Locations)
-#: my-evolution/e-summary-weather.c:582
-msgid "KBOS"
-msgstr "KBOS"
-
 #: my-evolution/GNOME_Evolution_Summary.server.in.in.h:1
 #, fuzzy
 msgid "Configure the appearance of the Evolution Summary here"
@@ -23779,6 +24023,116 @@ msgstr "Zuni Pueblo"
 msgid "Zurich"
 msgstr "Zurich"
 
+#: my-evolution/component-factory.c:56
+msgid "Folder containing the Evolution Summary"
+msgstr "Evolution-en laburpena daukan karpeta"
+
+#: my-evolution/e-summary-calendar.c:381
+msgid "Appointments"
+msgstr "Hitzorduak"
+
+#: my-evolution/e-summary-calendar.c:389
+#, fuzzy
+msgid "No appointments."
+msgstr "Hitzordurik ez"
+
+#: my-evolution/e-summary-calendar.c:406
+msgid "%k:%M %d %B"
+msgstr "%k:%M %B %d"
+
+#: my-evolution/e-summary-calendar.c:408
+#, fuzzy
+msgid "%l:%M%P %d %B"
+msgstr "%l:%M %B %d"
+
+#: my-evolution/e-summary-calendar.c:426
+msgid "No description"
+msgstr "Azalpenik ez"
+
+#: my-evolution/e-summary-mail.c:189
+msgid "Mail summary"
+msgstr "Posta-laburpena"
+
+#: my-evolution/e-summary-preferences.c:355
+msgid "Dictionary.com Word of the Day"
+msgstr "Dictionary.com-en Eguneko Hitza"
+
+#: my-evolution/e-summary-preferences.c:373
+msgid "Quotes of the Day"
+msgstr "Eguneko aipuak"
+
+#: my-evolution/e-summary-preferences.c:565
+#, fuzzy
+msgid "New News Feed"
+msgstr "Berri-iturriak"
+
+#: my-evolution/e-summary-preferences.c:581
+#, fuzzy
+msgid "_URL:"
+msgstr "URLa:"
+
+#: my-evolution/e-summary-rdf.c:315
+msgid "Error downloading RDF"
+msgstr "Errorea RDF deskargatzean"
+
+#: my-evolution/e-summary-rdf.c:453
+msgid "News Feed"
+msgstr "Berri-iturriak"
+
+#: my-evolution/e-summary-shown.c:496
+#, fuzzy
+msgid "All"
+msgstr "McAllen"
+
+#: my-evolution/e-summary-shown.c:521 my-evolution/e-summary-table.c:58
+#, fuzzy
+msgid "Shown"
+msgstr "Shannon"
+
+#: my-evolution/e-summary-tasks.c:330
+msgid "No tasks"
+msgstr "Zereginik ez"
+
+#: my-evolution/e-summary-tasks.c:364
+msgid "(No Description)"
+msgstr "(Azalpenik ez)"
+
+#: my-evolution/e-summary-weather.c:73
+msgid "My Weather"
+msgstr "Eguraldia"
+
+#: my-evolution/e-summary-weather.c:262
+msgid "There was an error downloading data for"
+msgstr "Errorea izan da datuak deskargatzean"
+
+#: my-evolution/e-summary-weather.c:479 my-evolution/my-evolution.glade.h:16
+msgid "Weather"
+msgstr "Eguraldia"
+
+#. translators: Put here a list of codes for locations you want to
+#. see in My Evolution by default. You can find the list of all
+#. stations and their codes in Evolution sources
+#. (evolution/my-evolution/Locations)
+#: my-evolution/e-summary-weather.c:583
+msgid "KBOS"
+msgstr "KBOS"
+
+#: my-evolution/e-summary.c:204
+msgid "%A, %B %e %Y"
+msgstr "%A, %Y %B %e"
+
+#: my-evolution/e-summary.c:533
+msgid "Please wait..."
+msgstr "Itxaron..."
+
+#: my-evolution/e-summary.c:622 ui/my-evolution.xml.h:2
+msgid "Print Summary"
+msgstr "Inprimatu laburpena"
+
+#: my-evolution/e-summary.c:655
+msgid "Printing of Summary failed"
+msgstr "Huts egin du laburpena inprimatzean"
+
 #: my-evolution/metar.c:30
 msgid " F"
 msgstr " °F"
@@ -25044,27 +25398,24 @@ msgstr "E_gun bat"
 msgid "_Show full path for folders"
 msgstr "_Erakutsi karpeten bide-izen osoa"
 
-#: notes/component-factory.c:27
-#: shell/e-shell-user-creatable-items-handler.c:587
-#: shell/e-shell-user-creatable-items-handler.c:643
-#: widgets/misc/e-charset-picker.c:109
-msgid "New"
-msgstr "Berria"
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Configure special folders and offline folder behavior here"
+msgstr ""
 
-#: notes/component-factory.c:27
+#: shell/GNOME_Evolution_Shell.server.in.in.h:2
 #, fuzzy
-msgid "Create a new note"
-msgstr "Sortu karpeta berria"
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a."
 
-#: notes/component-factory.c:152
+#: shell/GNOME_Evolution_Shell.server.in.in.h:3
 #, fuzzy
-msgid "Cannot initialize Evolution's notes component."
-msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en Zereginen kontrolerako fabrika."
 
-#: notes/main.c:30
+#: shell/GNOME_Evolution_Shell.server.in.in.h:4
 #, fuzzy
-msgid "Notes Component: Could not initialize bonobo"
-msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
+msgid "Folder Settings"
+msgstr "Postaren ezarpenak"
 
 #: shell/e-activity-handler.c:164
 msgid "Show Details"
@@ -25161,50 +25512,6 @@ msgstr ""
 msgid "Brought to you by"
 msgstr "Hauei esker daukazu:"
 
-#: shell/e-shell.c:175
-#, fuzzy, c-format
-msgid ""
-"Cannot activate component %s :\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Aktibazio-sistemak eman duen errorea:\n"
-"%s"
-
-#: shell/e-shell.c:741
-#, c-format
-msgid "Cannot set up local storage -- %s"
-msgstr "Ezin da biltegi lokala ezarri -- %s"
-
-#: shell/e-shell.c:1804
-#, c-format
-msgid ""
-"The Evolution component that handles folders of type \"%s\"\n"
-"has unexpectedly quit. You will need to quit Evolution and restart\n"
-"in order to access that data again."
-msgstr ""
-"\"%s\" motako karpetak maneiatzen dituen Evolution osagaia\n"
-"ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
-"duzu datu horiek berriro atzitzeko."
-
-#: shell/e-shell.c:2069
-msgid "Invalid arguments"
-msgstr "Argumentu baliogabeak"
-
-#: shell/e-shell.c:2071
-msgid "Cannot register on OAF"
-msgstr "Ezin da OAFen erregistratu"
-
-#: shell/e-shell.c:2073
-msgid "Configuration Database not found"
-msgstr "Ez da aurkitu konfigurazioko datu-basea"
-
-#: shell/e-shell.c:2075 shell/e-storage.c:568
-msgid "Generic error"
-msgstr "Errore generikoa"
-
 #: shell/e-shell-config-autocompletion.c:110
 #, fuzzy
 msgid "Extra Completion folders"
@@ -25302,32 +25609,27 @@ msgstr ""
 "Ezin izan da karpetaren izena aldatu:\n"
 "%s"
 
-#: shell/e-shell-folder-commands.c:534
+#: shell/e-shell-folder-commands.c:538
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: shell/e-shell-folder-commands.c:541
+#: shell/e-shell-folder-commands.c:544
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: shell/e-shell-folder-commands.c:547
+#: shell/e-shell-folder-commands.c:553
 #: shell/e-shell-folder-creation-dialog.c:180
 #, c-format
 msgid "The specified folder name is not valid: %s"
 msgstr "Adierazitako karpeta-izena ez da baliozkoa: %s"
 
-#: shell/e-shell-folder-commands.c:554
-#, c-format
-msgid "A folder named \"%s\" already exists. Please use a different name."
-msgstr ""
-
-#: shell/e-shell-folder-commands.c:584
+#: shell/e-shell-folder-commands.c:587
 msgid "Selected folder does not belong to another user"
 msgstr ""
 
-#: shell/e-shell-folder-commands.c:587
+#: shell/e-shell-folder-commands.c:590
 #, fuzzy, c-format
 msgid ""
 "Cannot remove folder:\n"
@@ -25372,19 +25674,11 @@ msgstr ""
 "Ez badakizu, \"Automatikoa\" hauta dezakezu eta Evolution saiatuko da "
 "bideratzen."
 
-#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:724
+#: shell/e-shell-importer.c:148 shell/e-shell-startup-wizard.c:709
 msgid "Please select the information that you would like to import:"
 msgstr "Hautatu inportatu nahi duzun informazioa:"
 
-#: shell/e-shell-importer.c:151
-msgid ""
-"Evolution checked for settings to import from the following\n"
-"applications: Pine, Netscape, Elm, iCalendar. No settings\n"
-"that could be imported where found. If you would like to\n"
-"try again, please click the \"Back\" button.\n"
-msgstr ""
-
-#: shell/e-shell-importer.c:219 shell/e-shell-importer.c:250
+#: shell/e-shell-importer.c:213 shell/e-shell-importer.c:244
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25393,22 +25687,22 @@ msgstr ""
 "%s inportatzen\n"
 "%d elementua inportatzen."
 
-#: shell/e-shell-importer.c:323
+#: shell/e-shell-importer.c:317
 #, fuzzy
 msgid "Select importer"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:464
+#: shell/e-shell-importer.c:458
 #, c-format
 msgid "File %s does not exist"
 msgstr "'%s' fitxategia ez dago "
 
-#: shell/e-shell-importer.c:465 shell/e-shell-importer.c:482
-#: shell/e-shell-importer.c:524
+#: shell/e-shell-importer.c:459 shell/e-shell-importer.c:476
+#: shell/e-shell-importer.c:518
 msgid "Evolution Error"
 msgstr "Evolution errorea "
 
-#: shell/e-shell-importer.c:481
+#: shell/e-shell-importer.c:475
 #, c-format
 msgid ""
 "There is no importer that is able to handle\n"
@@ -25417,11 +25711,11 @@ msgstr ""
 "Ez dago %s maneiatzeko\n"
 "gai den inportatzailerik"
 
-#: shell/e-shell-importer.c:490
+#: shell/e-shell-importer.c:484
 msgid "Importing"
 msgstr "Inportatzen"
 
-#: shell/e-shell-importer.c:497
+#: shell/e-shell-importer.c:491
 #, c-format
 msgid ""
 "Importing %s.\n"
@@ -25430,17 +25724,17 @@ msgstr ""
 "%s inportatzen.\n"
 "%s abiarazten"
 
-#: shell/e-shell-importer.c:509
+#: shell/e-shell-importer.c:503
 #, c-format
 msgid "Error starting %s"
 msgstr "Errorea %s abiaraztean"
 
-#: shell/e-shell-importer.c:523
+#: shell/e-shell-importer.c:517
 #, c-format
 msgid "Error loading %s"
 msgstr "Errorea %s kargatzean"
 
-#: shell/e-shell-importer.c:540
+#: shell/e-shell-importer.c:534
 #, c-format
 msgid ""
 "Importing %s\n"
@@ -25449,35 +25743,31 @@ msgstr ""
 "%s inportatzen\n"
 "1. elementua inportatzen."
 
-#: shell/e-shell-importer.c:594
+#: shell/e-shell-importer.c:588
 msgid "Automatic"
 msgstr "Automatikoa"
 
-#: shell/e-shell-importer.c:643
-#, fuzzy
-msgid "_Filename:"
+#: shell/e-shell-importer.c:637
+msgid "Filename:"
 msgstr "Fitxategi-izena:"
 
-#: shell/e-shell-importer.c:648
+#: shell/e-shell-importer.c:642
 msgid "Select a file"
 msgstr "Hautatu fitxategia"
 
-#: shell/e-shell-importer.c:658
-#, fuzzy
-msgid "File _type:"
+#: shell/e-shell-importer.c:651
+msgid "File type:"
 msgstr "Fitxategi-mota:"
 
-#: shell/e-shell-importer.c:684
-#, fuzzy
-msgid "Import data and settings from _older programs"
+#: shell/e-shell-importer.c:676
+msgid "Import data and settings from older programs"
 msgstr "Inportatu programa zaharretako datuak eta ezarpenak"
 
-#: shell/e-shell-importer.c:687
-#, fuzzy
-msgid "Import a _single file"
+#: shell/e-shell-importer.c:680
+msgid "Import a single file"
 msgstr "Inportatu fitxategi bakarra"
 
-#: shell/e-shell-importer.c:755 shell/e-shell-startup-wizard.c:553
+#: shell/e-shell-importer.c:746 shell/e-shell-startup-wizard.c:538
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -25485,26 +25775,25 @@ msgstr ""
 "Itxaron...\n"
 "Lehengo instalazio bila eskaneatzen"
 
-#: shell/e-shell-importer.c:758
+#: shell/e-shell-importer.c:749
 msgid "Starting Intelligent Importers"
 msgstr "Inportatzaile adimendunak abiarazten"
 
-#: shell/e-shell-importer.c:884 shell/e-shell-startup-wizard.c:679
+#: shell/e-shell-importer.c:873 shell/e-shell-startup-wizard.c:664
 #, c-format
 msgid "From %s:"
 msgstr "%s(e)tik:"
 
-#: shell/e-shell-importer.c:1061
+#: shell/e-shell-importer.c:1047
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: shell/e-shell-importer.c:1062
+#: shell/e-shell-importer.c:1048
 msgid "Select a destination folder for importing this data"
 msgstr "Aukeratu datu hauek inportatzeko helburu-karpeta"
 
-#: shell/e-shell-importer.c:1193
-#, fuzzy
-msgid "_Import"
+#: shell/e-shell-importer.c:1178 shell/importer/intelligent.c:191
+msgid "Import"
 msgstr "Inportatu"
 
 #: shell/e-shell-offline-handler.c:592
@@ -25571,19 +25860,11 @@ msgstr ""
 "Ezin da sortu adierazitako karpeta:\n"
 "%s"
 
-#: shell/e-shell-startup-wizard.c:771
-msgid ""
-"If you quit the Evolution Setup Assistant now, all of the information that "
-"you have entered will be forgotten. You will need to run this assistant "
-"again before using Evolution.\n"
-"\n"
-"Do you want to quit using the Assistant now?"
-msgstr ""
-
-#: shell/e-shell-startup-wizard.c:782
-#, fuzzy
-msgid "Quit Assistant"
-msgstr "Laguntzailea"
+#: shell/e-shell-user-creatable-items-handler.c:586
+#: shell/e-shell-user-creatable-items-handler.c:642
+#: widgets/misc/e-charset-picker.c:109
+msgid "New"
+msgstr "Berria"
 
 #: shell/e-shell-utils.c:116
 msgid "No folder name specified."
@@ -25607,37 +25888,6 @@ msgstr "Karpeta-izenak ezin du Itzulera karaktererik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-view.c:264
-msgid "(No folder displayed)"
-msgstr "(Ez dago karpetarik bistaratuta)"
-
-#: shell/e-shell-view.c:2040
-#, c-format
-msgid "%s (%d)"
-msgstr "%s (%d)"
-
-#: shell/e-shell-view.c:2042
-msgid "(None)"
-msgstr "(bat ere ez)"
-
-#: shell/e-shell-view.c:2083
-msgid ""
-"Ximian 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-view.c:2090
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
-
-#: shell/e-shell-view.c:2096
-msgid ""
-"Ximian 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-view-menu.c:89
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Ez dirudi GNOME Pilot tresnak instalatuta dauzkazunik sisteman."
@@ -25689,13 +25939,80 @@ msgstr "_Lan egin lineaz kanpo"
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shortcuts.c:649
-msgid "Error saving shortcuts."
-msgstr "Errorea lasterbideak gordetzean."
+#: shell/e-shell-view.c:264
+msgid "(No folder displayed)"
+msgstr "(Ez dago karpetarik bistaratuta)"
 
-#: shell/e-shortcuts.c:1096
-msgid "Shortcuts"
-msgstr "Lasterbideak"
+#: shell/e-shell-view.c:2040
+#, c-format
+msgid "%s (%d)"
+msgstr "%s (%d)"
+
+#: shell/e-shell-view.c:2042
+msgid "(None)"
+msgstr "(bat ere ez)"
+
+#: shell/e-shell-view.c:2083
+msgid ""
+"Ximian 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-view.c:2090
+msgid "Ximian Evolution is in the process of going offline."
+msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
+
+#: shell/e-shell-view.c:2096
+msgid ""
+"Ximian 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.c:175
+#, fuzzy, c-format
+msgid ""
+"Cannot activate component %s :\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Aktibazio-sistemak eman duen errorea:\n"
+"%s"
+
+#: shell/e-shell.c:741
+#, c-format
+msgid "Cannot set up local storage -- %s"
+msgstr "Ezin da biltegi lokala ezarri -- %s"
+
+#: shell/e-shell.c:1804
+#, c-format
+msgid ""
+"The Evolution component that handles folders of type \"%s\"\n"
+"has unexpectedly quit. You will need to quit Evolution and restart\n"
+"in order to access that data again."
+msgstr ""
+"\"%s\" motako karpetak maneiatzen dituen Evolution osagaia\n"
+"ustekabean itxi da. Evolution-etik irten eta berriro sartu beharko \n"
+"duzu datu horiek berriro atzitzeko."
+
+#: shell/e-shell.c:2069
+msgid "Invalid arguments"
+msgstr "Argumentu baliogabeak"
+
+#: shell/e-shell.c:2071
+msgid "Cannot register on OAF"
+msgstr "Ezin da OAFen erregistratu"
+
+#: shell/e-shell.c:2073
+msgid "Configuration Database not found"
+msgstr "Ez da aurkitu konfigurazioko datu-basea"
+
+#: shell/e-shell.c:2075 shell/e-storage.c:568
+msgid "Generic error"
+msgstr "Errore generikoa"
 
 #: shell/e-shortcuts-view.c:80
 #, fuzzy
@@ -25817,6 +26134,19 @@ msgstr "_Kendu"
 msgid "Remove this shortcut from the shortcut bar"
 msgstr "Kendu lasterbide hau lasterbide-barratik"
 
+#: shell/e-shortcuts.c:649
+msgid "Error saving shortcuts."
+msgstr "Errorea lasterbideak gordetzean."
+
+#: shell/e-shortcuts.c:1096
+msgid "Shortcuts"
+msgstr "Lasterbideak"
+
+#: shell/e-storage-set-view.etspec.h:1
+#, fuzzy
+msgid "Checkbox"
+msgstr "Chico"
+
 #: shell/e-storage.c:566
 msgid "No error"
 msgstr "Errorerik ez"
@@ -25873,15 +26203,6 @@ msgstr "Ezin da izen horretako karpetarik sortu"
 msgid "This operation cannot be performed in off-line mode"
 msgstr ""
 
-#: shell/e-storage-set-view.etspec.h:1
-#, fuzzy
-msgid "Checkbox"
-msgstr "Chico"
-
-#: shell/e-storage-set-view.etspec.h:2
-msgid "Folder"
-msgstr "Karpeta"
-
 #: shell/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -25896,103 +26217,103 @@ msgstr "%s (%%%d osatuta)"
 msgid "<click here to select a folder>"
 msgstr "<egin klik hemen karpeta hautatzeko>"
 
-#: shell/evolution-shell-component.c:1187
+#: shell/evolution-shell-component-utils.c:124
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Unknown error."
+msgstr ""
+"%s\n"
+"\n"
+"Errore ezezaguna."
+
+#: shell/evolution-shell-component-utils.c:127
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the component system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Osagai-sistemak eman duen errorea:\n"
+"%s"
+
+#: shell/evolution-shell-component-utils.c:134
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"The error from the activation system is:\n"
+"%s"
+msgstr ""
+"%s\n"
+"\n"
+"Aktibazio-sistemak eman duen errorea:\n"
+"%s"
+
+#: shell/evolution-shell-component.c:1184
 msgid "CORBA error"
 msgstr "CORBA errorea"
 
-#: shell/evolution-shell-component.c:1189
+#: shell/evolution-shell-component.c:1186
 msgid "Interrupted"
 msgstr "Etenda"
 
-#: shell/evolution-shell-component.c:1191
+#: shell/evolution-shell-component.c:1188
 msgid "Invalid argument"
 msgstr "Argumentu baliogabea"
 
-#: shell/evolution-shell-component.c:1193
+#: shell/evolution-shell-component.c:1190
 msgid "Already has an owner"
 msgstr "Badu jabea"
 
-#: shell/evolution-shell-component.c:1195
+#: shell/evolution-shell-component.c:1192
 msgid "No owner"
 msgstr "Jaberik ez"
 
-#: shell/evolution-shell-component.c:1197
+#: shell/evolution-shell-component.c:1194
 msgid "Not found"
 msgstr "Ez da aurkitu"
 
-#: shell/evolution-shell-component.c:1199
+#: shell/evolution-shell-component.c:1196
 msgid "Unsupported type"
 msgstr "Onartzen ez den mota"
 
-#: shell/evolution-shell-component.c:1201
+#: shell/evolution-shell-component.c:1198
 msgid "Unsupported schema"
 msgstr "Onartzen ez den eskema"
 
-#: shell/evolution-shell-component.c:1203
+#: shell/evolution-shell-component.c:1200
 msgid "Unsupported operation"
 msgstr "Onartzen ez den eragiketa"
 
-#: shell/evolution-shell-component.c:1205
+#: shell/evolution-shell-component.c:1202
 msgid "Internal error"
 msgstr "Barne-errorea"
 
-#: shell/evolution-shell-component.c:1209
+#: shell/evolution-shell-component.c:1206
 msgid "Exists"
 msgstr "Badago"
 
-#: shell/evolution-shell-component.c:1211
+#: shell/evolution-shell-component.c:1208
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: shell/evolution-shell-component.c:1215
+#: shell/evolution-shell-component.c:1212
 msgid "Has subfolders"
 msgstr "Azpikarpetak ditu"
 
-#: shell/evolution-shell-component.c:1217
+#: shell/evolution-shell-component.c:1214
 msgid "No space left"
 msgstr "Ez dago lekurik"
 
-#: shell/evolution-shell-component.c:1219
+#: shell/evolution-shell-component.c:1216
 msgid "Old owner has died"
 msgstr "Jabe zaharra hil egin da"
 
-#: shell/evolution-shell-component-utils.c:124
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Unknown error."
-msgstr ""
-"%s\n"
-"\n"
-"Errore ezezaguna."
-
-#: shell/evolution-shell-component-utils.c:127
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the component system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Osagai-sistemak eman duen errorea:\n"
-"%s"
-
-#: shell/evolution-shell-component-utils.c:134
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"The error from the activation system is:\n"
-"%s"
-msgstr ""
-"%s\n"
-"\n"
-"Aktibazio-sistemak eman duen errorea:\n"
-"%s"
-
 #: shell/evolution-test-component.c:63
 msgid "Test type"
 msgstr "Proba-mota:"
@@ -26113,25 +26434,6 @@ msgstr ""
 "\n"
 "Egin klik \"Amaitu\" botoian, ezarpenak gordetzeko. "
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Configure special folders and offline folder behavior here"
-msgstr ""
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution-en shell-a."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:3
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution-en Zereginen kontrolerako fabrika."
-
-#: shell/GNOME_Evolution_Shell.server.in.in.h:4
-#, fuzzy
-msgid "Folder Settings"
-msgstr "Postaren ezarpenak"
-
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Egin klik \"Inportatu\"n fitxategia Evolution-era inportatzen hasteko."
@@ -26170,10 +26472,6 @@ msgstr ""
 msgid "Importers"
 msgstr "Inportatzaileak"
 
-#: shell/importer/intelligent.c:191
-msgid "Import"
-msgstr "Inportatu"
-
 #: shell/importer/intelligent.c:195
 msgid "Don't import"
 msgstr "Ez inportatu"
@@ -26363,7 +26661,7 @@ msgstr "Eraman kontaktua(k) beste karpeta batera..."
 msgid "Move to Folder..."
 msgstr "Eraman karpeta honetara..."
 
-#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:18
+#: ui/evolution-addressbook.xml.h:14 ui/evolution-calendar.xml.h:17
 msgid "Paste the clipboard"
 msgstr "Itsatsi arbela"
 
@@ -26371,9 +26669,9 @@ msgstr "Itsatsi arbela"
 msgid "Previews the contacts to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:20
-#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:73
-#: ui/evolution-tasks.xml.h:13
+#: ui/evolution-addressbook.xml.h:17 ui/evolution-calendar.xml.h:19
+#: ui/evolution-comp-editor.xml.h:9 ui/evolution-mail-message.xml.h:68
+#: ui/evolution-tasks.xml.h:12
 msgid "Print Pre_view"
 msgstr "_Inprimatzeko aurrebista"
 
@@ -26417,21 +26715,17 @@ msgstr "Utzi kargatzeari"
 msgid "View the current contact"
 msgstr "Ikusi uneko kontaktua"
 
-#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:32
-#: ui/evolution-comp-editor.xml.h:16 ui/evolution-contact-editor.xml.h:13
-#: ui/evolution-contact-list-editor.xml.h:11
+#: ui/evolution-addressbook.xml.h:29 ui/evolution-calendar.xml.h:28
+#: ui/evolution-comp-editor.xml.h:17 ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-list-editor.xml.h:10
 #: ui/evolution-event-editor.xml.h:11 ui/evolution-mail-global.xml.h:17
-#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-messagedisplay.xml.h:4
-#: ui/evolution-mail-message.xml.h:99 ui/evolution-task-editor.xml.h:9
-#: ui/evolution-tasks.xml.h:16 ui/evolution.xml.h:42
+#: ui/evolution-mail-list.xml.h:23 ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: ui/evolution-tasks.xml.h:14 ui/evolution.xml.h:42
 msgid "_Actions"
 msgstr "_Ekintzak"
 
-#: ui/evolution-addressbook.xml.h:31
-msgid "_Copy to Folder..."
-msgstr "K_opiatu karpeta honetan..."
-
-#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:16
+#: ui/evolution-addressbook.xml.h:34 ui/evolution-contact-editor.xml.h:13
 msgid "_Forward Contact..."
 msgstr "_Birbidali kontaktua..."
 
@@ -26502,61 +26796,46 @@ msgstr "Joan data jakin batera"
 msgid "Go to today"
 msgstr "_Joan gaurko egunera"
 
-#: ui/evolution-calendar.xml.h:17
+#: ui/evolution-calendar.xml.h:16
 msgid "Month"
 msgstr "_Hilabetea"
 
-#: ui/evolution-calendar.xml.h:19
+#: ui/evolution-calendar.xml.h:18
 msgid "Previews the calendar to be printed"
 msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
-#: ui/evolution-calendar.xml.h:21
+#: ui/evolution-calendar.xml.h:20
 msgid "Print this calendar"
 msgstr "Inprimatu egutegi hau"
 
-#: ui/evolution-calendar.xml.h:22
+#: ui/evolution-calendar.xml.h:21
 msgid "Publish Free/Busy information for this calendar"
 msgstr "Argitaratu egutegi honen libre/okupatuta informazioa"
 
-#: ui/evolution-calendar.xml.h:23 ui/evolution-tasks.xml.h:15
-#, fuzzy
-msgid "Purg_e"
-msgstr "Bourges"
-
-#: ui/evolution-calendar.xml.h:24
-#, fuzzy
-msgid "Purge old appointments and meetings"
-msgstr "Hitzorduak eta gertaerak dituen karpeta"
-
-#: ui/evolution-calendar.xml.h:25
-#, fuzzy
-msgid "Show as list"
-msgstr "Erakutsi xehetasunak"
-
-#: ui/evolution-calendar.xml.h:26
+#: ui/evolution-calendar.xml.h:22
 msgid "Show one day"
 msgstr "Erakutsi egun bat"
 
-#: ui/evolution-calendar.xml.h:27
+#: ui/evolution-calendar.xml.h:23
 msgid "Show one month"
 msgstr "Erakutsi hilabete bat"
 
-#: ui/evolution-calendar.xml.h:28
+#: ui/evolution-calendar.xml.h:24
 msgid "Show one week"
 msgstr "Erakutsi aste bat"
 
-#: ui/evolution-calendar.xml.h:29
+#: ui/evolution-calendar.xml.h:25
 msgid "Show the working week"
 msgstr "Erakutsi lan-astea"
 
-#: ui/evolution-calendar.xml.h:30
+#: ui/evolution-calendar.xml.h:26
 msgid "Week"
 msgstr "Astea"
 
-#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:2
-#: ui/evolution-contact-list-editor.xml.h:2
+#: ui/evolution-comp-editor.xml.h:2 ui/evolution-contact-editor.xml.h:1
+#: ui/evolution-contact-list-editor.xml.h:1
 #: ui/evolution-mail-messagedisplay.xml.h:1
-#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
+#: ui/evolution-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:1
 #: ui/evolution.xml.h:5
 msgid "Close"
 msgstr "Itxi"
@@ -26565,7 +26844,7 @@ msgstr "Itxi"
 msgid "Close this item"
 msgstr "Itxi elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:4
+#: ui/evolution-comp-editor.xml.h:5 ui/evolution-contact-editor.xml.h:3
 msgid "Delete this item"
 msgstr "Ezabatu elementu hau"
 
@@ -26578,59 +26857,48 @@ msgstr "Tresna-barra nagusia"
 msgid "Preview the printed item"
 msgstr "Inprimatutako elementuaren aurrebista ikusi"
 
-#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-comp-editor.xml.h:10 ui/evolution-contact-editor.xml.h:6
 msgid "Print this item"
 msgstr "Inprimatu elementu hau"
 
-#: ui/evolution-comp-editor.xml.h:11 ui/evolution-contact-editor.xml.h:8
-#: ui/evolution-contact-list-editor.xml.h:5
-#: ui/evolution-message-composer.xml.h:18
-msgid "Save _As..."
-msgstr "Gorde hone_la..."
+#: ui/evolution-comp-editor.xml.h:12 ui/evolution-message-composer.xml.h:16
+#: ui/evolution-signature-editor.xml.h:5
+msgid "Save"
+msgstr "Gorde"
+
+#: ui/evolution-comp-editor.xml.h:13
+msgid "Save As..."
+msgstr "Gorde honela..."
 
-#: ui/evolution-comp-editor.xml.h:12 ui/evolution-contact-editor.xml.h:9
+#: ui/evolution-comp-editor.xml.h:14 ui/evolution-contact-editor.xml.h:8
 #: ui/evolution-contact-list-editor.xml.h:6
-#: ui/evolution-signature-editor.xml.h:7
+#: ui/evolution-signature-editor.xml.h:6
 msgid "Save and Close"
 msgstr "Gorde eta itxi"
 
-#: ui/evolution-comp-editor.xml.h:13 ui/evolution-contact-editor.xml.h:10
-#: ui/evolution-contact-list-editor.xml.h:7
-#: ui/evolution-signature-editor.xml.h:8
-#, fuzzy
-msgid "Save and _Close"
-msgstr "Gorde eta itxi"
-
-#: ui/evolution-comp-editor.xml.h:14
+#: ui/evolution-comp-editor.xml.h:15
 msgid "Save the item and close the dialog box"
 msgstr "Gorde elementua eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-comp-editor.xml.h:15
+#: ui/evolution-comp-editor.xml.h:16
 msgid "Save this item to disk"
 msgstr "Gorde elementu hau diskoan"
 
-#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:15
-#: ui/evolution-contact-list-editor.xml.h:13
+#: ui/evolution-comp-editor.xml.h:18 ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-list-editor.xml.h:11
 #: ui/evolution-mail-messagedisplay.xml.h:7
 #: ui/evolution-message-composer.xml.h:42
-#: ui/evolution-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
+#: ui/evolution-signature-editor.xml.h:12 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:46
 msgid "_File"
 msgstr "Fi_txategia"
 
-#: ui/evolution-comp-editor.xml.h:20 ui/evolution-contact-editor.xml.h:18
-#: ui/evolution-contact-list-editor.xml.h:14
-#: ui/evolution-message-composer.xml.h:47
-#: ui/evolution-signature-editor.xml.h:15
-msgid "_Save"
-msgstr "_Gorde"
-
 #: ui/evolution-composer-entries.xml.h:1
 #, fuzzy
 msgid "Copy selected text to the clipboard"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-message.xml.h:21
+#: ui/evolution-composer-entries.xml.h:2 ui/evolution-mail-list.xml.h:3
 msgid "Cu_t"
 msgstr "E_baki"
 
@@ -26654,39 +26922,51 @@ msgstr "Hautatu _dena"
 msgid "Select all text"
 msgstr "Hautatu kontaktu guztiak"
 
-#: ui/evolution-contact-editor.xml.h:6
+#: ui/evolution-contact-editor.xml.h:5
 msgid "Print En_velope..."
 msgstr "Inprimatu _gutun-azala..."
 
-#: ui/evolution-contact-editor.xml.h:11
+#: ui/evolution-contact-editor.xml.h:7
+#: ui/evolution-contact-list-editor.xml.h:5
+#: ui/evolution-message-composer.xml.h:18
+msgid "Save _As..."
+msgstr "Gorde hone_la..."
+
+#: ui/evolution-contact-editor.xml.h:9
 msgid "Save the contact and close the dialog box"
 msgstr "Gorde kontaktua eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-contact-editor.xml.h:12
+#: ui/evolution-contact-editor.xml.h:10
 msgid "Send _Message to Contact..."
 msgstr "Bidali _mezua kontaktuari..."
 
-#: ui/evolution-contact-list-editor.xml.h:4
+#: ui/evolution-contact-editor.xml.h:15
+#: ui/evolution-contact-list-editor.xml.h:12
+#: ui/evolution-message-composer.xml.h:47
+#: ui/evolution-signature-editor.xml.h:14
+msgid "_Save"
+msgstr "_Gorde"
+
+#: ui/evolution-contact-list-editor.xml.h:3
 msgid "Delete this list"
 msgstr "Ezabatu zerrenda hau"
 
-#: ui/evolution-contact-list-editor.xml.h:8
+#: ui/evolution-contact-list-editor.xml.h:4
+msgid "Delete..."
+msgstr "Ezabatu..."
+
+#: ui/evolution-contact-list-editor.xml.h:7
 msgid "Save the list and close the dialog box"
 msgstr "Gorde zerrenda eta itxi elkarrizketa-koadroa"
 
-#: ui/evolution-contact-list-editor.xml.h:9
+#: ui/evolution-contact-list-editor.xml.h:8
 msgid "Se_nd list to other..."
 msgstr "Bidali _zerrenda beste norbaiti..."
 
-#: ui/evolution-contact-list-editor.xml.h:10
+#: ui/evolution-contact-list-editor.xml.h:9
 msgid "Send _message to list..."
 msgstr "Bidali _mezua zerrendara..."
 
-#: ui/evolution-contact-list-editor.xml.h:12
-#, fuzzy
-msgid "_Delete..."
-msgstr "Ezabatu..."
-
 #: ui/evolution-event-editor.xml.h:1
 msgid "Cancel Mee_ting"
 msgstr "Bertan behera utzi _bilera"
@@ -26762,7 +27042,7 @@ msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
 #: ui/evolution-mail-global.xml.h:11
 #, fuzzy
-msgid "Post Ne_w Message"
+msgid "Post New Message"
 msgstr "Mezu berria"
 
 #: ui/evolution-mail-global.xml.h:12
@@ -26799,21 +27079,16 @@ msgstr "Au_rrebistako panela"
 msgid "Change the properties of this folder"
 msgstr "Aldatu karpeta honen propietateak"
 
-#: ui/evolution-mail-list.xml.h:2 ui/evolution-mail-message.xml.h:10
+#: ui/evolution-mail-list.xml.h:2
 #, fuzzy
 msgid "Copy selected message(s) to the clipboard"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-mail-list.xml.h:3 ui/evolution-mail-message.xml.h:22
+#: ui/evolution-mail-list.xml.h:4
 #, fuzzy
 msgid "Cut selected message(s) to the clipboard"
 msgstr "Itsatsi arbeleko mezua"
 
-#: ui/evolution-mail-list.xml.h:4
-#, fuzzy
-msgid "E_xpunge"
-msgstr "_Borratu betiko"
-
 #: ui/evolution-mail-list.xml.h:5
 msgid "Hide S_elected Messages"
 msgstr "Ezkutatu _hautatutako mezuak"
@@ -26832,15 +27107,14 @@ msgid ""
 msgstr "Ezkutatu ezabatutako mezuak, marratuta erakutsi beharrean"
 
 #: ui/evolution-mail-list.xml.h:9
-#, fuzzy
-msgid "Mark All as _Read"
+msgid "Mark All as R_ead"
 msgstr "_Markatu denak irakurritako gisa"
 
 #: ui/evolution-mail-list.xml.h:10
 msgid "Mark all visible messages as read"
 msgstr "Markatu ikusgai dauden mezu guztiak irakurritako gisa"
 
-#: ui/evolution-mail-list.xml.h:11 ui/evolution-mail-message.xml.h:66
+#: ui/evolution-mail-list.xml.h:11
 #, fuzzy
 msgid "Paste message(s) from the clipboard"
 msgstr "Itsatsi arbeleko mezua"
@@ -26885,37 +27159,26 @@ msgstr "Aldi baterako ezkutatu hautatutako mezuak"
 msgid "Threaded Message list"
 msgstr "Hari bateko mezuen zerrenda"
 
-#: ui/evolution-mail-list.xml.h:25 ui/evolution.xml.h:47
+#: ui/evolution-mail-list.xml.h:26 ui/evolution-tasks.xml.h:18
+msgid "_Expunge"
+msgstr "_Borratu betiko"
+
+#: ui/evolution-mail-list.xml.h:27 ui/evolution.xml.h:47
 msgid "_Folder"
 msgstr "_Karpeta"
 
-#: ui/evolution-mail-list.xml.h:26 ui/evolution-subscribe.xml.h:12
+#: ui/evolution-mail-list.xml.h:28 ui/evolution-subscribe.xml.h:12
 msgid "_Invert Selection"
 msgstr "_Alderantzikatu hautapena"
 
-#: ui/evolution-mail-list.xml.h:27
+#: ui/evolution-mail-list.xml.h:30
 msgid "_Properties..."
 msgstr "_Propietateak..."
 
-#: ui/evolution-mail-list.xml.h:28
+#: ui/evolution-mail-list.xml.h:31
 msgid "_Threaded Message List"
 msgstr "_Hariko mezuen zerrenda"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
-msgid "Close this window"
-msgstr "Itxi leiho hau"
-
-#: ui/evolution-mail-messagedisplay.xml.h:5
-#: ui/evolution-message-composer.xml.h:39 ui/evolution-subscribe.xml.h:9
-#: ui/evolution.xml.h:43
-msgid "_Close"
-msgstr "_Itxi"
-
-#: ui/evolution-mail-messagedisplay.xml.h:8
-#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
-msgid "_View"
-msgstr "I_kusi"
-
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Addressbook"
@@ -26936,425 +27199,414 @@ msgid "Apply filter rules to the selected messages"
 msgstr "Aplikatu iragazki-arauak hautatutako mezuei"
 
 #: ui/evolution-mail-message.xml.h:5
-#, fuzzy
-msgid "Caret _Mode"
-msgstr "Testu-tamai_na"
-
-#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to all of the recipients of the selected message"
 msgstr "Prestatu hautatutako mezuaren hartzaile guztientzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:7
+#: ui/evolution-mail-message.xml.h:6
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Prestatu hautatutako mezuaren posta-zerrendarentzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:8
+#: ui/evolution-mail-message.xml.h:7
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Prestatu hautatutako mezuaren bidaltzailearentzako erantzuna"
 
-#: ui/evolution-mail-message.xml.h:11
+#: ui/evolution-mail-message.xml.h:9
 msgid "Copy selected messages to another folder"
 msgstr "Kopiatu hautatutako mezuak beste karpeta batean"
 
-#: ui/evolution-mail-message.xml.h:12
+#: ui/evolution-mail-message.xml.h:10
 msgid "Create _Virtual Folder From Message"
 msgstr "Sortu _karpeta birtuala mezutik"
 
-#: ui/evolution-mail-message.xml.h:13
+#: ui/evolution-mail-message.xml.h:11
 msgid "Create a rule to filter messages from this sender"
 msgstr "Sortu araua bidaltzaile hau duten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:14
+#: ui/evolution-mail-message.xml.h:12
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Sortu araua hartzaile hauek dituzten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:15
+#: ui/evolution-mail-message.xml.h:13
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Sortu araua posta-zerrenda honetako mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:16
+#: ui/evolution-mail-message.xml.h:14
 msgid "Create a rule to filter messages with this subject"
 msgstr "Sortu araua gai hau duten mezuak iragazteko"
 
-#: ui/evolution-mail-message.xml.h:17
+#: ui/evolution-mail-message.xml.h:15
 msgid "Create a virtual folder for these recipients"
 msgstr "Sortu karpeta birtuala hartzaile hauentzat"
 
-#: ui/evolution-mail-message.xml.h:18
+#: ui/evolution-mail-message.xml.h:16
 msgid "Create a virtual folder for this mailing list"
 msgstr "Sortu karpeta birtuala posta-zerrenda honentzat"
 
-#: ui/evolution-mail-message.xml.h:19
+#: ui/evolution-mail-message.xml.h:17
 msgid "Create a virtual folder for this sender"
 msgstr "Sortu karpeta birtuala bidaltzaile honentzat"
 
-#: ui/evolution-mail-message.xml.h:20
+#: ui/evolution-mail-message.xml.h:18
 msgid "Create a virtual folder for this subject"
 msgstr "Sortu karpeta birtuala gai honentzat"
 
-#: ui/evolution-mail-message.xml.h:23
+#: ui/evolution-mail-message.xml.h:19
 msgid "Decrease the text size"
 msgstr "Txikitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:25
+#: ui/evolution-mail-message.xml.h:21
 msgid "Display the next important message"
 msgstr "Bistaratu hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:26
+#: ui/evolution-mail-message.xml.h:22
 msgid "Display the next message"
 msgstr "Bistaratu hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:27
+#: ui/evolution-mail-message.xml.h:23
 msgid "Display the next unread message"
 msgstr "Bistaratu irakurri gabeko hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:28
+#: ui/evolution-mail-message.xml.h:24
 msgid "Display the next unread thread"
 msgstr "Bistaratu irakurri gabeko hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:29
+#: ui/evolution-mail-message.xml.h:25
 msgid "Display the previous important message"
 msgstr "Bistaratu aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:30
+#: ui/evolution-mail-message.xml.h:26
 msgid "Display the previous message"
 msgstr "Bistaratu aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:31
+#: ui/evolution-mail-message.xml.h:27
 msgid "Display the previous unread message"
 msgstr "Bistaratu irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:32
+#: ui/evolution-mail-message.xml.h:28
 #, fuzzy
 msgid "F_orward"
 msgstr "Birbidali"
 
-#: ui/evolution-mail-message.xml.h:33
+#: ui/evolution-mail-message.xml.h:29
 msgid "Filter on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:34
+#: ui/evolution-mail-message.xml.h:30
 msgid "Filter on Se_nder..."
 msgstr "Bi_daltzailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:35
+#: ui/evolution-mail-message.xml.h:31
 msgid "Filter on _Recipients..."
 msgstr "Hart_zailearen araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:36
+#: ui/evolution-mail-message.xml.h:32
 msgid "Filter on _Subject..."
 msgstr "G_aiaren araberako iragazkia..."
 
-#: ui/evolution-mail-message.xml.h:37
+#: ui/evolution-mail-message.xml.h:33
 msgid "Flag selected message(s) for follow-up"
 msgstr "Markatu hautatutako mezuak jarraipena egiteko"
 
-#: ui/evolution-mail-message.xml.h:38
+#: ui/evolution-mail-message.xml.h:34
 msgid "Follow _Up..."
 msgstr "Jarrait_u..."
 
-#: ui/evolution-mail-message.xml.h:39
+#: ui/evolution-mail-message.xml.h:35
 msgid "Force images in HTML mail to be loaded"
 msgstr "Kargarazi HTML postako irudiak"
 
-#: ui/evolution-mail-message.xml.h:41
+#: ui/evolution-mail-message.xml.h:37
 msgid "Forward the selected message in the body of a new message"
 msgstr "Birbidali hautatutako mezua beste mezu baten testuaren barnean"
 
-#: ui/evolution-mail-message.xml.h:42
+#: ui/evolution-mail-message.xml.h:38
 msgid "Forward the selected message quoted like a reply"
 msgstr "Birbidali hautatutako mezua erantzun gisa aipatuta"
 
-#: ui/evolution-mail-message.xml.h:43
+#: ui/evolution-mail-message.xml.h:39
 msgid "Forward the selected message to someone"
 msgstr "Birbidali hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:44
+#: ui/evolution-mail-message.xml.h:40
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Birbidali hautatutako mezua norbaiti eranskin gisa"
 
-#: ui/evolution-mail-message.xml.h:45
+#: ui/evolution-mail-message.xml.h:41
 msgid "Increase the text size"
 msgstr "Handitu testuaren tamaina"
 
-#: ui/evolution-mail-message.xml.h:46
+#: ui/evolution-mail-message.xml.h:42
 msgid "Load _Images"
 msgstr "Kargatu iru_diak"
 
-#: ui/evolution-mail-message.xml.h:47
-msgid "Mar_k as Read"
-msgstr "Mar_katu irakurritako gisa"
-
-#: ui/evolution-mail-message.xml.h:48
+#: ui/evolution-mail-message.xml.h:44
 msgid "Mark as I_mportant"
 msgstr "Markatu ga_rrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:49
+#: ui/evolution-mail-message.xml.h:45
 msgid "Mark as U_nread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:50
+#: ui/evolution-mail-message.xml.h:46
 msgid "Mark as Unimp_ortant"
 msgstr "Markatu ez-garran_tzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:51
+#: ui/evolution-mail-message.xml.h:47
 msgid "Mark the selected message(s) as having been read"
 msgstr "Markatu hautatutako mezua(k) irakurritako gisa"
 
-#: ui/evolution-mail-message.xml.h:52
+#: ui/evolution-mail-message.xml.h:48
 msgid "Mark the selected message(s) as important"
 msgstr "Markatu hautatutako mezua(k) garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:53
+#: ui/evolution-mail-message.xml.h:49
 msgid "Mark the selected message(s) as not having been read"
 msgstr "Markatu hautatutako mezua(k) irakurri gabeko gisa"
 
-#: ui/evolution-mail-message.xml.h:54
+#: ui/evolution-mail-message.xml.h:50
 msgid "Mark the selected message(s) as unimportant"
 msgstr "Markatu hautatutako mezua(k) ez-garrantzitsu gisa"
 
-#: ui/evolution-mail-message.xml.h:55
+#: ui/evolution-mail-message.xml.h:51
 msgid "Mark the selected messages for deletion"
 msgstr "Markatu hautatutako mezuak ezabatzeko"
 
-#: ui/evolution-mail-message.xml.h:56
+#: ui/evolution-mail-message.xml.h:52
 msgid "Move"
 msgstr "Eraman"
 
-#: ui/evolution-mail-message.xml.h:57
+#: ui/evolution-mail-message.xml.h:53
 msgid "Move selected message(s) to another folder"
 msgstr "Eraman hautatutako mezua(k) beste karpeta batera"
 
-#: ui/evolution-mail-message.xml.h:58
+#: ui/evolution-mail-message.xml.h:54
 msgid "Next"
 msgstr "Hurrengoa"
 
-#: ui/evolution-mail-message.xml.h:59
+#: ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Next _Important Message"
 msgstr "Hurrengo mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:60
+#: ui/evolution-mail-message.xml.h:56
 #, fuzzy
 msgid "Next _Thread"
 msgstr "Hurrengo haria"
 
-#: ui/evolution-mail-message.xml.h:61
+#: ui/evolution-mail-message.xml.h:57
 #, fuzzy
 msgid "Next _Unread Message"
 msgstr "Hurrengo irakurri gabeko mezua"
 
-#: ui/evolution-mail-message.xml.h:62
+#: ui/evolution-mail-message.xml.h:58
 msgid "Open the selected message in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
-#: ui/evolution-mail-message.xml.h:63
+#: ui/evolution-mail-message.xml.h:59
 msgid "Open the selected message in the composer to re-send it"
 msgstr "Ireki hautatutako mezua mezu-prestatzailean, berriro bidaltzeko"
 
-#: ui/evolution-mail-message.xml.h:64
+#: ui/evolution-mail-message.xml.h:60
 msgid "Original Si_ze"
 msgstr "Jatorrizko ta_maina"
 
-#: ui/evolution-mail-message.xml.h:65
+#: ui/evolution-mail-message.xml.h:61
 #, fuzzy
 msgid "P_revious Unread Message"
 msgstr "Irakurri gabeko aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:67
+#: ui/evolution-mail-message.xml.h:62
 #, fuzzy
-msgid "Post a Repl_y"
+msgid "Post a Reply"
 msgstr "Zereginaren erantzuna"
 
-#: ui/evolution-mail-message.xml.h:68
+#: ui/evolution-mail-message.xml.h:63
 #, fuzzy
 msgid "Post a reply to a message in a Public folder"
 msgstr "Karpeta guztietan begiratu mezurik dagoen"
 
-#: ui/evolution-mail-message.xml.h:69
+#: ui/evolution-mail-message.xml.h:64
 #, fuzzy
 msgid "Pr_evious Important Message"
 msgstr "Aurreko mezu garrantzitsua"
 
-#: ui/evolution-mail-message.xml.h:70
+#: ui/evolution-mail-message.xml.h:65
 msgid "Preview the message to be printed"
 msgstr "Inprimatuko den mezuaren aurrebista eskaintzen du"
 
-#: ui/evolution-mail-message.xml.h:71
+#: ui/evolution-mail-message.xml.h:66
 msgid "Previous"
 msgstr "Aurrekoa"
 
-#: ui/evolution-mail-message.xml.h:74
+#: ui/evolution-mail-message.xml.h:69
 msgid "Print this message"
 msgstr "Inprimatu mezu hau"
 
-#: ui/evolution-mail-message.xml.h:75
+#: ui/evolution-mail-message.xml.h:70
 msgid "Re_direct"
 msgstr "Birbi_deratu"
 
-#: ui/evolution-mail-message.xml.h:76
+#: ui/evolution-mail-message.xml.h:71
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Birbideratu (errebotatu) hautatutako mezua norbaiti"
 
-#: ui/evolution-mail-message.xml.h:79
-msgid "Reply to _All"
-msgstr "Erantzun g_uztiei"
-
-#: ui/evolution-mail-message.xml.h:80
-msgid "Reply to _List"
-msgstr "Erantzun zerre_ndari"
-
-#: ui/evolution-mail-message.xml.h:81
+#: ui/evolution-mail-message.xml.h:76
 msgid "Reset the text to its original size"
 msgstr "Testua jatorrizko tamainan berrezartzen du"
 
-#: ui/evolution-mail-message.xml.h:82
-#, fuzzy
-msgid "S_earch in Message..."
+#: ui/evolution-mail-message.xml.h:77
+msgid "S_earch Message..."
 msgstr "Bi_latu mezuan..."
 
-#: ui/evolution-mail-message.xml.h:83
+#: ui/evolution-mail-message.xml.h:78
 msgid "S_maller"
 msgstr "T_xikiagoa"
 
-#: ui/evolution-mail-message.xml.h:84
+#: ui/evolution-mail-message.xml.h:79
 msgid "Save the message as a text file"
 msgstr "Gorde mezua testu-fitxategi gisa"
 
-#: ui/evolution-mail-message.xml.h:85
+#: ui/evolution-mail-message.xml.h:80
 msgid "Search for text in the body of the displayed message"
 msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
 
-#: ui/evolution-mail-message.xml.h:86
+#: ui/evolution-mail-message.xml.h:81
 #, fuzzy
 msgid "Set up the page settings for your current printer"
 msgstr "Konfiguratu orrialde-ezarpenak uneko inprimagailuarentzat"
 
-#: ui/evolution-mail-message.xml.h:87
+#: ui/evolution-mail-message.xml.h:82
 msgid "Show Email _Source"
 msgstr "Erakutsi posta-itur_burua"
 
-#: ui/evolution-mail-message.xml.h:88
+#: ui/evolution-mail-message.xml.h:83
 msgid "Show Full _Headers"
 msgstr "Erakutsi _goiburuko osoak"
 
-#: ui/evolution-mail-message.xml.h:89
-#, fuzzy
-msgid "Show a blinking cursor in the body of displayed messages"
-msgstr "Bilatu testua bistaratutako mezuaren gorputzean"
-
-#: ui/evolution-mail-message.xml.h:90
+#: ui/evolution-mail-message.xml.h:84
 msgid "Show message in the normal style"
 msgstr "Erakutsi mezua estilo normalean"
 
-#: ui/evolution-mail-message.xml.h:91
+#: ui/evolution-mail-message.xml.h:85
 msgid "Show message with all email headers"
 msgstr "Erakutsi mezua posta-goiburuko guztiekin"
 
-#: ui/evolution-mail-message.xml.h:92
+#: ui/evolution-mail-message.xml.h:86
 msgid "Show the raw email source of the message"
 msgstr "Erakutsi mezu-iturburua formatu gabe"
 
-#: ui/evolution-mail-message.xml.h:93
+#: ui/evolution-mail-message.xml.h:87
 msgid "Text Si_ze"
 msgstr "Testu-tamai_na"
 
-#: ui/evolution-mail-message.xml.h:94
+#: ui/evolution-mail-message.xml.h:88
 msgid "Un-delete the selected messages"
 msgstr "Desezabatu hautatutako mezuak"
 
-#: ui/evolution-mail-message.xml.h:95
+#: ui/evolution-mail-message.xml.h:89
 msgid "VFolder on Mailing _List..."
 msgstr "_Posta-zerrendaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:96
+#: ui/evolution-mail-message.xml.h:90
 msgid "VFolder on Se_nder..."
 msgstr "_Bidaltzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:97
+#: ui/evolution-mail-message.xml.h:91
 msgid "VFolder on _Recipients..."
 msgstr "_Hartzailearen araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:98
+#: ui/evolution-mail-message.xml.h:92
 msgid "VFolder on _Subject..."
 msgstr "_Gaiaren araberako karpeta birtuala..."
 
-#: ui/evolution-mail-message.xml.h:100
+#: ui/evolution-mail-message.xml.h:94
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:102
+#: ui/evolution-mail-message.xml.h:95
 msgid "_Copy to Folder"
 msgstr "_Kopiatu karpetan"
 
-#: ui/evolution-mail-message.xml.h:103
+#: ui/evolution-mail-message.xml.h:96
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:105
+#: ui/evolution-mail-message.xml.h:98
 msgid "_Forward Message"
 msgstr "_Birbidali mezua"
 
-#: ui/evolution-mail-message.xml.h:106
+#: ui/evolution-mail-message.xml.h:99
 #, fuzzy
 msgid "_Go To"
 msgstr "Joan"
 
-#: ui/evolution-mail-message.xml.h:107
+#: ui/evolution-mail-message.xml.h:100
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:108
+#: ui/evolution-mail-message.xml.h:101
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:109
+#: ui/evolution-mail-message.xml.h:102
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:110
+#: ui/evolution-mail-message.xml.h:103
 msgid "_Move to Folder"
 msgstr "_Eraman karpetara"
 
-#: ui/evolution-mail-message.xml.h:111
+#: ui/evolution-mail-message.xml.h:104
 #, fuzzy
 msgid "_Next Message"
 msgstr "Hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:112
+#: ui/evolution-mail-message.xml.h:105
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
 
-#: ui/evolution-mail-message.xml.h:113
+#: ui/evolution-mail-message.xml.h:106
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:107
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:109
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Reply to Sender"
-msgstr "Erantzun bidal_tzaileari"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:111
 #, fuzzy
 msgid "_Resend..."
 msgstr "I_zena aldatu..."
 
-#: ui/evolution-mail-message.xml.h:121 ui/evolution.xml.h:63
+#: ui/evolution-mail-message.xml.h:113 ui/evolution.xml.h:63
 msgid "_Tools"
 msgstr "_Tresnak"
 
-#: ui/evolution-mail-message.xml.h:122
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:6
+msgid "Close this window"
+msgstr "Itxi leiho hau"
+
+#: ui/evolution-mail-messagedisplay.xml.h:5
+#: ui/evolution-message-composer.xml.h:39
+#: ui/evolution-signature-editor.xml.h:10 ui/evolution-subscribe.xml.h:9
+#: ui/evolution.xml.h:43
+msgid "_Close"
+msgstr "_Itxi"
+
+#: ui/evolution-mail-messagedisplay.xml.h:8
+#: ui/evolution-message-composer.xml.h:49 ui/evolution.xml.h:64
+msgid "_View"
+msgstr "I_kusi"
+
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Erantsi"
@@ -27363,7 +27615,7 @@ msgstr "Erantsi"
 msgid "Attach a file"
 msgstr "Erantsi fitxategi bat"
 
-#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:3
+#: ui/evolution-message-composer.xml.h:4 ui/evolution-signature-editor.xml.h:2
 msgid "Close the current file"
 msgstr "Itxi uneko fitxategia"
 
@@ -27379,7 +27631,7 @@ msgstr "Enkriptatu mezu hau PGPrekin"
 msgid "Encrypt this message with your S/MIME Encryption Cetificate"
 msgstr "Enkriptatu mezu hau zure S/MIME enkriptatze-ziurtagiriarekin"
 
-#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:4
+#: ui/evolution-message-composer.xml.h:8 ui/evolution-signature-editor.xml.h:3
 msgid "For_mat"
 msgstr "For_matua"
 
@@ -27412,11 +27664,6 @@ msgstr "S/MIME enkriptatzea"
 msgid "S/MIME Sign"
 msgstr "S/MIME sinadura"
 
-#: ui/evolution-message-composer.xml.h:16
-#: ui/evolution-signature-editor.xml.h:6
-msgid "Save"
-msgstr "Gorde"
-
 #: ui/evolution-message-composer.xml.h:17
 msgid "Save As"
 msgstr "Gorde honela"
@@ -27430,7 +27677,7 @@ msgid "Save in folder..."
 msgstr "Gorde karpetan..."
 
 #: ui/evolution-message-composer.xml.h:21
-#: ui/evolution-signature-editor.xml.h:9
+#: ui/evolution-signature-editor.xml.h:7
 msgid "Save the current file"
 msgstr "Gorde uneko fitxategia"
 
@@ -27447,7 +27694,7 @@ msgid "Send"
 msgstr "Bidali"
 
 #: ui/evolution-message-composer.xml.h:25
-#: ui/evolution-signature-editor.xml.h:11
+#: ui/evolution-signature-editor.xml.h:9
 msgid "Send the mail in HTML format"
 msgstr "Bidali mezua HTML formatuan"
 
@@ -27513,7 +27760,7 @@ msgid "_From Field"
 msgstr "'Nork' e_remua"
 
 #: ui/evolution-message-composer.xml.h:44
-#: ui/evolution-signature-editor.xml.h:14
+#: ui/evolution-signature-editor.xml.h:13
 msgid "_Insert"
 msgstr "_Txertatu"
 
@@ -27529,11 +27776,11 @@ msgstr "'Erant_zun honi' eremua"
 msgid "_Security"
 msgstr "Se_gurtasuna"
 
-#: ui/evolution-signature-editor.xml.h:5
+#: ui/evolution-signature-editor.xml.h:4
 msgid "H_TML"
 msgstr "_HTML"
 
-#: ui/evolution-signature-editor.xml.h:10
+#: ui/evolution-signature-editor.xml.h:8
 #, fuzzy
 msgid "Save the current file and close the window"
 msgstr "Gorde elementua eta itxi elkarrizketa-koadroa"
@@ -27610,21 +27857,16 @@ msgstr "Ezabatu hautatutako zereginak"
 msgid "Mar_k as Complete"
 msgstr "Markatu 'Osatuta' gisa"
 
-#: ui/evolution-tasks.xml.h:9
-#, fuzzy
-msgid "Mark selected tasks as complete"
-msgstr "Ma_rkatu zereginak 'Osatuta' gisa"
-
-#: ui/evolution-tasks.xml.h:11
+#: ui/evolution-tasks.xml.h:10
 msgid "Paste task from the clipboard"
 msgstr "Itsatsi zeregina arbeletik"
 
-#: ui/evolution-tasks.xml.h:12
+#: ui/evolution-tasks.xml.h:11
 #, fuzzy
 msgid "Previews the list of tasks to be printed"
 msgstr "Inprimatuko diren kontaktuen aurrebista eskaintzen du"
 
-#: ui/evolution-tasks.xml.h:14
+#: ui/evolution-tasks.xml.h:13
 #, fuzzy
 msgid "Print the list of tasks"
 msgstr "Inprimatu mezu hau"
@@ -27892,33 +28134,27 @@ msgid "_Work Week View"
 msgstr "Lan-astearen ikuspegia"
 
 #: views/mail/galview.xml.h:1
-#, fuzzy
-msgid "As _Sent Folder"
+msgid "As Sent Folder"
 msgstr "Bidalitakoen karpeta gisa"
 
 #: views/mail/galview.xml.h:2
-#, fuzzy
-msgid "By S_tatus"
-msgstr "Egoeraren arabera"
+msgid "By Follow Up Flag"
+msgstr "Jarraitze-banderaren arabera"
 
 #: views/mail/galview.xml.h:3
-#, fuzzy
-msgid "By Se_nder"
+msgid "By Sender"
 msgstr "Bidaltzailearen arabera"
 
 #: views/mail/galview.xml.h:4
-#, fuzzy
-msgid "By Su_bject"
-msgstr "Gaiaren arabera"
+msgid "By Status"
+msgstr "Egoeraren arabera"
 
 #: views/mail/galview.xml.h:5
-#, fuzzy
-msgid "By _Follow Up Flag"
-msgstr "Jarraitze-banderaren arabera"
+msgid "By Subject"
+msgstr "Gaiaren arabera"
 
 #: views/mail/galview.xml.h:6
-#, fuzzy
-msgid "_Messages"
+msgid "Messages"
 msgstr "Mezuak"
 
 #: views/tasks/galview.xml.h:1
@@ -27981,20 +28217,20 @@ msgstr "Definitu ikuspegiak"
 
 #. Translators: These are the first characters of each day of the
 #. week, 'M' for 'Monday', 'T' for Tuesday etc.
-#: widgets/misc/e-calendar-item.c:456
+#: widgets/misc/e-calendar-item.c:427
 msgid "MTWTFSS"
 msgstr "AAAOOLI"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: widgets/misc/e-calendar-item.c:1174
+#: widgets/misc/e-calendar-item.c:1127
 msgid "%B %Y"
 msgstr "%Y %B"
 
-#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:431
+#: widgets/misc/e-cell-date-edit.c:241 widgets/misc/e-dateedit.c:428
 msgid "Now"
 msgstr "Orain"
 
-#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:437
+#: widgets/misc/e-cell-date-edit.c:249 widgets/misc/e-dateedit.c:434
 msgid "Today"
 msgstr "Gaur"
 
@@ -28114,6 +28350,22 @@ msgstr "Gehitu gordetako bilaketei"
 msgid "_Advanced..."
 msgstr "Aurreratua..."
 
+#: widgets/misc/e-messagebox.c:154
+msgid "Information"
+msgstr "Informazioa"
+
+#: widgets/misc/e-messagebox.c:168
+msgid "Error"
+msgstr "Errorea"
+
+#: widgets/misc/e-messagebox.c:175
+msgid "Question"
+msgstr "Galdera"
+
+#: widgets/misc/e-messagebox.c:182
+msgid "Message"
+msgstr "Mezua"
+
 #: widgets/misc/e-search-bar.c:531
 msgid "_Search"
 msgstr "_Bilatu"
@@ -28165,566 +28417,6 @@ msgstr "Evolution-en egutegiaren laneko laburpenaren osagaia."
 msgid "Evolution Addressbook local file backend"
 msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 
-#~ msgid "That person is already attending the meeting!"
-#~ msgstr "Pertsona hori lehendik dago bileran!"
-
-#~ msgid "URL:"
-#~ msgstr "URLa:"
-
-#, fuzzy
-#~ msgid "_Save as..."
-#~ msgstr "Gorde honela..."
-
-#~ msgid "End Date"
-#~ msgstr "Amaiera-eguna"
-
-#~ msgid "New _Appointment"
-#~ msgstr "Hitz_ordu berria"
-
-#~ msgid "Print..."
-#~ msgstr "Inprimatu..."
-
-#~ msgid "Chair Persons"
-#~ msgstr "Mahaiburuak"
-
-#~ msgid "Required Participants"
-#~ msgstr "Beharrezko partaideak"
-
-#~ msgid "Optional Participants"
-#~ msgstr "Aukerako partaideak"
-
-#, fuzzy
-#~ msgid "Resources"
-#~ msgstr "Baliabidea"
-
-#~ msgid "Individual"
-#~ msgstr "Indibiduala"
-
-#~ msgid "Group"
-#~ msgstr "Taldea"
-
-#~ msgid "Resource"
-#~ msgstr "Baliabidea"
-
-#~ msgid "Room"
-#~ msgstr "Gela"
-
-#~ msgid "Chair"
-#~ msgstr "Mahaiburua"
-
-#~ msgid "Required Participant"
-#~ msgstr "Beharrezko partaidea"
-
-#~ msgid "Optional Participant"
-#~ msgstr "Aukerako partaidea"
-
-#~ msgid "Non-Participant"
-#~ msgstr "Ez-partaidea"
-
-#~ msgid "Needs Action"
-#~ msgstr "Ekintza behar du"
-
-#~ msgid "Delegated"
-#~ msgstr "Delegatua"
-
-#~ msgid "In Process"
-#~ msgstr "Egiten ari da"
-
-#~ msgid "Properties for \"%s\""
-#~ msgstr "\"%s\" - propietateak"
-
-#~ msgid "Properties"
-#~ msgstr "Propietateak"
-
-#~ msgid "Could not create temporary directory: %s"
-#~ msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
-
-#~ msgid "%d new"
-#~ msgstr "%d berri"
-
-#~ msgid ", "
-#~ msgstr ", "
-
-#~ msgid "%d hidden"
-#~ msgstr "%d ezkutu"
-
-#~ msgid "%d visible"
-#~ msgstr "%d ikusgarri"
-
-#~ msgid "%d selected"
-#~ msgstr "%d hautatuta"
-
-#~ msgid "%d unsent"
-#~ msgstr "%d bidali gabe"
-
-#~ msgid "%d sent"
-#~ msgstr "%d bidali"
-
-#~ msgid "%d total"
-#~ msgstr "%d guztira"
-
-#, fuzzy
-#~ msgid "Create _Virtual Folder From Search..."
-#~ msgstr "Sortu _karpeta birtuala mezutik"
-
-#~ msgid "VFolder on _Subject"
-#~ msgstr "_Gaiaren araberako karpeta birtuala"
-
-#~ msgid "VFolder on Se_nder"
-#~ msgstr "_Bidaltzailearen araberako karpeta birtuala"
-
-#~ msgid "VFolder on _Recipients"
-#~ msgstr "_Hartzailearen araberako karpeta birtuala"
-
-#~ msgid "VFolder on Mailing _List"
-#~ msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
-
-#~ msgid "Filter on Sub_ject"
-#~ msgstr "G_aiaren araberako iragazkia"
-
-#~ msgid "Filter on Sen_der"
-#~ msgstr "Bi_daltzailearen araberako iragazkia"
-
-#~ msgid "Filter on Re_cipients"
-#~ msgstr "Hart_zailearen araberako iragazkia"
-
-#~ msgid "Filter on _Mailing List"
-#~ msgstr "Po_sta-zerrendaren araberako iragazkia"
-
-#~ msgid "_Edit as New Message..."
-#~ msgstr "_Editatu mezu berri gisa..."
-
-#~ msgid "_Print"
-#~ msgstr "_Inprimatu"
-
-#~ msgid "_Forward"
-#~ msgstr "_Birbidali"
-
-#, fuzzy
-#~ msgid "Follo_w Up..."
-#~ msgstr "Jarrait_u..."
-
-#, fuzzy
-#~ msgid "Fla_g Completed"
-#~ msgstr "Bandera o_satuta"
-
-#, fuzzy
-#~ msgid "Cl_ear Flag"
-#~ msgstr "Garbitu ban_dera"
-
-#, fuzzy
-#~ msgid "Mark as _Unread"
-#~ msgstr "Markatu i_rakurri gabeko gisa"
-
-#~ msgid "Mark as _Important"
-#~ msgstr "Markatu garrantz_itsu gisa"
-
-#, fuzzy
-#~ msgid "_Mark as Unimportant"
-#~ msgstr "Markatu ez-garra_ntzitsu gisa"
-
-#, fuzzy
-#~ msgid "U_ndelete"
-#~ msgstr "_Desezabatu"
-
-#, fuzzy
-#~ msgid "Mo_ve to Folder..."
-#~ msgstr "Eraman karpeta honetara..."
-
-#, fuzzy
-#~ msgid "Add Sender to Address_book"
-#~ msgstr "Gehitu bidaltzailea _helbide-liburuan"
-
-#, fuzzy
-#~ msgid "Appl_y Filters"
-#~ msgstr "Aplikatu iragazkiak"
-
-#, fuzzy
-#~ msgid "Crea_te Rule From Message"
-#~ msgstr "Sortu _araua mezutik"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List"
-#~ msgstr "Posta-zerrendaren araberako karpeta birtuala"
-
-#, fuzzy
-#~ msgid "Filter on _Mailing List (%s)"
-#~ msgstr "Posta-zerrendaren araberako iragazkia (%s)"
-
-#, fuzzy
-#~ msgid "VFolder on M_ailing List (%s)"
-#~ msgstr "Posta-zerrendaren araberako karpeta birtuala (%s)"
-
-#~ msgid "Don't show this message again."
-#~ msgstr "Ez erakutsi mezu hau berriro."
-
-#~ msgid ""
-#~ "You have not configured the mail client.\n"
-#~ "You need to do this before you can send,\n"
-#~ "receive or compose mail.\n"
-#~ "Would you like to configure it now?"
-#~ msgstr ""
-#~ "Ez duzu konfiguratu posta-bezeroa.\n"
-#~ "Konfiguratu egin behar duzu mezuak bidali,\n"
-#~ "jaso edo prestatu ahal izateko.\n"
-#~ "Orain konfiguratu nahi duzu?"
-
-#~ msgid ""
-#~ "You need to configure an identity\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Identitatea konfiguratu behar duzu\n"
-#~ "mezua idatzi ahal izateko."
-
-#~ msgid ""
-#~ "You need to configure a mail transport\n"
-#~ "before you can compose mail."
-#~ msgstr ""
-#~ "Posta-garraioa konfiguratu behar duzu\n"
-#~ "mezua idatzi ahal izateko."
-
-#, fuzzy
-#~ msgid ""
-#~ "You are sending an HTML-formatted message. Please make sure that\n"
-#~ "the following recipients are willing and able to receive HTML mail:\n"
-#~ msgstr ""
-#~ "HTML formatuko mezua bidaltzera zoaz, baina hartzaile hauek ez dute HTML "
-#~ "formatuko mezurik jaso nahi:\n"
-
-#~ msgid "Send anyway?"
-#~ msgstr "Hala ere bidali nahi duzu?"
-
-#~ msgid ""
-#~ "This message has no subject.\n"
-#~ "Really send?"
-#~ msgstr ""
-#~ "Mezu honek ez du gairik.\n"
-#~ "Ziur zaude bidali nahi duzula?"
-
-#~ msgid ""
-#~ "Since the contact list you are sending to is configured to hide the "
-#~ "list's addresses, this message will contain only Bcc recipients."
-#~ msgstr ""
-#~ "Mezua bidali behar diozun kontaktu-zerrenda helbidea ezkutuan edukitzeko "
-#~ "konfiguratuta dagoenez, Bcc hartzaileak bakarrik izango ditu mezuak."
-
-#~ msgid "This message contains only Bcc recipients."
-#~ msgstr "Mezu honek Bcc hartzaileak bakarrik ditu."
-
-#~ msgid ""
-#~ "It is possible that the mail server may reveal the recipients by adding "
-#~ "an Apparently-To header.\n"
-#~ "Send anyway?"
-#~ msgstr ""
-#~ "Beharbada posta-zerbitzariak hartzaileak agerian utziko ditu Apparently-"
-#~ "To goiburukoa gehituz.\n"
-#~ "Hala ere bidali nahi duzu?"
-
-#~ msgid "You must specify recipients in order to send this message."
-#~ msgstr "Hartzaileak zehaztu behar dituzu mezua bidaltzeko."
-
-#~ msgid ""
-#~ "Unable to open the drafts folder for this account.\n"
-#~ "Would you like to use the default drafts folder?"
-#~ msgstr ""
-#~ "Ezin da kontu honetako zirriborroen karpeta ireki.\n"
-#~ "Zirriborroen karpeta lehenetsia erabili nahi duzu?"
-
-#~ msgid "an unknown sender"
-#~ msgstr "bidaltzaile ezezaguna"
-
-#~ msgid "On %a, %Y-%m-%d at %H:%M, %%s wrote:"
-#~ msgstr ""
-#~ "Jatorrizko mezua:\n"
-#~ "data: %a, %Y-%m-%d %H:%M, egilea: %%s"
-
-#~ msgid "Move message(s) to"
-#~ msgstr "Eraman mezua(k) hona"
-
-#~ msgid "Copy message(s) to"
-#~ msgstr "Kopiatu mezua(k) hemen"
-
-#~ msgid "Are you sure you want to edit all %d messages?"
-#~ msgstr "Ziur zaude %d mezuak editatu nahi dituzula?"
-
-#~ msgid ""
-#~ "You may only edit messages saved\n"
-#~ "in the Drafts folder."
-#~ msgstr ""
-#~ "Zirriborroen karpetan gordetako mezuak bakarrik\n"
-#~ "edita ditzakezu."
-
-#~ msgid ""
-#~ "You may only resend messages\n"
-#~ "in the Sent folder."
-#~ msgstr ""
-#~ "Bidalitako mezuen karpetako mezuak bakarrik\n"
-#~ "bidal ditzakezu berriro."
-
-#~ msgid "Are you sure you want to resend all %d messages?"
-#~ msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
-
-#~ msgid "No Message Selected"
-#~ msgstr "Ez duzu mezurik hautatu"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot save to `%s'\n"
-#~ " %s"
-#~ msgstr ""
-#~ "Ezin da mezua hartu: %s\n"
-#~ "  %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "`%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "%s badago lehendik\n"
-#~ "Gainidatzi nahi duzu?"
-
-#~ msgid "Save Message As..."
-#~ msgstr "Gorde mezua honela..."
-
-#~ msgid "Save Messages As..."
-#~ msgstr "Gorde mezuak honela..."
-
-#, fuzzy
-#~ msgid ""
-#~ "This operation will permanently erase all messages marked as\n"
-#~ "deleted. If you continue, you will not be able to recover these "
-#~ "messages.\n"
-#~ "\n"
-#~ "Really erase these messages?"
-#~ msgstr ""
-#~ "Eragiketa honek betiko borratuko ditu ezabatutako gisa markatutako "
-#~ "mezuak. Jarraitzen baduzu, ezingo dituzu berreskuratu.\n"
-#~ "\n"
-#~ "Benetan borratu nahi dituzu?"
-
-#~ msgid ""
-#~ "Error loading filter information:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Errorea iragazki-informazioa kargatzean:\n"
-#~ "%s"
-
-#~ msgid "Filters"
-#~ msgstr "Iragazkiak"
-
-#~ msgid "Page %d of %d"
-#~ msgstr "%d/%d orria"
-
-#~ msgid "Print Message"
-#~ msgstr "Inprimatu mezua"
-
-#~ msgid "Printing of message failed"
-#~ msgstr "Huts egin du mezua inprimatzean"
-
-#~ msgid "Are you sure you want to open all %d messages in separate windows?"
-#~ msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
-
-#~ msgid "Could not create a S/MIME signature context."
-#~ msgstr "Ezin izan da S/MIME sinadura-testuingurua sortu."
-
-#~ msgid "Could not create a S/MIME certsonly context."
-#~ msgstr "Ezin izan da S/MIME ziurtagiri-testuingurua sortu."
-
-#~ msgid "Could not create a S/MIME encryption context."
-#~ msgstr "Ezin izan da S/MIME enkriptatze-testuingurua sortu."
-
-#~ msgid "Could not create a S/MIME envelope context."
-#~ msgstr "Ezin izan da S/MIME gutun-azal testuingurua sortu."
-
-#~ msgid "Could not create a S/MIME decode context."
-#~ msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
-
-#, fuzzy
-#~ msgid ""
-#~ "File `%s' already exists.\n"
-#~ "Overwrite it?"
-#~ msgstr ""
-#~ "Izen hori duen fitxategia badago lehendik.\n"
-#~ "Gainidatzi?"
-
-#~ msgid "Save Attachment"
-#~ msgstr "Gorde eranskina"
-
-#~ msgid "Could not create temporary file '%s': %s"
-#~ msgstr "Ezin izan da aldi baterako `%s' fitxategia sortu: %s"
-
-#, fuzzy
-#~ msgid "Save Attachment..."
-#~ msgstr "Gorde eranskina"
-
-#~ msgid "View Inline"
-#~ msgstr "Ikusi barnean"
-
-#~ msgid "Open in %s..."
-#~ msgstr "Ireki honekin: %s..."
-
-#~ msgid "View Inline (via %s)"
-#~ msgstr "Ikusi barnean (%s bidez)"
-
-#~ msgid "Hide"
-#~ msgstr "Ezkutatu"
-
-#~ msgid "External Viewer"
-#~ msgstr "Kanpoko ikustailea"
-
-#, fuzzy
-#~ msgid "Downloading images"
-#~ msgstr "Kargatu iru_diak"
-
-#~ msgid "Loading message content"
-#~ msgstr "Mezuaren edukia kargatzen"
-
-#, fuzzy
-#~ msgid "Overdue:"
-#~ msgstr "A_tzeratutako zereginak:"
-
-#, fuzzy
-#~ msgid "by %B %d, %Y, %l:%M %P"
-#~ msgstr "%b %d %l:%M %p"
-
-#~ msgid "Open Link in Browser"
-#~ msgstr "Ireki esteka arakatzailean"
-
-#~ msgid "Copy Link Location"
-#~ msgstr "Kopiatu estekaren helbidea"
-
-#~ msgid "Save Link as (FIXME)"
-#~ msgstr "Gorde esteka honela (FIXME) "
-
-#~ msgid "Save Image as..."
-#~ msgstr "Gorde irudia honela..."
-
-#~ msgid "%s attachment"
-#~ msgstr "%s eranskina"
-
-#~ msgid "Could not parse MIME message. Displaying as source."
-#~ msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
-
-#~ msgid "Bad Address"
-#~ msgstr "Helbide okerra"
-
-#~ msgid "Reply-To"
-#~ msgstr "Erantzun honi"
-
-#~ msgid "Cc"
-#~ msgstr "Cc"
-
-#~ msgid "Bcc"
-#~ msgstr "Bcc"
-
-#~ msgid ""
-#~ "This message is digitally signed. Click the lock icon for more "
-#~ "information."
-#~ msgstr ""
-#~ "Mezu honek sinadura digitala du.Informazio gehiago ikusteko, egin klik "
-#~ "giltzarrapoaren ikonoan."
-
-#, fuzzy
-#~ msgid "Could not create a PGP verfication context"
-#~ msgstr "Ezin izan da PGP egiaztapen-testuingurua sortu."
-
-#~ msgid "This message is digitally signed and has been found to be authentic."
-#~ msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
-
-#~ msgid ""
-#~ "This message is digitally signed but can not be proven to be authentic."
-#~ msgstr ""
-#~ "Mezu honek sinadura digitala dauka, baina ezin izan da frogatu egiazkoa "
-#~ "dela."
-
-#~ msgid "Pointer to FTP site (%s)"
-#~ msgstr "FTP gunerako erakuslea (%s)"
-
-#~ msgid "Pointer to local file (%s) valid at site \"%s\""
-#~ msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
-
-#~ msgid "Pointer to local file (%s)"
-#~ msgstr "(%s) fitxategi lokalerako erakuslea"
-
-#~ msgid "Pointer to remote data (%s)"
-#~ msgstr "(%s)urruneko datuetarako erakuslea"
-
-#~ msgid "Pointer to unknown external data (\"%s\" type)"
-#~ msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
-
-#~ msgid "Malformed external-body part."
-#~ msgstr "Kanpoko goputz-zatia gaizki osatuta dago."
-
-#~ msgid "However, the message was successfully sent."
-#~ msgstr "Hala ere, mezua ongi bidali da."
-
-#~ msgid "(Untitled Message)"
-#~ msgstr "(Mezu izengabea)"
-
-#~ msgid "Untitled Message"
-#~ msgstr "Mezu izengabea"
-
-#~ msgid "Empty Message"
-#~ msgstr "Mezu hutsa"
-
-#~ msgid "Find in Message"
-#~ msgstr "Bilatu mezuan"
-
-#~ msgid "Case Sensitive"
-#~ msgstr "Maiuskula/minuskula"
-
-#~ msgid "Search Forward"
-#~ msgstr "Bilatu aurrerantz"
-
-#~ msgid "Find:"
-#~ msgstr "Bilatu:"
-
-#~ msgid "Matches:"
-#~ msgstr "Bat datozenak:"
-
-#~ msgid "Forwarded Message"
-#~ msgstr "Birbidalitako mezua"
-
-#~ msgid "(No subject)"
-#~ msgstr "(Gairik ez)"
-
-#~ msgid "%s - Message"
-#~ msgstr "%s - Mezua"
-
-#~ msgid "Scanning folders under %s on \"%s\""
-#~ msgstr "\"%2$s\"(e)ko %1$s(r)en azpian dauden karpetak eskaneatzen"
-
-#~ msgid "Scanning root-level folders on \"%s\""
-#~ msgstr "\"%s\"(e)ko erro-mailako karpetan eskaneatzen"
-
-#~ msgid "Subscribing to folder \"%s\""
-#~ msgstr "\"%s\" karpetan harpidetzen"
-
-#~ msgid "Unsubscribing to folder \"%s\""
-#~ msgstr "\"%s\" karpetaren harpidetza kentzen"
-
-#~ msgid "No server has been selected"
-#~ msgstr "Ez da zerbitzaririk hautatu"
-
-#~ msgid "Please select a server."
-#~ msgstr "Hautatu zerbitzari bat."
-
-#, fuzzy
-#~ msgid "Scanning folders ..."
-#~ msgstr "Gorde karpetan..."
-
-#~ msgid "Save As..."
-#~ msgstr "Gorde honela..."
-
-#~ msgid "Information"
-#~ msgstr "Informazioa"
-
-#~ msgid "Question"
-#~ msgstr "Galdera"
-
-#~ msgid "Message"
-#~ msgstr "Mezua"
-
 #~ msgid "Search"
 #~ msgstr "Bilatu"
 
@@ -29176,6 +28868,9 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Cannot initialize Evolution's mail config component."
 #~ msgstr "Ezin da Evolution-en posta konfiguratzeko osagaia hasieratu."
 
+#~ msgid "Cannot initialize Evolution's folder info component."
+#~ msgstr "Ezin da Evolution-en karpeta-informazioaren osagaia hasieratu."
+
 #~ msgid "Factory to import mbox into Evolution"
 #~ msgstr "mbox Evolution-era inportatzeko fabrika"
 
@@ -29245,6 +28940,9 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Marquette"
 #~ msgstr "Marquette"
 
+#~ msgid "Executive summary component could not initialize Bonobo.\n"
+#~ msgstr "Laneko laburpena egiteko osagaiak ezin izan du Bonobo hasieratu.\n"
+
 #, fuzzy
 #~ msgid "Configuration control for Evolution folder settings."
 #~ msgstr "Evolution-en mezu-prestatzailerako fabrika."
@@ -29939,6 +29637,30 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Could not encrypt: encoding failed."
 #~ msgstr "Ezin izan da enkriptatu: kodetzeak huts egin du."
 
+#~ msgid "Please enter the NNTP password for %s@%s"
+#~ msgstr "Idatzi %s@%s(r)en NNTP pasahitza"
+
+#~ msgid "Server rejected username"
+#~ msgstr "Zerbitzariak erabiltzaile-izena ezetsi du"
+
+#~ msgid "Failed to send username to server"
+#~ msgstr "Huts egin du erabiltzaile-izena zerbitzarira bidaltzean"
+
+#~ msgid "Server rejected username/password"
+#~ msgstr "Zerbitzariak erabiltzaile-izena/pasahitza ezetsi du"
+
+#~ msgid "Internal error: uid in invalid format: %s"
+#~ msgstr "Barne-errorea: uid formatu baliogabean: %s"
+
+#~ msgid "Could not get group list from server."
+#~ msgstr "Ezin izan da talde-zerrenda hartu zerbitzaritik."
+
+#~ msgid "Unable to load grouplist file for %s: %s"
+#~ msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia kargatu: %s"
+
+#~ msgid "Unable to save grouplist file for %s: %s"
+#~ msgstr "Ezin da %s(r)en talde-zerrendaren fitxategia gorde: %s"
+
 #~ msgid "Could not find 'From' address in message"
 #~ msgstr "Ezin izan da 'Nork' helbidea aurkitu mezuan"
 
@@ -29948,6 +29670,67 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Evolution component for the executive summary."
 #~ msgstr "Evolution-en laneko laburpena egiteko osagaia."
 
+#~ msgid "Cannot initialize Evolution's Executive Summary component."
+#~ msgstr "Ezin da hasieratu Evolution-en laneko laburpena egiteko osagaia."
+
+#~ msgid ""
+#~ "You can select a different HTML page for the background of the Executive "
+#~ "Summary.\n"
+#~ "\n"
+#~ "Just leave it blank for the default"
+#~ msgstr ""
+#~ "Beste HTML orri bat hauta dezakezu Laneko Laburpenaren atzeko planorako.\n"
+#~ "\n"
+#~ "Utzi hutsik lehenetsirako"
+
+#~ msgid "Open %s with the default GNOME application"
+#~ msgstr "Ireki %s GNOME aplikazio lehenetsiarekin"
+
+#~ msgid "Open %s with the default GNOME web browser"
+#~ msgstr "Ireki %s GNOME web arakatzaile lehenetsiarekin"
+
+#~ msgid "Send an email to %s"
+#~ msgstr "Bidali mezua -> %s"
+
+#~ msgid "Run %s"
+#~ msgstr "Exekutatu %s"
+
+#~ msgid "Close %s"
+#~ msgstr "Itxi %s"
+
+#~ msgid "Move %s to the left"
+#~ msgstr "Eraman %s ezkerrera"
+
+#~ msgid "Move %s to the right"
+#~ msgstr "Eraman %s eskuinera"
+
+#~ msgid "Move %s into the previous row"
+#~ msgstr "Eraman %s aurreko errenkadara"
+
+#~ msgid "Move %s into the next row"
+#~ msgstr "Eraman %s hurrengo errenkadara"
+
+#
+#~ msgid "page"
+#~ msgstr "orrialdea"
+
+#~ msgid ""
+#~ "Cannot open the HTML file:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ezin da HTML fitxategia ireki:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Error reading data:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Errorea datuak irakurtzean:\n"
+#~ "%s"
+
+#~ msgid "File does not have a place for the services.\n"
+#~ msgstr "Fitxategiak ez du lekurik zerbitzuentzat.\n"
+
 #~ msgid ""
 #~ "Executive summary component could not initialize Bonobo.\n"
 #~ "If there was a warning message about the RootPOA, it probably means\n"
@@ -29975,6 +29758,15 @@ msgstr "Evolution-en helbide-liburuko minitxartelen ikustailea"
 #~ msgid "Test service"
 #~ msgstr "Proba-zerbitzua"
 
+#~ msgid "Update automatically"
+#~ msgstr "Eguneratu automatikoki"
+
+#~ msgid "Update now"
+#~ msgstr "Eguneratu orain"
+
+#~ msgid "Update every "
+#~ msgstr "Eguneratze-maiztasuna"
+
 #~ msgid "Enter folder URI"
 #~ msgstr "Idatzi karpetaren URIa"
author	Ettore Perazzoli <ettore@src.gnome.org>	2003-10-22 02:28:34 +0800
committer	Ettore Perazzoli <ettore@src.gnome.org>	2003-10-22 02:28:34 +0800
commit	0fb08f3ff81575a4749d851404233f34252dd2f2 (patch)
tree	7e03befedc3a76fd104921dbbc616810d87333be /po/eu.po
parent	0e19f2c16de592607a341eb9974d31e4e47e02b5 (diff)
download	gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.gz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.bz2 gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.lz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.xz gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.tar.zst gsoc2013-evolution-0fb08f3ff81575a4749d851404233f34252dd2f2.zip