[evolution-data-server] Updated Basque language



commit 5881af4e47d4828c81c95143b82a41f5753a5534
Author: Inaki Larranaga Murgoitio <dooteo zundan com>
Date:   Mon Apr 4 14:48:54 2011 +0200

    Updated Basque language

 po/eu.po | 4260 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 2093 insertions(+), 2167 deletions(-)
---
diff --git a/po/eu.po b/po/eu.po
index 1273f19..7789ac8 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,86 +1,167 @@
 # translation of eu.po to Basque
-# Copyright (C) 2001, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 #
-# Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>, 2005, 2006,2007,2008, 2009, 2010.
+# Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>, 2005, 2006,2007,2008, 2009, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2010-03-02 07:08+0000\n"
-"PO-Revision-Date: 2010-03-22 20:01+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-04-04 14:32+0200\n"
+"PO-Revision-Date: 2011-04-04 14:48+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>\n"
 "Language-Team: Basque <itzulpena euskalgnu org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
 "\n"
 
-#: ../addressbook/backends/file/e-book-backend-file.c:560
+#: ../addressbook/backends/file/e-book-backend-file.c:570
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:474
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:475
 msgid "Loading..."
 msgstr "Kargatzen..."
 
-#: ../addressbook/backends/file/e-book-backend-file.c:563
+#: ../addressbook/backends/file/e-book-backend-file.c:573
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4551
-#: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4506
+#: ../addressbook/backends/vcf/e-book-backend-vcf.c:477
 msgid "Searching..."
 msgstr "Bilatzen..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4715
+#. Query for new contacts asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:589
+msgid "Querying for updated contactsâ?¦"
+msgstr "Kontsultatu eguneratutako kontaktuak..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:624
+msgid "Personal"
+msgstr "Pertsonala"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:626
+msgid "Friends"
+msgstr "Lagunak"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:628
+msgid "Family"
+msgstr "Familia"
+
+#: ../addressbook/backends/google/e-book-backend-google.c:630
+msgid "Coworkers"
+msgstr "Lankideak"
+
+#. Run the query asynchronously
+#: ../addressbook/backends/google/e-book-backend-google.c:707
+msgid "Querying for updated groupsâ?¦"
+msgstr "Kontsultatu eguneratutako taldeak..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:891
+msgid "Creating new contactâ?¦"
+msgstr "Kontaktu berria sortzen..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:984
+msgid "Deleting contactâ?¦"
+msgstr "Kontaktua ezabatzen..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1092
+msgid "Modifying contactâ?¦"
+msgstr "Kontaktua eraldatzen..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1199
+msgid "Loadingâ?¦"
+msgstr "Kargatzen..."
+
+#: ../addressbook/backends/google/e-book-backend-google.c:1346
+msgid "Authenticating with the serverâ?¦"
+msgstr "Zerbitzariarekin autentifikatzen..."
+
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2699
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4665
 #, c-format
 msgid "Downloading contacts (%d)... "
 msgstr "Kontaktuak deskargatzen (%d)..."
 
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
-#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3073
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2849
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3030
+#: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3077
 #, c-format
 msgid "Updating contacts cache (%d)... "
 msgstr "Kontaktuen cache-a eguneratzen (%d)..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:816
+#. Translators: An error message shown to a user when trying to do an operation on the LDAP address book which is not connected to the server
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:173
+msgid "Not connected"
+msgstr "Konektatu gabe"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:764
 msgid "Using Distinguished Name (DN)"
 msgstr "DNa erabiltzen"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:819
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:767
 msgid "Using Email Address"
 msgstr "Helbide elektronikoa erabiltzen"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1096
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1033
 msgid "Reconnecting to LDAP server..."
 msgstr "LDAP zerbitzariarekin berriro konektatzen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1738
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1158
+msgid "Invalid DN syntax"
+msgstr "DN sintaxi baliogabea"
+
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1675
 msgid "Adding contact to LDAP server..."
 msgstr "LDAP zerbitzarian kontaktua gehitzen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1872
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1807
 msgid "Removing contact from LDAP server..."
 msgstr "LDAP zerbitzaritik kontaktua kentzen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2309
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2243
 msgid "Modifying contact from LDAP server..."
 msgstr "LDAP zerbitzariko kontaktua aldatzen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4412
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4356
 msgid "Receiving LDAP search results..."
 msgstr "LDAP bilaketaren emaitzak jasotzen..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4573
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4528
 msgid "Error performing search"
 msgstr "Errorea bilaketa egitean"
 
-#: ../addressbook/libebook/e-book.c:2149
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:273
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:881
+#: ../addressbook/libedata-book/e-data-book.c:441
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:523
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:552
+#: ../calendar/backends/http/e-cal-backend-http.c:435
+#: ../calendar/libecal/e-cal.c:4177
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:160
+#: ../camel/providers/imap/camel-imap-command.c:481
+#: ../camel/providers/imap/camel-imap-store.c:425
+#: ../camel/providers/pop3/camel-pop3-store.c:495
+#: ../camel/providers/smtp/camel-smtp-transport.c:497
+#: ../servers/groupwise/e-gw-connection.c:243
+msgid "Unknown error"
+msgstr "Errore ezezaguna"
+
+#: ../addressbook/backends/webdav/e-book-backend-webdav.c:335
 #, c-format
-msgid "%s: there was no source for uid `%s' stored in gconf."
-msgstr "%s: ez dago '%s' uid-aren iturbururik gordeta gconf-en."
+msgid "Create resource '%s' failed with HTTP status: %d (%s)"
+msgstr "%s baliabidea sortzeak huts egin du HTTP egoerarekin: %d (%s)"
+
+#: ../addressbook/libebook/e-book.c:3160
+#, c-format
+msgid "%s: there was no source for UID '%s' stored in GConf."
+msgstr "%s: ez dago '%s' UIDaren iturbururik gordeta GConf-en."
+
+#: ../addressbook/libebook/e-book.c:3516
+#: ../addressbook/libedata-book/e-data-book.c:183
+msgid "Address book does not exist"
+msgstr "Helbide-liburua ez dago"
 
 #. Dummy row as EContactField starts from 1
 #: ../addressbook/libebook/e-contact.c:115
@@ -268,7 +349,7 @@ msgstr "Weblog-aren URLa"
 
 #. Contact categories
 #: ../addressbook/libebook/e-contact.c:178
-#: ../libedataserverui/e-categories-dialog.c:671
+#: ../libedataserverui/e-categories-dialog.c:757
 msgid "Categories"
 msgstr "Kategoriak"
 
@@ -348,28 +429,28 @@ msgid "GroupWise Work Screen Name 3"
 msgstr "Groupwise-ko laneko 3. pantaila-izena"
 
 #: ../addressbook/libebook/e-contact.c:203
-msgid "Jabber Home Id 1"
-msgstr "Jabber-eko etxeko 1. id-a"
+msgid "Jabber Home ID 1"
+msgstr "Jabber-eko etxeko 1. IDa"
 
 #: ../addressbook/libebook/e-contact.c:204
-msgid "Jabber Home Id 2"
-msgstr "Jabber-eko etxeko 2. id-a"
+msgid "Jabber Home ID 2"
+msgstr "Jabber-eko etxeko 2. IDa"
 
 #: ../addressbook/libebook/e-contact.c:205
-msgid "Jabber Home Id 3"
-msgstr "Jabber-eko etxeko 3. id-a"
+msgid "Jabber Home ID 3"
+msgstr "Jabber-eko etxeko 3. IDa"
 
 #: ../addressbook/libebook/e-contact.c:206
-msgid "Jabber Work Id 1"
-msgstr "Jabber-eko laneko 1. id-a"
+msgid "Jabber Work ID 1"
+msgstr "Jabber-eko laneko 1. IDa"
 
 #: ../addressbook/libebook/e-contact.c:207
-msgid "Jabber Work Id 2"
-msgstr "Jabber-eko laneko 2. id-a"
+msgid "Jabber Work ID 2"
+msgstr "Jabber-eko laneko 2. IDa"
 
 #: ../addressbook/libebook/e-contact.c:208
-msgid "Jabber Work Id 3"
-msgstr "Jabber-eko laneko 3. id-a"
+msgid "Jabber Work ID 3"
+msgstr "Jabber-eko laneko 3. IDa"
 
 #: ../addressbook/libebook/e-contact.c:209
 msgid "Yahoo! Home Screen Name 1"
@@ -420,28 +501,28 @@ msgid "MSN Work Screen Name 3"
 msgstr "MSNko laneko 3. pantaila-izena"
 
 #: ../addressbook/libebook/e-contact.c:221
-msgid "ICQ Home Id 1"
-msgstr "ICQko etxeko 1. id-a"
+msgid "ICQ Home ID 1"
+msgstr "ICQko etxeko 1. IDa"
 
 #: ../addressbook/libebook/e-contact.c:222
-msgid "ICQ Home Id 2"
-msgstr "ICQko etxeko 2. id-a"
+msgid "ICQ Home ID 2"
+msgstr "ICQko etxeko 2. IDa"
 
 #: ../addressbook/libebook/e-contact.c:223
-msgid "ICQ Home Id 3"
-msgstr "ICQko etxeko 3. id-a"
+msgid "ICQ Home ID 3"
+msgstr "ICQko etxeko 3. IDa"
 
 #: ../addressbook/libebook/e-contact.c:224
-msgid "ICQ Work Id 1"
-msgstr "ICQko laneko 1. id-a"
+msgid "ICQ Work ID 1"
+msgstr "ICQko laneko 1. IDa"
 
 #: ../addressbook/libebook/e-contact.c:225
-msgid "ICQ Work Id 2"
-msgstr "ICQko laneko 2. id-a"
+msgid "ICQ Work ID 2"
+msgstr "ICQko laneko 2. IDa"
 
 #: ../addressbook/libebook/e-contact.c:226
-msgid "ICQ Work Id 3"
-msgstr "ICQko laneko 3. id-a"
+msgid "ICQ Work ID 3"
+msgstr "ICQko laneko 3. IDa"
 
 #. Last modified time
 #: ../addressbook/libebook/e-contact.c:229
@@ -497,12 +578,12 @@ msgid "AIM Screen Name List"
 msgstr "AIMko pantaila-izenen zerrenda"
 
 #: ../addressbook/libebook/e-contact.c:250
-msgid "GroupWise Id List"
-msgstr "Groupwise-ko id-en zerrenda"
+msgid "GroupWise ID List"
+msgstr "Groupwise-ko IDen zerrenda"
 
 #: ../addressbook/libebook/e-contact.c:251
-msgid "Jabber Id List"
-msgstr "Jabber-eko id-en zerrenda"
+msgid "Jabber ID List"
+msgstr "Jabber-eko IDen zerrenda"
 
 #: ../addressbook/libebook/e-contact.c:252
 msgid "Yahoo! Screen Name List"
@@ -513,8 +594,8 @@ msgid "MSN Screen Name List"
 msgstr "MSNko pantaila-izenen zerrenda"
 
 #: ../addressbook/libebook/e-contact.c:254
-msgid "ICQ Id List"
-msgstr "ICQ id-en zerrenda"
+msgid "ICQ ID List"
+msgstr "ICQ IDen zerrenda"
 
 #: ../addressbook/libebook/e-contact.c:256
 msgid "Wants HTML Mail"
@@ -533,8 +614,7 @@ msgid "Birth Date"
 msgstr "Jaioteguna"
 
 #: ../addressbook/libebook/e-contact.c:262
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
-#: ../libedataserver/e-categories.c:45
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:723
 msgid "Anniversary"
 msgstr "Urteurrena"
 
@@ -544,31 +624,31 @@ msgid "X.509 Certificate"
 msgstr "X.509 ziurtagiria"
 
 #: ../addressbook/libebook/e-contact.c:267
-msgid "Gadu-Gadu Home Id 1"
-msgstr "Gadu-Gadu etxeko 1. id-a"
+msgid "Gadu-Gadu Home ID 1"
+msgstr "Gadu-Gadu etxeko 1. IDa"
 
 #: ../addressbook/libebook/e-contact.c:268
-msgid "Gadu-Gadu Home Id 2"
-msgstr "Gadu-Gadu etxeko 2. id-a"
+msgid "Gadu-Gadu Home ID 2"
+msgstr "Gadu-Gadu etxeko 2. IDa"
 
 #: ../addressbook/libebook/e-contact.c:269
-msgid "Gadu-Gadu Home Id 3"
-msgstr "Gadu-Gadu etxeko 3. id-a"
+msgid "Gadu-Gadu Home ID 3"
+msgstr "Gadu-Gadu etxeko 3. IDa"
 
 #: ../addressbook/libebook/e-contact.c:270
-msgid "Gadu-Gadu Work Id 1"
-msgstr "Gadu-Gadu laneko 1. id-a"
+msgid "Gadu-Gadu Work ID 1"
+msgstr "Gadu-Gadu laneko 1. IDa"
 
 #: ../addressbook/libebook/e-contact.c:271
-msgid "Gadu-Gadu Work Id 2"
-msgstr "Gadu-Gadu laneko 2. id-a"
+msgid "Gadu-Gadu Work ID 2"
+msgstr "Gadu-Gadu laneko 2. IDa"
 
 #: ../addressbook/libebook/e-contact.c:272
-msgid "Gadu-Gadu Work Id 3"
-msgstr "Gadu-Gadu laneko 3. id-a"
+msgid "Gadu-Gadu Work ID 3"
+msgstr "Gadu-Gadu laneko 3. IDa"
 
 #: ../addressbook/libebook/e-contact.c:273
-msgid "Gadu-Gadu Id List"
+msgid "Gadu-Gadu ID List"
 msgstr "Gadu-Gadu IDen zerrenda"
 
 #. Geo information
@@ -612,363 +692,523 @@ msgstr "Skype-ko izenen zerrenda"
 msgid "SIP address"
 msgstr "SIP helbidea"
 
-#: ../addressbook/libebook/e-contact.c:1513
+#: ../addressbook/libebook/e-contact.c:1517
 #: ../addressbook/libebook/e-destination.c:739
 msgid "Unnamed List"
 msgstr "Zerrenda izengabea"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:290
+#: ../addressbook/libedata-book/e-data-book-factory.c:301
+#: ../addressbook/libedata-book/e-data-book-factory.c:334
+#: ../calendar/libedata-cal/e-data-cal-factory.c:362
 #, c-format
 msgid "Empty URI"
 msgstr "URI hutsik"
 
-#: ../addressbook/libedata-book/e-data-book-factory.c:305
-#: ../addressbook/libedata-book/e-data-book-factory.c:332
-#: ../calendar/libedata-cal/e-data-cal-factory.c:323
-#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#: ../addressbook/libedata-book/e-data-book-factory.c:320
+#: ../addressbook/libedata-book/e-data-book-factory.c:370
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
 #, c-format
-#| msgid "Invalid purpose"
 msgid "Invalid source"
 msgstr "Iturburu baliogabea"
 
-#: ../addressbook/libedata-book/e-data-book.c:301
-#| msgid "Cannot open message"
-msgid "Cannot open book"
-msgstr "Ezin da liburua ireki"
+#: ../addressbook/libedata-book/e-data-book.c:173
+#: ../calendar/libedata-cal/e-data-cal.c:108
+msgid "Success"
+msgstr "Ongi burutu da"
 
-#: ../addressbook/libedata-book/e-data-book.c:319
-msgid "Cannot remove book"
-msgstr "Ezin da liburua kendu"
+#: ../addressbook/libedata-book/e-data-book.c:174
+#: ../calendar/libedata-cal/e-data-cal.c:109
+msgid "Repository offline"
+msgstr "Biltegia lineaz kanpo dago"
 
-#: ../addressbook/libedata-book/e-data-book.c:331
-#: ../addressbook/libedata-book/e-data-book.c:346
-#| msgid "Cannot get folder container %s"
-msgid "Cannot get contact"
-msgstr "Ezin da kontaktua lortu"
+#: ../addressbook/libedata-book/e-data-book.c:175
+#: ../calendar/libecal/e-cal.c:4159 ../calendar/libedata-cal/e-data-cal.c:110
+msgid "Permission denied"
+msgstr "Baimena ukatuta"
 
-#: ../addressbook/libedata-book/e-data-book.c:358
-msgid "Empty query"
-msgstr "Kontsulta hutsik"
+#: ../addressbook/libedata-book/e-data-book.c:176
+msgid "Contact not found"
+msgstr "Kontaktua ez da aurkitu"
 
-#: ../addressbook/libedata-book/e-data-book.c:402
-#| msgid "Cannot authenticate to server: %s"
-msgid "Cannot authenticate user"
-msgstr "Ezin da erabiltzailea autentifikatu"
-
-#: ../addressbook/libedata-book/e-data-book.c:414
-#: ../addressbook/libedata-book/e-data-book.c:429
-#| msgid "Cannot add encryption certificate"
-msgid "Cannot add contact"
-msgstr "Ezin da kontaktua gehitu"
-
-#: ../addressbook/libedata-book/e-data-book.c:444
-#: ../addressbook/libedata-book/e-data-book.c:459
-#| msgid "Cannot create encoder context"
-msgid "Cannot modify contact"
-msgstr "Ezin da kontaktua eraldatu"
-
-#: ../addressbook/libedata-book/e-data-book.c:494
-#| msgid "Cannot create encoder context"
-msgid "Cannot remove contacts"
-msgstr "Ezin dira kontaktuak kendu"
-
-#: ../addressbook/libedata-book/e-data-book.c:569
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+#: ../addressbook/libedata-book/e-data-book.c:177
+msgid "Contact ID already exists"
+msgstr "Kontaktuaren IDa badago lehendik"
+
+#: ../addressbook/libedata-book/e-data-book.c:178
+#: ../calendar/libedata-cal/e-data-cal.c:115
+msgid "Authentication Failed"
+msgstr "Huts egin du autentifikatzean"
+
+#: ../addressbook/libedata-book/e-data-book.c:179
+#: ../calendar/libedata-cal/e-data-cal.c:116
+msgid "Authentication Required"
+msgstr "Autentifikazioa behar da"
+
+#: ../addressbook/libedata-book/e-data-book.c:180
+#: ../calendar/libedata-cal/e-data-cal.c:117
+msgid "Unsupported field"
+msgstr "Onartzen ez den eremua"
+
+#: ../addressbook/libedata-book/e-data-book.c:181
+#: ../calendar/libedata-cal/e-data-cal.c:119
+msgid "Unsupported authentication method"
+msgstr "Autentifikazio metodoa ez da onartzen"
+
+#: ../addressbook/libedata-book/e-data-book.c:182
+#: ../calendar/libedata-cal/e-data-cal.c:120
+msgid "TLS not available"
+msgstr "TLS ez dago erabilgarri"
+
+#: ../addressbook/libedata-book/e-data-book.c:184
+msgid "Book removed"
+msgstr "Liburua kenduta"
+
+#: ../addressbook/libedata-book/e-data-book.c:185
+#: ../calendar/libedata-cal/e-data-cal.c:123
+msgid "Not available in offline mode"
+msgstr "Ez dago erabilgarri lineaz kanpo moduan"
+
+#: ../addressbook/libedata-book/e-data-book.c:186
+#: ../calendar/libedata-cal/e-data-cal.c:124
+msgid "Search size limit exceeded"
+msgstr "Bilaketaren tamainaren muga gainditua"
+
+#: ../addressbook/libedata-book/e-data-book.c:187
+#: ../calendar/libedata-cal/e-data-cal.c:125
+msgid "Search time limit exceeded"
+msgstr "Bilaketaren denbora-muga gainditua"
+
+#: ../addressbook/libedata-book/e-data-book.c:188
+#: ../calendar/libedata-cal/e-data-cal.c:126
 msgid "Invalid query"
 msgstr "Kontsulta baliogabea"
 
-#: ../addressbook/libedata-book/e-data-book.c:598
-#| msgid "Cannot get message %s: %s"
-msgid "Cannot get changes"
-msgstr "Ezin dira aldaketak lortu"
+#: ../addressbook/libedata-book/e-data-book.c:189
+#: ../calendar/libedata-cal/e-data-cal.c:127
+msgid "Query refused"
+msgstr "Kontsulta ukatua"
+
+#: ../addressbook/libedata-book/e-data-book.c:190
+#: ../calendar/libedata-cal/e-data-cal.c:128
+msgid "Could not cancel"
+msgstr "Ezin izan da bertan behera utzi"
+
+#. { E_DATA_BOOK_STATUS_OTHER_ERROR,			N_("Other error") },
+#. { OtherError,			N_("Other error") },
+#: ../addressbook/libedata-book/e-data-book.c:192
+#: ../calendar/libedata-cal/e-data-cal.c:130
+msgid "Invalid server version"
+msgstr "Zerbitzari bertsio baliogabea"
+
+#: ../addressbook/libedata-book/e-data-book.c:193
+msgid "No space"
+msgstr "Ez dago lekurik"
+
+#: ../addressbook/libedata-book/e-data-book.c:194
+#: ../calendar/libecal/e-cal.c:4143 ../calendar/libedata-cal/e-data-cal.c:131
+msgid "Invalid argument"
+msgstr "Argumentu baliogabea"
+
+#. Translators: The string for NOT_SUPPORTED error
+#: ../addressbook/libedata-book/e-data-book.c:196
+#: ../calendar/libecal/e-cal.c:4182 ../calendar/libedata-cal/e-data-cal.c:133
+msgid "Not supported"
+msgstr "Ez dago onartuta"
+
+#: ../addressbook/libedata-book/e-data-book.c:204
+#: ../calendar/libedata-cal/e-data-cal.c:141
+msgid "Other error"
+msgstr "Errore ezezaguna"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:325
+#, c-format
+msgid "Cannot open book: %s"
+msgstr "Ezin da liburua ireki: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:347
+#, c-format
+msgid "Cannot remove book: %s"
+msgstr "Ezin da liburua kendu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:364
+#: ../addressbook/libedata-book/e-data-book.c:383
+#, c-format
+msgid "Cannot get contact: %s"
+msgstr "Ezin da kontaktua lortu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:402
+#, c-format
+msgid "Empty query: %s"
+msgstr "Kontsulta hutsik: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:418
+#, c-format
+msgid "Cannot get contact list: %s"
+msgstr "Ezin da kontaktuen zerrenda lortu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:457
+#, c-format
+msgid "Cannot authenticate user: %s"
+msgstr "Ezin da erabiltzailea autentifikatu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:472
+#: ../addressbook/libedata-book/e-data-book.c:491
+#, c-format
+msgid "Cannot add contact: %s"
+msgstr "Ezin da kontaktua gehitu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:513
+#: ../addressbook/libedata-book/e-data-book.c:532
+#, c-format
+msgid "Cannot modify contact: %s"
+msgstr "Ezin da kontaktua eraldatu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:571
+#, c-format
+msgid "Cannot remove contacts: %s"
+msgstr "Ezin dira kontaktuak kendu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:610
+#, c-format
+msgid "Cannot get supported fields: %s"
+msgstr "Ezin dira eremu erabilgarriak lortu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:625
+#, c-format
+msgid "Cannot get required fields: %s"
+msgstr "Ezin dira beharrezko eremuak lortu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:640
+#, c-format
+msgid "Cannot get supported authentication methods: %s"
+msgstr "Ezin dira onartutako autentifikazio metodoak lortu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:666
+#: ../addressbook/libedata-book/e-data-book.c:677
+#, c-format
+msgid "Invalid query: %s"
+msgstr "Kontsulta baliogabea: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:713
+#, c-format
+msgid "Cannot get changes: %s"
+msgstr "Ezin dira aldaketak lortu: %s"
+
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../addressbook/libedata-book/e-data-book.c:755
+#, c-format
+msgid "Cancel operation failed: %s"
+msgstr "Bertan behera uzteko eragiketak huts egin du: %s"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:521
+#, c-format
+msgid "Server is unreachable (%s)"
+msgstr "Zerbitzaria ez dago atzigarri (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:549
+#, c-format
+msgid "Unexpected HTTP status code %d returned (%s)"
+msgstr "Ustekabeko HTTP egoeraren %d kodea itzuli da (%s)"
+
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2096
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:2496
+#, c-format
+msgid ""
+"Server is unreachable, calendar is opened in read-only mode.\n"
+"Error message: %s"
+msgstr ""
+"Zerbitzaria ezin da atzitu, egutegia irakurtzeko soilik moduan irekita dago.\n"
+"Errorearen mezua: %s"
 
-#: ../addressbook/libedata-book/e-data-book.c:699
-#| msgid "Could not cancel operation"
-msgid "Cannot complete operation"
-msgstr "Ezin da eragiketa osatu"
+#: ../calendar/backends/caldav/e-cal-backend-caldav.c:4247
+msgid "Calendar doesn't support Free/Busy"
+msgstr "Egutegiak ez du Libre/Lanpetuta onartzen"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:717
-#: ../libedataserver/e-categories.c:46
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:725
 msgid "Birthday"
 msgstr "Urtebetetzea"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:746
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:754
 #, c-format
 msgid "Birthday: %s"
 msgstr "Urtebetetzea: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:770
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:778
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Urteurrena: %s"
 
-#: ../calendar/backends/file/e-cal-backend-file.c:236
+#: ../calendar/backends/file/e-cal-backend-file.c:251
 msgid "Cannot save calendar data: Malformed URI."
 msgstr "Egutegiko datuak ezin dira gorde: gaizki osatutako URIa."
 
-#: ../calendar/backends/file/e-cal-backend-file.c:243
-#: ../calendar/backends/file/e-cal-backend-file.c:249
+#: ../calendar/backends/file/e-cal-backend-file.c:258
+#: ../calendar/backends/file/e-cal-backend-file.c:264
 msgid "Cannot save calendar data"
 msgstr "Ezin dira egutegiko datuak gorde"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
-msgid "Could not create thread for getting deltas"
-msgstr "Ezin izan da haria sortu deltak lortzeko"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
-#: ../calendar/backends/google/e-cal-backend-google.c:1144
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1081
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1382
-#: ../calendar/backends/http/e-cal-backend-http.c:678
-#: ../calendar/backends/weather/e-cal-backend-weather.c:492
-msgid "Could not create cache file"
-msgstr "Cache-fitxategia ezin izan da sortu"
-
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1094
-msgid "Could not create thread for populating cache"
-msgstr "Ezin izan da haria sortu cache-a osatzeko"
-
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1082
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2121
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1130
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2101
 msgid "Reply Requested: by "
 msgstr "Erantzuna eskatuta: honek"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1087
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2126
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise-utils.c:1135
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2106
 msgid "Reply Requested: When convenient"
 msgstr "Erantzuna eskatuta: komeni denean"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:283
-#, c-format
-msgid "Loading %s items"
-msgstr "%s elementuak kargatzen"
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:329
+msgid "Loading Appointment items"
+msgstr "Hitzorduko elementuak kargatzen"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:331
+msgid "Loading Task items"
+msgstr "Zereginetako elementuak kargatzen"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:333
+msgid "Loading Note items"
+msgstr "Oharren elementuak kargatzen"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:335
+msgid "Loading items"
+msgstr "Elementuak kargatzen"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:919
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:951
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:977
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1014
 msgid "Invalid server URI"
 msgstr "Zerbitzari-URI baliogabea"
 
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:996
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1005
-#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1099
-#: ../calendar/libecal/e-cal.c:4020
-#: ../calendar/libedata-cal/e-cal-backend-util.c:117
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1334
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1370
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1385
-#: ../camel/providers/groupwise/camel-groupwise-store.c:591
-#: ../camel/providers/groupwise/camel-groupwise-store.c:766
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:181
-msgid "Authentication failed"
-msgstr "Huts egin du autentifikatzean."
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1115
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1361
+#: ../calendar/backends/http/e-cal-backend-http.c:783
+#: ../calendar/backends/weather/e-cal-backend-weather.c:520
+msgid "Could not create cache file"
+msgstr "Cache-fitxategia ezin izan da sortu"
+
+#: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1127
+msgid "Could not create thread for populating cache"
+msgstr "Ezin izan da haria sortu cache-a osatzeko"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:335
+#: ../calendar/backends/http/e-cal-backend-http.c:423
 msgid "Redirected to Invalid URI"
 msgstr "URI baliogabera birbideratua"
 
-#: ../calendar/backends/http/e-cal-backend-http.c:358
+#: ../calendar/backends/http/e-cal-backend-http.c:456
 msgid "Bad file format."
 msgstr "Okerreko fitxategi-formatua."
 
-#: ../calendar/backends/http/e-cal-backend-http.c:365
+#: ../calendar/backends/http/e-cal-backend-http.c:463
 msgid "Not a calendar."
 msgstr "Ez da egutegia."
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:152
+#: ../calendar/backends/weather/e-cal-backend-weather.c:186
 msgid "Could not retrieve weather data"
 msgstr "Ezin izan da eguraldiaren daturik eskuratu"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:251
+#: ../calendar/backends/weather/e-cal-backend-weather.c:286
 msgid "Weather: Fog"
 msgstr "Eguraldia: behe-lainoa"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:252
+#: ../calendar/backends/weather/e-cal-backend-weather.c:287
 msgid "Weather: Cloudy Night"
 msgstr "Eguraldia: gau lainotsua"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:253
+#: ../calendar/backends/weather/e-cal-backend-weather.c:288
 msgid "Weather: Cloudy"
 msgstr "Eguraldia: lainotsua"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:254
+#: ../calendar/backends/weather/e-cal-backend-weather.c:289
 msgid "Weather: Overcast"
 msgstr "Eguraldia: zeru estalia"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:255
+#: ../calendar/backends/weather/e-cal-backend-weather.c:290
 msgid "Weather: Showers"
 msgstr "Eguraldia: zaparradak"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:256
+#: ../calendar/backends/weather/e-cal-backend-weather.c:291
 msgid "Weather: Snow"
 msgstr "Eguraldia: elurra"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:257
+#: ../calendar/backends/weather/e-cal-backend-weather.c:292
 msgid "Weather: Clear Night"
 msgstr "Eguraldia: gau garbia"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:258
+#: ../calendar/backends/weather/e-cal-backend-weather.c:293
 msgid "Weather: Sunny"
 msgstr "Eguraldia: eguzkitsua"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:259
+#: ../calendar/backends/weather/e-cal-backend-weather.c:294
 msgid "Weather: Thunderstorms"
 msgstr "Eguraldia: trumoi-ekaitza"
 
-#: ../calendar/backends/weather/e-cal-backend-weather.c:405
+#: ../calendar/backends/weather/e-cal-backend-weather.c:440
 msgid "Forecast"
 msgstr "Iragarpena"
 
-#: ../calendar/libecal/e-cal-component.c:1286
+#: ../calendar/libecal/e-cal-component.c:1299
 msgid "Untitled appointment"
 msgstr "Hitzordu izengabea"
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3986
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3987
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3988
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3989
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3990
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3991
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3992
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3993
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3994
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3995
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3996
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3997
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3998
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3999
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:4000
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:4001
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:4002
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:4003
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:4004
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:4005
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:4006
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:4007
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:4008
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:4009
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:4010
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:3976
+#: ../calendar/libecal/e-cal-recur.c:4011
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:3977
+#: ../calendar/libecal/e-cal-recur.c:4012
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:3978
+#: ../calendar/libecal/e-cal-recur.c:4013
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:3979
+#: ../calendar/libecal/e-cal-recur.c:4014
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:3980
+#: ../calendar/libecal/e-cal-recur.c:4015
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:3981
+#: ../calendar/libecal/e-cal-recur.c:4016
 msgid "31st"
 msgstr "31."
 
-#: ../calendar/libecal/e-cal-util.c:688 ../calendar/libecal/e-cal-util.c:715
+#: ../calendar/libecal/e-cal-util.c:678 ../calendar/libecal/e-cal-util.c:705
 msgid "High"
 msgstr "Handia"
 
-#: ../calendar/libecal/e-cal-util.c:690 ../calendar/libecal/e-cal-util.c:717
+#: ../calendar/libecal/e-cal-util.c:680 ../calendar/libecal/e-cal-util.c:707
 msgid "Normal"
 msgstr "Normala"
 
-#: ../calendar/libecal/e-cal-util.c:692 ../calendar/libecal/e-cal-util.c:719
+#: ../calendar/libecal/e-cal-util.c:682 ../calendar/libecal/e-cal-util.c:709
 msgid "Low"
 msgstr "Txikia"
 
 #. An empty string is the same as 'None'.
-#: ../calendar/libecal/e-cal-util.c:713
+#: ../calendar/libecal/e-cal-util.c:703
 msgid "Undefined"
 msgstr "Definitu gabe"
 
-#: ../calendar/libecal/e-cal.c:1173 ../libedataserverui/e-book-auth-util.c:199
+#: ../calendar/libecal/e-cal.c:1236 ../libedataserverui/e-book-auth-util.c:206
+#: ../libedataserverui/e-book-auth-util.c:440
 #, c-format
 msgid "Enter password for %s (user %s)"
 msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
@@ -977,108 +1217,82 @@ msgstr "Idatzi %s(r)en pasahitza (%s erabiltzailea)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1187
+#: ../calendar/libecal/e-cal.c:1250
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Idatzi %s(r)en pasahitza %s erabiltzailearentzako proxy-a gaitzeko"
 
-#: ../calendar/libecal/e-cal.c:3992
-msgid "Invalid argument"
-msgstr "Argumentu baliogabea"
-
-#: ../calendar/libecal/e-cal.c:3994
+#: ../calendar/libecal/e-cal.c:4145
 msgid "Backend is busy"
 msgstr "Motorra lanpetuta dago"
 
-#: ../calendar/libecal/e-cal.c:3996
-#: ../calendar/libedata-cal/e-cal-backend-util.c:105
+#: ../calendar/libecal/e-cal.c:4147
 msgid "Repository is offline"
 msgstr "Biltegia lineaz kanpo dago"
 
-#: ../calendar/libecal/e-cal.c:3998
-#: ../calendar/libedata-cal/e-cal-backend-util.c:129
+#: ../calendar/libecal/e-cal.c:4149
 msgid "No such calendar"
 msgstr "Ez dago halako egutegirik"
 
-#: ../calendar/libecal/e-cal.c:4000
-#: ../calendar/libedata-cal/e-cal-backend-util.c:111
+#: ../calendar/libecal/e-cal.c:4151 ../calendar/libedata-cal/e-data-cal.c:112
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Object not found"
 msgstr "Objektua ez da aurkitu"
 
-#: ../calendar/libecal/e-cal.c:4002
-#: ../calendar/libedata-cal/e-cal-backend-util.c:113
+#: ../calendar/libecal/e-cal.c:4153 ../calendar/libedata-cal/e-data-cal.c:113
 #: ../servers/groupwise/e-gw-connection.c:229
 msgid "Invalid object"
 msgstr "Objektu baliogabea"
 
-#: ../calendar/libecal/e-cal.c:4004
+#: ../calendar/libecal/e-cal.c:4155
 msgid "URI not loaded"
 msgstr "URIa ez da kargatu"
 
-#: ../calendar/libecal/e-cal.c:4006
+#: ../calendar/libecal/e-cal.c:4157
 msgid "URI already loaded"
 msgstr "URIa dagoeneko kargatuta"
 
-#: ../calendar/libecal/e-cal.c:4008
-#: ../calendar/libedata-cal/e-cal-backend-util.c:107
-msgid "Permission denied"
-msgstr "Baimena ukatuta"
-
-#: ../calendar/libecal/e-cal.c:4010
-#: ../calendar/libedata-cal/e-cal-backend-util.c:131
-#: ../servers/groupwise/e-gw-connection.c:237
+#: ../calendar/libecal/e-cal.c:4161 ../servers/groupwise/e-gw-connection.c:237
 msgid "Unknown User"
 msgstr "Erabiltzaile ezezaguna"
 
-#: ../calendar/libecal/e-cal.c:4012
-#: ../calendar/libedata-cal/e-cal-backend-util.c:115
+#: ../calendar/libecal/e-cal.c:4163 ../calendar/libedata-cal/e-data-cal.c:114
 msgid "Object ID already exists"
 msgstr "Objektu-ID hori badago lehendik"
 
-#: ../calendar/libecal/e-cal.c:4014
+#: ../calendar/libecal/e-cal.c:4165
 msgid "Protocol not supported"
 msgstr "Protokoloa ez da onartzen"
 
-#: ../calendar/libecal/e-cal.c:4016
+#: ../calendar/libecal/e-cal.c:4167
 msgid "Operation has been canceled"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: ../calendar/libecal/e-cal.c:4018
-#: ../calendar/libedata-cal/e-cal-backend-util.c:143
+#: ../calendar/libecal/e-cal.c:4169
 msgid "Could not cancel operation"
 msgstr "Ezin izan da eragiketa bertan behera utzi"
 
-#: ../calendar/libecal/e-cal.c:4022
-#: ../calendar/libedata-cal/e-cal-backend-util.c:119
-#: ../camel/providers/smtp/camel-smtp-transport.c:217
+#: ../calendar/libecal/e-cal.c:4171
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1306
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1324
+#: ../camel/providers/groupwise/camel-groupwise-store.c:628
+#: ../camel/providers/groupwise/camel-groupwise-store.c:810
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:87
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#, c-format
+msgid "Authentication failed"
+msgstr "Huts egin du autentifikatzean."
+
+#: ../calendar/libecal/e-cal.c:4173
+#: ../camel/providers/smtp/camel-smtp-transport.c:775
 msgid "Authentication required"
 msgstr "Autentifikazioa behar da"
 
-#: ../calendar/libecal/e-cal.c:4024
-msgid "A CORBA exception has occurred"
-msgstr "CORBA salbuespena gertatu da"
-
-#: ../calendar/libecal/e-cal.c:4026
-#: ../calendar/libedata-cal/e-cal-backend-util.c:146
-#: ../camel/camel-net-utils.c:523
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:741
-#: ../camel/providers/imap4/camel-imap4-engine.c:1547
-#: ../camel/providers/imap4/camel-imap4-engine.c:1585
-#: ../camel/providers/imap4/camel-imap4-engine.c:1629
-#: ../camel/providers/imap4/camel-imap4-engine.c:1684
-#: ../camel/providers/imap4/camel-imap4-store.c:311
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-#: ../camel/providers/pop3/camel-pop3-store.c:582
-#: ../servers/groupwise/e-gw-connection.c:243
-msgid "Unknown error"
-msgstr "Errore ezezaguna"
+#: ../calendar/libecal/e-cal.c:4175
+msgid "A D-Bus exception has occurred"
+msgstr "D-BUS salbuespena gertatu da"
 
-#: ../calendar/libecal/e-cal.c:4028
-#: ../calendar/libedata-cal/e-cal-backend-util.c:103
+#: ../calendar/libecal/e-cal.c:4179
 msgid "No error"
 msgstr "Errorerik ez"
 
@@ -1177,254 +1391,238 @@ msgstr ""
 "\"%s\"(e)k espero du argumentu guztiak kateak izatea, edo argumentu bakarra "
 "izatea boolear faltsua (#f)"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:109
+#: ../calendar/libedata-cal/e-data-cal.c:111
 msgid "Invalid range"
 msgstr "Barruti baliogabea"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:121
-msgid "Unsupported field"
-msgstr "Onartzen ez den eremua"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:123
+#: ../calendar/libedata-cal/e-data-cal.c:118
 msgid "Unsupported method"
 msgstr "Onartzen ez den metodoa"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:125
-msgid "Unsupported authentication method"
-msgstr "Autentifikazio metodoa ez da onartzen"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:127
-msgid "TLS not available"
-msgstr "TLS ez dago erabilgarri"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:133
-msgid "Offline mode unavailable"
-msgstr "Lineaz kanpoko modua ez dago erabilgarri"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:135
-msgid "Search size limit exceeded"
-msgstr "Bilaketaren tamainaren muga gainditua"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:137
-msgid "Search time limit exceeded"
-msgstr "Bilaketaren denbora-muga gainditua"
-
-#: ../calendar/libedata-cal/e-cal-backend-util.c:141
-msgid "Query refused"
-msgstr "Kontsulta ukatua"
+#: ../calendar/libedata-cal/e-data-cal.c:121
+msgid "Calendar does not exist"
+msgstr "Egutegia ez dago."
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:148
-msgid "Invalid server version"
-msgstr "Zerbitzari bertsio baliogabea"
+#: ../calendar/libedata-cal/e-data-cal.c:122
+msgid "Unknown user"
+msgstr "Erabiltzaile ezezaguna"
 
-#: ../calendar/libedata-cal/e-data-cal.c:491
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:608
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar address"
-msgstr "Ezin dira egutegiko helbideak eskuratu"
+msgid "Cannot retrieve calendar address: %s"
+msgstr "Ezin dira egutegiko helbideak eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:509
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:633
 #, c-format
-#| msgid "Cannot save calendar data: Malformed URI."
-msgid "Cannot retrieve calendar alarm e-mail address"
-msgstr "Ezin da egutegiko alarmako helbide elektronikoa eskuratu"
+msgid "Cannot retrieve calendar alarm e-mail address: %s"
+msgstr "Ezin da egutegiko alarmako helbide elektronikoa eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:527
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:658
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar's ldap attribute"
-msgstr "Ezin da egutegiko ldap atributua eskuratu"
+msgid "Cannot retrieve calendar's LDAP attribute: %s"
+msgstr "Ezin da egutegiko LDAP atributua eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:545
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:683
 #, c-format
-#| msgid "Cannot create CMS Recipient information"
-msgid "Cannot retrieve calendar scheduling information"
-msgstr "Ezin da egutegiko antolaketaren informazioa eskuratu"
+msgid "Cannot retrieve calendar scheduling information: %s"
+msgstr "Ezin da egutegiko antolaketaren informazioa eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:562
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:707
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot open calendar"
-msgstr "Ezin da egutegia ireki"
+msgid "Cannot open calendar: %s"
+msgstr "Ezin da egutegia ireki: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:579
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:728
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot refresh calendar"
-msgstr "Ezin da egutegia freskatu"
+msgid "Cannot refresh calendar: %s"
+msgstr "Ezin da egutegia freskatu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:596
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:747
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar"
-msgstr "Ezin da egutegia kendu"
+msgid "Cannot remove calendar: %s"
+msgstr "Ezin da egutegia kendu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:615
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:768
 #, c-format
-#| msgid "Cannot create encoder context"
-msgid "Cannot create calendar object"
-msgstr "Ezin da egutegia objektua sortu"
+msgid "Cannot create calendar object: %s"
+msgstr "Ezin da egutegia objektua sortu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:637
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:796
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot modify calendar object"
-msgstr "Ezin da egutegia objektua eraldatu"
+msgid "Cannot modify calendar object: %s"
+msgstr "Ezin da egutegia objektua eraldatu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:661
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:822
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot remove calendar object"
-msgstr "Ezin da egutegia objektua kendu"
+msgid "Cannot remove calendar object: %s"
+msgstr "Ezin da egutegia objektua kendu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:680
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:843
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot receive calendar objects"
-msgstr "Ezin dira egutegia objektuak jaso"
+msgid "Cannot receive calendar objects: %s"
+msgstr "Ezin dira egutegia objektuak jaso: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:697
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:862
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot discard calendar alarm"
-msgstr "Ezin da egutegiko alarma baliogabetu"
+msgid "Cannot discard calendar alarm: %s"
+msgstr "Ezin da egutegiko alarma baztertu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:716
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:883
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot send calendar objects"
-msgstr "Ezin dira egutegia objektuak bidali"
+msgid "Cannot send calendar objects: %s"
+msgstr "Ezin dira egutegiko objektuak bidali: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:751
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:910
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve default calendar object path"
-msgstr "Ezin da egutegia objektu lehenetsiaren bide-izena eskuratu"
+msgid "Cannot retrieve default calendar object path: %s"
+msgstr "Ezin da egutegiko objektu lehenetsiaren bide-izena eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:769
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:935
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object path"
-msgstr "Ezin da egutegia objektuaren bide-izena eskuratu"
+msgid "Cannot retrieve calendar object path: %s"
+msgstr "Ezin da egutegiko objektuaren bide-izena eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:787
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:960
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar object list"
-msgstr "Ezin da egutegia objektuaren zerrenda eskuratu"
+msgid "Cannot retrieve calendar object list: %s"
+msgstr "Ezin da egutegiko objektuaren zerrenda eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:825
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:988
 #, c-format
-#| msgid "Could not retrieve weather data"
-msgid "Could not retrieve attachment list"
-msgstr "Ezin izan da erantsitako zerrenda eskuratu"
+msgid "Could not retrieve attachment list: %s"
+msgstr "Ezin izan da erantsitakoen zerrenda eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:847
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1014
 #, c-format
-#| msgid "Could not create cache file"
-msgid "Could not complete calendar query"
-msgstr "Ezin izan da egutegiaren kontsulta osatu"
+msgid "Could not complete calendar query: %s"
+msgstr "Ezin izan da egutegiaren kontsulta osatu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:865
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1039
 #, c-format
-#| msgid "Could not retrieve weather data"
-msgid "Could not retrieve calendar time zone"
-msgstr "Ezin izan da egutegiaren ordu-zona eskuratu"
+msgid "Could not retrieve calendar time zone: %s"
+msgstr "Ezin izan da egutegiaren ordu-zona eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:883
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1064
 #, c-format
-#| msgid "Could not cancel operation"
-msgid "Could not add calendar time zone"
-msgstr "Ezin izan da egutegiaren ordu-zona gehitu"
+msgid "Could not add calendar time zone: %s"
+msgstr "Ezin izan da egutegiaren ordu-zona gehitu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:900
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1083
 #, c-format
-msgid "Could not set default calendar time zone"
-msgstr "Ezin izan da egutegiaren ordu-zona lehenetsia ezarri"
+msgid "Could not set default calendar time zone: %s"
+msgstr "Ezin izan da egutegiaren ordu-zona lehenetsia ezarri: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:921
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1106
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar changes"
-msgstr "Ezin dira egutegiko aldaketak eskuratu"
+msgid "Cannot retrieve calendar changes: %s"
+msgstr "Ezin dira egutegiko aldaketak eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal.c:971
+#. Translators: The '%s' is replaced with a detailed error message
+#: ../calendar/libedata-cal/e-data-cal.c:1137
 #, c-format
-#| msgid "Cannot save calendar data"
-msgid "Cannot retrieve calendar free/busy list"
-msgstr "Ezin dira egutegiko libre/lanpetuta zerrenda eskuratu"
+msgid "Cannot retrieve calendar free/busy list: %s"
+msgstr "Ezin dira egutegiko libre/lanpetuta zerrenda eskuratu: %s"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#: ../calendar/libedata-cal/e-data-cal-factory.c:375
 #, c-format
-#| msgid "Invalid server URI"
 msgid "Invalid URI"
 msgstr "URI baliogabea"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#: ../calendar/libedata-cal/e-data-cal-factory.c:393
 #, c-format
 msgid "No backend factory for '%s' of '%s'"
 msgstr "Ez dago motorraren fabrikarik '%2$s'(r)en '%1$s'(r)entzako"
 
-#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#: ../calendar/libedata-cal/e-data-cal-factory.c:443
 #, c-format
-#| msgid "Could not create cache file"
 msgid "Could not instantiate backend"
 msgstr "Ezin izan da motorra instantziatu"
 
-#: ../camel/camel-cipher-context.c:102
+#: ../camel/camel-cipher-context.c:200
+#, c-format
 msgid "Signing is not supported by this cipher"
 msgstr "Zifraketa honek ez du sinatzerik onartzen"
 
-#: ../camel/camel-cipher-context.c:128
-msgid "Signing message"
-msgstr "Mezua sinatzea"
-
-#: ../camel/camel-cipher-context.c:145
+#: ../camel/camel-cipher-context.c:213
+#, c-format
 msgid "Verifying is not supported by this cipher"
 msgstr "Zifraketa honek ez du egiaztatzerik onartzen"
 
-#: ../camel/camel-cipher-context.c:171
-msgid "Verifying message"
-msgstr "Mezua egiaztatzea"
-
-#: ../camel/camel-cipher-context.c:189
+#: ../camel/camel-cipher-context.c:229
+#, c-format
 msgid "Encryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du enkriptatzerik onartzen"
 
-#: ../camel/camel-cipher-context.c:215
-msgid "Encrypting message"
-msgstr "Mezua enkriptatzea"
-
-#: ../camel/camel-cipher-context.c:232
+#: ../camel/camel-cipher-context.c:243
+#, c-format
 msgid "Decryption is not supported by this cipher"
 msgstr "Zifraketa honek ez du desenkriptatzerik onartzen"
 
-#: ../camel/camel-cipher-context.c:254
-msgid "Decrypting message"
-msgstr "Mezua desenkriptatzea"
-
-#: ../camel/camel-cipher-context.c:271
+#: ../camel/camel-cipher-context.c:256
+#, c-format
 msgid "You may not import keys with this cipher"
 msgstr "Ezin duzu gakoak zifraketa honekin inportatu"
 
-#: ../camel/camel-cipher-context.c:301
+#: ../camel/camel-cipher-context.c:270
+#, c-format
 msgid "You may not export keys with this cipher"
 msgstr "Ezin duzu gakoak zifraketa honekin esportatu"
 
-#: ../camel/camel-data-cache.c:135
+#: ../camel/camel-cipher-context.c:812
+msgid "Signing message"
+msgstr "Mezua sinatzea"
+
+#: ../camel/camel-cipher-context.c:1053
+msgid "Encrypting message"
+msgstr "Mezua enkriptatzea"
+
+#: ../camel/camel-cipher-context.c:1180
+msgid "Decrypting message"
+msgstr "Mezua desenkriptatzea"
+
+#: ../camel/camel-data-cache.c:178
+#, c-format
 msgid "Unable to create cache path"
 msgstr "Ezin da cache-bidea sortu"
 
-#: ../camel/camel-data-cache.c:401
+#: ../camel/camel-data-cache.c:496
 #, c-format
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ezin izan da kendu cache-sarrera: %s: %s"
 
-#: ../camel/camel-db.c:411
+#: ../camel/camel-data-wrapper.c:143
+#, c-format
+msgid "No stream available"
+msgstr "Ez dago korronterik erabilgarri"
+
+#: ../camel/camel-db.c:455
+#, c-format
 msgid "Insufficient memory"
 msgstr "Ez dago nahikoa memoria"
 
-#: ../camel/camel-disco-diary.c:197
+#: ../camel/camel-disco-diary.c:195
 #, c-format
 msgid ""
 "Could not write log entry: %s\n"
@@ -1436,7 +1634,7 @@ msgstr ""
 "sarera berriz konektatzen zarenean."
 
 #: ../camel/camel-disco-diary.c:260
-#: ../camel/providers/imap/camel-imap-journal.c:320
+#: ../camel/providers/imap/camel-imap-journal.c:300
 #, c-format
 msgid ""
 "Could not open '%s':\n"
@@ -1447,120 +1645,130 @@ msgstr ""
 "%s\n"
 "Karpeta honetan egindako aldaketak ez dira birsinkronizatuko."
 
-#: ../camel/camel-disco-diary.c:296
+#: ../camel/camel-disco-diary.c:304
 msgid "Resynchronizing with server"
 msgstr "Zerbitzariarekin birsinkronizatzen"
 
-#: ../camel/camel-disco-folder.c:43 ../camel/camel-offline-folder.c:51
-msgid "Copy folder content locally for offline operation"
-msgstr "Kopiatu karpetaren edukia lokalean lineaz kanpo lan egiteko"
-
-#: ../camel/camel-disco-folder.c:105 ../camel/camel-offline-folder.c:107
+#: ../camel/camel-disco-folder.c:63 ../camel/camel-offline-folder.c:79
 msgid "Downloading new messages for offline mode"
 msgstr "Mezu berriak deskargatzea lineaz kanpo modurako"
 
-#: ../camel/camel-disco-folder.c:466
+#: ../camel/camel-disco-folder.c:398
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s karpeta prestatzen lineaz kanporako"
 
-#: ../camel/camel-disco-store.c:400
-#: ../camel/providers/groupwise/camel-groupwise-store.c:216
-#: ../camel/providers/imap/camel-imap-store.c:1001
-#: ../camel/providers/imap/camel-imap-store.c:1843
-#: ../camel/providers/imap/camel-imap-store.c:2259
-#: ../camel/providers/imap/camel-imap-store.c:3068
+#: ../camel/camel-disco-folder.c:464 ../camel/camel-offline-folder.c:312
+msgid "Copy folder content locally for offline operation"
+msgstr "Kopiatu karpetaren edukia lokalean lineaz kanpo lan egiteko"
+
+#: ../camel/camel-disco-store.c:420
+#: ../camel/providers/groupwise/camel-groupwise-store.c:228
+#: ../camel/providers/imap/camel-imap-store.c:1250
+#: ../camel/providers/imap/camel-imap-store.c:1771
+#: ../camel/providers/imap/camel-imap-store.c:2244
+#: ../camel/providers/imap/camel-imap-store.c:3094
+#: ../camel/providers/imapx/camel-imapx-folder.c:298
+#: ../camel/providers/imapx/camel-imapx-folder.c:331
+#: ../camel/providers/imapx/camel-imapx-folder.c:385
+#: ../camel/providers/imapx/camel-imapx-folder.c:431
+#: ../camel/providers/imapx/camel-imapx-folder.c:465
+#: ../camel/providers/imapx/camel-imapx-folder.c:505
+#: ../camel/providers/imapx/camel-imapx-folder.c:541
+#: ../camel/providers/imapx/camel-imapx-store.c:276
+#: ../camel/providers/imapx/camel-imapx-store.c:1298
+#: ../camel/providers/imapx/camel-imapx-store.c:1386
+#: ../camel/providers/imapx/camel-imapx-store.c:1421
+#, c-format
 msgid "You must be working online to complete this operation"
 msgstr "Linean jardun behar duzu lanean eragiketa hau bukatzeko"
 
-#: ../camel/camel-exception.c:260
-msgid "No description available"
-msgstr "Ez dago azalpenik eskuragarri"
+#: ../camel/camel-file-utils.c:722
+#, c-format
+msgid "Canceled"
+msgstr "Bertan behera utzita"
 
-#: ../camel/camel-filter-driver.c:794 ../camel/camel-filter-search.c:579
+#: ../camel/camel-filter-driver.c:817 ../camel/camel-filter-search.c:582
 #, c-format
 msgid "Failed to create child process '%s': %s"
 msgstr "Huts egin du '%s' prozesu umea sortzean: %s"
 
-#: ../camel/camel-filter-driver.c:836
+#: ../camel/camel-filter-driver.c:864
 #, c-format
 msgid "Invalid message stream received from %s: %s"
 msgstr "Ezin izan da %s(e)tik mezu-korrontea eskuratu: %s"
 
-#: ../camel/camel-filter-driver.c:1025 ../camel/camel-filter-driver.c:1034
+#: ../camel/camel-filter-driver.c:1051 ../camel/camel-filter-driver.c:1060
 msgid "Syncing folders"
 msgstr "Karpetak sinkronizatzen"
 
-#: ../camel/camel-filter-driver.c:1121 ../camel/camel-filter-driver.c:1522
+#: ../camel/camel-filter-driver.c:1148 ../camel/camel-filter-driver.c:1598
 #, c-format
 msgid "Error parsing filter: %s: %s"
 msgstr "Errorea iragazkia analizatzean: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1130 ../camel/camel-filter-driver.c:1531
+#: ../camel/camel-filter-driver.c:1159 ../camel/camel-filter-driver.c:1609
 #, c-format
 msgid "Error executing filter: %s: %s"
 msgstr "Errorea iragazkia exekutatzean: %s: %s"
 
-#: ../camel/camel-filter-driver.c:1216
+#: ../camel/camel-filter-driver.c:1256
+#, c-format
 msgid "Unable to open spool folder"
 msgstr "Ezin da ilara-karpeta ireki"
 
-#: ../camel/camel-filter-driver.c:1225
+#: ../camel/camel-filter-driver.c:1267
+#, c-format
 msgid "Unable to process spool folder"
 msgstr "Ezin da ilara-karpeta prozesatu"
 
-#: ../camel/camel-filter-driver.c:1241
+#: ../camel/camel-filter-driver.c:1285
 #, c-format
 msgid "Getting message %d (%d%%)"
 msgstr "%d (%%%d) mezua lortzen"
 
-#: ../camel/camel-filter-driver.c:1245
-msgid "Cannot open message"
-msgstr "Ezin da mezua ireki"
-
-#: ../camel/camel-filter-driver.c:1246 ../camel/camel-filter-driver.c:1264
+#: ../camel/camel-filter-driver.c:1292 ../camel/camel-filter-driver.c:1314
 #, c-format
 msgid "Failed on message %d"
 msgstr "Huts egin du %d mezuan"
 
-#: ../camel/camel-filter-driver.c:1278 ../camel/camel-filter-driver.c:1368
+#: ../camel/camel-filter-driver.c:1329 ../camel/camel-filter-driver.c:1434
 msgid "Syncing folder"
 msgstr "Karpeta sinkronizatzen"
 
-#: ../camel/camel-filter-driver.c:1282 ../camel/camel-filter-driver.c:1373
+#: ../camel/camel-filter-driver.c:1334 ../camel/camel-filter-driver.c:1440
 msgid "Complete"
 msgstr "Eginda"
 
-#: ../camel/camel-filter-driver.c:1338
+#: ../camel/camel-filter-driver.c:1398
 #, c-format
 msgid "Getting message %d of %d"
 msgstr "%d/%d mezua hartzen"
 
-#: ../camel/camel-filter-driver.c:1353
+#: ../camel/camel-filter-driver.c:1416
 #, c-format
 msgid "Failed at message %d of %d"
 msgstr "Huts egin du %d/%d mezuan"
 
-#: ../camel/camel-filter-search.c:137
+#: ../camel/camel-filter-search.c:135
 msgid "Failed to retrieve message"
 msgstr "Huts egin du mezua berreskuratzean"
 
-#: ../camel/camel-filter-search.c:399
+#: ../camel/camel-filter-search.c:401
 msgid "Invalid arguments to (system-flag)"
 msgstr "Argumentu baliogabeak (system-flag)"
 
-#: ../camel/camel-filter-search.c:414
+#: ../camel/camel-filter-search.c:416
 msgid "Invalid arguments to (user-tag)"
 msgstr "Argumentu baliogabeak (user-tag)"
 
-#. A filter search is a search through your filters, ie. your filters is the corpus being searched thru.
-#: ../camel/camel-filter-search.c:735 ../camel/camel-filter-search.c:743
+#: ../camel/camel-filter-search.c:744 ../camel/camel-filter-search.c:753
 #, c-format
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: ../camel/camel-folder-search.c:351 ../camel/camel-folder-search.c:453
-#: ../camel/camel-folder-search.c:608
+#: ../camel/camel-folder-search.c:342 ../camel/camel-folder-search.c:453
+#: ../camel/camel-folder-search.c:624
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -1569,8 +1777,8 @@ msgstr ""
 "Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:361 ../camel/camel-folder-search.c:463
-#: ../camel/camel-folder-search.c:618
+#: ../camel/camel-folder-search.c:354 ../camel/camel-folder-search.c:465
+#: ../camel/camel-folder-search.c:636
 #, c-format
 msgid ""
 "Error executing search expression: %s:\n"
@@ -1579,73 +1787,79 @@ msgstr ""
 "Errorea bilaketa-adierazpena exekutatzean: %s:\n"
 "%s"
 
-#: ../camel/camel-folder-search.c:810 ../camel/camel-folder-search.c:852
+#: ../camel/camel-folder-search.c:840 ../camel/camel-folder-search.c:882
 #, c-format
 msgid "(%s) requires a single bool result"
 msgstr "(%s) emaitza boolear bakarra behar du"
 
-#: ../camel/camel-folder-search.c:905
+#: ../camel/camel-folder-search.c:935
 #, c-format
 msgid "(%s) not allowed inside %s"
 msgstr "(%s) ez da %s(r)en barruan egotea baimentzen"
 
-#: ../camel/camel-folder-search.c:911 ../camel/camel-folder-search.c:918
+#: ../camel/camel-folder-search.c:941 ../camel/camel-folder-search.c:948
 #, c-format
 msgid "(%s) requires a match type string"
 msgstr "(%s) konparatzeko katea behar du"
 
-#: ../camel/camel-folder-search.c:945
+#: ../camel/camel-folder-search.c:975
 #, c-format
 msgid "(%s) expects an array result"
 msgstr "(%s) matrize-emaitza behar du"
 
-#: ../camel/camel-folder-search.c:954
+#: ../camel/camel-folder-search.c:984
 #, c-format
 msgid "(%s) requires the folder set"
 msgstr "(%s) karpeta ezartzea behar du"
 
-#: ../camel/camel-folder.c:676
-#, c-format
-msgid "Unsupported operation: append message: for %s"
-msgstr "Eragiketa hau ez da onartzen: mezua erantsi: %s"
-
-#: ../camel/camel-folder.c:1381
+#: ../camel/camel-folder.c:216
 #, c-format
-msgid "Unsupported operation: search by expression: for %s"
-msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko bilaketa: %s"
+msgid "Learning new spam message in '%s'"
+msgid_plural "Learning new spam messages in '%s'"
+msgstr[0] "Mezu baztergarri berria ikasten %s(e)n"
+msgstr[1] "Mezu baztergarri berriak ikasten %s(e)n"
 
-#: ../camel/camel-folder.c:1422
+#: ../camel/camel-folder.c:240
 #, c-format
-msgid "Unsupported operation: count by expression: for %s"
-msgstr "Eragiketa hau ez da onartzen: adierazpen bidezko zenbaketa: %s"
+msgid "Learning new ham message in '%s'"
+msgid_plural "Learning new ham messages in '%s'"
+msgstr[0] "Mezu onargarri berria ikasten %s(e)n"
+msgstr[1] "Mezu onargarri berriak ikasten %s(e)n"
 
-#: ../camel/camel-folder.c:1461
+#: ../camel/camel-folder.c:266
 #, c-format
-msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Eragiketa hau ez da onartzen: UDI bidezko bilaketa: %s"
+msgid "Filtering new message in '%s'"
+msgid_plural "Filtering new messages in '%s'"
+msgstr[0] "Mezu berria iragazten '%s'(e)n"
+msgstr[1] "Mezu berriak iragazten '%s'(e)n"
 
-#: ../camel/camel-folder.c:1574
-#: ../camel/providers/local/camel-maildir-folder.c:387
+#: ../camel/camel-folder.c:875
+#: ../camel/providers/local/camel-maildir-folder.c:293
 msgid "Moving messages"
 msgstr "Mezuak lekuz aldatzen"
 
-#: ../camel/camel-folder.c:1574
+#: ../camel/camel-folder.c:878
 msgid "Copying messages"
 msgstr "Mezuak kopiatzen"
 
-#: ../camel/camel-folder.c:1915
-msgid "Learning junk"
-msgstr "Baztergarriak ikastea"
+#: ../camel/camel-folder.c:3247
+#, c-format
+msgid "Retrieving message '%s'"
+msgstr "'%s' mezua eskuratzen"
 
-#: ../camel/camel-folder.c:1933
-msgid "Learning non-junk"
-msgstr "Ez-baztergarriak ikastea"
+#: ../camel/camel-gpg-context.c:642 ../camel/camel-gpg-context.c:647
+#: ../camel/camel-gpg-context.c:1272
+#, c-format
+msgid "Failed to execute gpg: %s"
+msgstr "Huts egin du gpg exekutatzean: %s"
 
-#: ../camel/camel-folder.c:1953
-msgid "Filtering new message(s)"
-msgstr "Mezu berriak iragaztea"
+#: ../camel/camel-gpg-context.c:647
+#: ../camel/providers/smtp/camel-smtp-transport.c:723
+#: ../camel/providers/smtp/camel-smtp-transport.c:778
+msgid "Unknown"
+msgstr "Ezezaguna"
 
-#: ../camel/camel-gpg-context.c:760
+#: ../camel/camel-gpg-context.c:711
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1656,15 +1870,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:775
+#: ../camel/camel-gpg-context.c:728
+#, c-format
 msgid "Failed to parse gpg userid hint."
 msgstr "Huts egin du gpg erabiltzaile-IDaren aholkua analizatzean."
 
-#: ../camel/camel-gpg-context.c:799 ../camel/camel-gpg-context.c:813
+#: ../camel/camel-gpg-context.c:753 ../camel/camel-gpg-context.c:768
+#, c-format
 msgid "Failed to parse gpg passphrase request."
 msgstr "Errorea gpg pasaesaldi-eskaera analizatzean."
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:789
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1673,7 +1889,7 @@ msgstr ""
 "SmartCard: \"%s\"\n"
 "desblokeatzeko PIN behar duzu"
 
-#: ../camel/camel-gpg-context.c:837
+#: ../camel/camel-gpg-context.c:793
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1682,137 +1898,129 @@ msgstr ""
 "Pasaesaldia behar da erabiltzaile honen gakoa \n"
 "desblokeatzeko: \"%s\""
 
-#: ../camel/camel-gpg-context.c:842
+#: ../camel/camel-gpg-context.c:799
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "'%s'(r)en ustekabeko erantzuna GnuPG-tik"
 
-#: ../camel/camel-gpg-context.c:867 ../camel/camel-gpg-context.c:1113
-#: ../camel/providers/nntp/camel-nntp-store.c:1313
-msgid "Canceled."
-msgstr "Bertan behera utzita."
+#: ../camel/camel-gpg-context.c:828 ../camel/camel-net-utils.c:515
+#: ../camel/camel-tcp-stream-raw.c:255
+#: ../camel/providers/imapx/camel-imapx-server.c:4892
+#: ../camel/providers/imapx/camel-imapx-server.c:4909
+#: ../camel/providers/imapx/camel-imapx-store.c:198
+#: ../camel/providers/nntp/camel-nntp-summary.c:405
+#: ../camel/providers/pop3/camel-pop3-folder.c:366
+#: ../camel/providers/pop3/camel-pop3-folder.c:431
+#: ../camel/providers/pop3/camel-pop3-folder.c:506
+#: ../camel/providers/pop3/camel-pop3-store.c:487
+#: ../libedataserverui/e-book-auth-util.c:229
+#, c-format
+msgid "Cancelled"
+msgstr "Bertan behera utzita"
 
-#: ../camel/camel-gpg-context.c:881
+#: ../camel/camel-gpg-context.c:846
+#, c-format
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Huts egin du gako sekretua desblokeatzean: 3 pasaesaldi oker eman dira."
 
-#: ../camel/camel-gpg-context.c:889
+#: ../camel/camel-gpg-context.c:858
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna GnuPG-tik: %s"
 
-#: ../camel/camel-gpg-context.c:988
+#: ../camel/camel-gpg-context.c:989
+#, c-format
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ezin da mezua enkriptatu: ez da hartzailerik zehaztu."
 
-#. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1262 ../camel/camel-gpg-context.c:1387
-#: ../camel/camel-gpg-context.c:1953 ../camel/camel-gpg-context.c:1998
-#, c-format
-msgid "Failed to execute gpg: %s"
-msgstr "Huts egin du gpg exekutatzean: %s"
-
-#: ../camel/camel-gpg-context.c:1355 ../camel/camel-smime-context.c:605
-#, c-format
-msgid "Could not generate signing data: %s"
-msgstr "Ezin izan da sinatutako daturik sortu: %s"
+#: ../camel/camel-gpg-context.c:1535 ../camel/camel-smime-context.c:824
+msgid "Could not generate signing data: "
+msgstr "Ezin izan da sinatutako daturik sortu: "
 
-#: ../camel/camel-gpg-context.c:1402 ../camel/camel-gpg-context.c:1630
-#: ../camel/camel-gpg-context.c:1646 ../camel/camel-gpg-context.c:1728
-#: ../camel/camel-gpg-context.c:1743 ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1874 ../camel/camel-gpg-context.c:1969
-#: ../camel/camel-gpg-context.c:2014
+#: ../camel/camel-gpg-context.c:1582 ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1892 ../camel/camel-gpg-context.c:2038
+#: ../camel/camel-gpg-context.c:2137 ../camel/camel-gpg-context.c:2185
 msgid "Failed to execute gpg."
 msgstr "Huts egin du gpg exekutatzean."
 
-#: ../camel/camel-gpg-context.c:1534 ../camel/camel-gpg-context.c:1540
-#: ../camel/camel-gpg-context.c:1546 ../camel/camel-gpg-context.c:1561
-#: ../camel/camel-smime-context.c:929 ../camel/camel-smime-context.c:940
-#: ../camel/camel-smime-context.c:947
+#: ../camel/camel-gpg-context.c:1662 ../camel/camel-gpg-context.c:1670
+#: ../camel/camel-gpg-context.c:1678 ../camel/camel-gpg-context.c:1697
+#: ../camel/camel-smime-context.c:948 ../camel/camel-smime-context.c:962
+#: ../camel/camel-smime-context.c:971
+#, c-format
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ezin da egiaztatu mezuaren sinadura: mezu-formatu baliogabea"
 
-#: ../camel/camel-gpg-context.c:1600
-#, c-format
-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-gpg-context.c:1737
+msgid "Cannot verify message signature: "
+msgstr "Ezin da egiaztatu mezuaren sinadura: "
 
-#: ../camel/camel-gpg-context.c:1711
-#, c-format
-msgid "Could not generate encrypting data: %s"
-msgstr "Ezin izan da enkriptatutako daturik sortu: %s"
+#: ../camel/camel-gpg-context.c:1858
+msgid "Could not generate encrypting data: "
+msgstr "Ezin izan da enkriptatutako daturik sortu: "
 
-#: ../camel/camel-gpg-context.c:1761
+#: ../camel/camel-gpg-context.c:1911
 msgid "This is a digitally encrypted message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: ../camel/camel-gpg-context.c:1814 ../camel/camel-gpg-context.c:1822
-#: ../camel/camel-gpg-context.c:1841
+#: ../camel/camel-gpg-context.c:1969 ../camel/camel-gpg-context.c:1978
+#: ../camel/camel-gpg-context.c:2001
+#, c-format
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ezin da mezua desenkriptatu: mezu-formatu baliogabea"
 
-#: ../camel/camel-gpg-context.c:1831
+#: ../camel/camel-gpg-context.c:1989
+#, c-format
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Huts egin du MIME zatia desenkriptatzean: protokolo-errorea"
 
-#: ../camel/camel-gpg-context.c:1909 ../camel/camel-smime-context.c:1205
+#: ../camel/camel-gpg-context.c:2078 ../camel/camel-smime-context.c:1255
 msgid "Encrypted content"
 msgstr "Enkriptatutako edukia"
 
-#: ../camel/camel-gpg-context.c:1930
-msgid "Unable to parse message content"
-msgstr "Ezin da mezuaren edukia analizatu"
-
-#: ../camel/camel-gpg-context.c:1954 ../camel/camel-gpg-context.c:1999
-#: ../camel/providers/imap4/camel-imap4-utils.c:614
-#: ../camel/providers/smtp/camel-smtp-transport.c:165
-#: ../camel/providers/smtp/camel-smtp-transport.c:220
-msgid "Unknown"
-msgstr "Ezezaguna"
-
-#: ../camel/camel-lock-client.c:104
+#: ../camel/camel-lock-client.c:106
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
 msgstr "Ezin da blokeo-laguntzailearen kanalizaziorik eraiki: %s"
 
-#: ../camel/camel-lock-client.c:126
+#: ../camel/camel-lock-client.c:130
 #, c-format
 msgid "Cannot fork locking helper: %s"
 msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
 
-#: ../camel/camel-lock-client.c:203 ../camel/camel-lock-client.c:226
+#: ../camel/camel-lock-client.c:211 ../camel/camel-lock-client.c:239
 #, 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:216
+#: ../camel/camel-lock-client.c:227
 #, c-format
 msgid "Could not lock '%s'"
 msgstr "Ezin izan da '%s' blokeatu"
 
-#: ../camel/camel-lock.c:103
+#: ../camel/camel-lock.c:102
 #, c-format
 msgid "Could not create lock file for %s: %s"
 msgstr "Ezin izan da %s(r)en blokeo-fitxategirik sortu: %s"
 
-#: ../camel/camel-lock.c:144
+#: ../camel/camel-lock.c:145
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Timed out trying to get lock file on %s.  Try again later."
 msgstr ""
-"Denbora agortu zaizu %s(e)n blokeo-fitxategia hartzen saiatzean. Saiatu "
-"berriro geroago."
+"Denbora agortu da %s(e)n blokeo-fitxategia hartzen saiatzean. Saiatu berriro "
+"geroago."
 
-#: ../camel/camel-lock.c:199
+#: ../camel/camel-lock.c:205
 #, c-format
 msgid "Failed to get lock using fcntl(2): %s"
 msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 
-#: ../camel/camel-lock.c:262
+#: ../camel/camel-lock.c:272
 #, c-format
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
 
-#: ../camel/camel-movemail.c:106
+#: ../camel/camel-movemail.c:105
 #, c-format
 msgid "Could not check mail file %s: %s"
 msgstr "Ezin izan da %s posta-fitxategia egiaztatu: %s"
@@ -1822,145 +2030,146 @@ msgstr "Ezin izan da %s posta-fitxategia egiaztatu: %s"
 msgid "Could not open mail file %s: %s"
 msgstr "Ezin izan da %s posta-fitxategia ireki: %s"
 
-#: ../camel/camel-movemail.c:127
+#: ../camel/camel-movemail.c:129
 #, c-format
 msgid "Could not open temporary mail file %s: %s"
 msgstr "Ezin izan da aldi baterako %s posta-fitxategia ireki: %s"
 
-#: ../camel/camel-movemail.c:156
+#: ../camel/camel-movemail.c:159
 #, c-format
 msgid "Failed to store mail in temp file %s: %s"
 msgstr "Huts egin du mezua aldi baterako %s fitxategian gordetzean: %s"
 
-#: ../camel/camel-movemail.c:186
+#: ../camel/camel-movemail.c:193
 #, c-format
 msgid "Could not create pipe: %s"
 msgstr "Ezin izan da kanalizaziorik sortu: %s"
 
-#: ../camel/camel-movemail.c:198
+#: ../camel/camel-movemail.c:207
 #, c-format
 msgid "Could not fork: %s"
 msgstr "Ezin izan da sardetu: %s"
 
-#: ../camel/camel-movemail.c:236
+#: ../camel/camel-movemail.c:245
 #, c-format
 msgid "Movemail program failed: %s"
 msgstr "Movemail programak huts egin du: %s"
 
-#: ../camel/camel-movemail.c:237
+#: ../camel/camel-movemail.c:246
 msgid "(Unknown error)"
 msgstr "(Errore ezezaguna)"
 
-#: ../camel/camel-movemail.c:260
+#: ../camel/camel-movemail.c:273
 #, c-format
 msgid "Error reading mail file: %s"
 msgstr "Errorea posta-fitxategia irakurtzean: %s"
 
-#: ../camel/camel-movemail.c:271
+#: ../camel/camel-movemail.c:286
 #, c-format
 msgid "Error writing mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia idaztean: %s"
 
-#: ../camel/camel-movemail.c:464 ../camel/camel-movemail.c:531
+#: ../camel/camel-movemail.c:483 ../camel/camel-movemail.c:552
 #, c-format
 msgid "Error copying mail temp file: %s"
 msgstr "Errorea aldi baterako posta-fitxategia kopiatzean: %s"
 
-#: ../camel/camel-multipart-signed.c:592
-msgid "parse error"
-msgstr "analisi-errorea"
+#: ../camel/camel-multipart-signed.c:327
+#, c-format
+msgid "No content available"
+msgstr "Ez dago edukirik eskuragarri"
 
-#: ../camel/camel-net-utils.c:503 ../camel/camel-net-utils.c:673
-#: ../camel/camel-net-utils.c:802
-#: ../camel/providers/pop3/camel-pop3-store.c:476
-#: ../camel/providers/pop3/camel-pop3-store.c:576
-msgid "Canceled"
-msgstr "Bertan behera utzita"
+#: ../camel/camel-multipart-signed.c:335
+#, c-format
+msgid "No signature available"
+msgstr "Ez dago sinadurarik eskuragarri"
 
-#: ../camel/camel-net-utils.c:523
-msgid "cannot create thread"
-msgstr "Ezin da haria sortu"
+#: ../camel/camel-multipart-signed.c:663
+#, c-format
+msgid "parse error"
+msgstr "analisi-errorea"
 
-#: ../camel/camel-net-utils.c:677
+#: ../camel/camel-net-utils.c:695
 #, c-format
 msgid "Resolving: %s"
 msgstr "Ebazten: %s"
 
-#: ../camel/camel-net-utils.c:699
+#: ../camel/camel-net-utils.c:718
 msgid "Host lookup failed"
 msgstr "Ostalari-bilaketak huts egin du"
 
-#: ../camel/camel-net-utils.c:701
+#: ../camel/camel-net-utils.c:724
 #, c-format
 msgid "Host lookup failed: %s: %s"
 msgstr "Ostalari-bilaketak huts egin du: %s: %s"
 
-#: ../camel/camel-net-utils.c:806
+#: ../camel/camel-net-utils.c:845
 msgid "Resolving address"
 msgstr "Helbidea ebaztea"
 
-#: ../camel/camel-net-utils.c:826
+#: ../camel/camel-net-utils.c:866
 msgid "Name lookup failed"
 msgstr "Huts egin du izena bilatzean"
 
-#: ../camel/camel-net-utils.c:829
+#: ../camel/camel-net-utils.c:872
 #, c-format
 msgid "Name lookup failed: %s"
 msgstr "Huts egin du izena bilatzean: %s"
 
-#: ../camel/camel-offline-folder.c:249
+#: ../camel/camel-offline-folder.c:189
 #, c-format
 msgid "Syncing messages in folder '%s' to disk"
 msgstr "'%s' karpetako mezuak diskoarekin sinkronizatzea"
 
-#: ../camel/camel-offline-journal.c:159 ../camel/camel-offline-journal.c:182
+#: ../camel/camel-offline-journal.c:144 ../camel/camel-offline-journal.c:174
 #, c-format
 msgid "Cannot write offline journal for folder '%s': %s"
 msgstr "Ezin izan da '%s' karpetaren lineaz kanpoko egunkarian idatzi: %s"
 
-#: ../camel/camel-provider.c:60
+#: ../camel/camel-provider.c:58
 msgid "Virtual folder email provider"
 msgstr "Karpeta birtualen posta-hornitzailea"
 
-#: ../camel/camel-provider.c:62
+#: ../camel/camel-provider.c:60
 msgid "For reading mail as a query of another set of folders"
 msgstr "Mezuak beste karpeta-multzo bateko kontsulta gisa irakurtzeko"
 
-#: ../camel/camel-provider.c:184
+#: ../camel/camel-provider.c:192
 #, c-format
 msgid "Could not load %s: Module loading not supported on this system."
 msgstr "Ezin izan da %s kargatu: moduluak kargatzea ez da onartzen sistema honetan."
 
-#: ../camel/camel-provider.c:193
+#: ../camel/camel-provider.c:201
 #, c-format
 msgid "Could not load %s: %s"
 msgstr "Ezin izan da %s kargatu: %s"
 
-#: ../camel/camel-provider.c:201
+#: ../camel/camel-provider.c:210
 #, c-format
 msgid "Could not load %s: No initialization code in module."
 msgstr "Ezin izan da %s kargatu: moduluak ez du hasieratze-koderik."
 
-#: ../camel/camel-provider.c:379 ../camel/camel-session.c:180
+#: ../camel/camel-provider.c:392 ../camel/camel-session.c:202
 #, c-format
 msgid "No provider available for protocol '%s'"
 msgstr "Ez dago hornitzailerik '%s' protokolorako"
 
-#: ../camel/camel-sasl-anonymous.c:36
+#: ../camel/camel-sasl-anonymous.c:35
 msgid "Anonymous"
 msgstr "Anonimoa"
 
-#: ../camel/camel-sasl-anonymous.c:38
+#: ../camel/camel-sasl-anonymous.c:37
 msgid "This option will connect to the server using an anonymous login."
 msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu saio-hasiera anonimoaren "
 "bidez."
 
-#: ../camel/camel-sasl-anonymous.c:121 ../camel/camel-sasl-plain.c:91
+#: ../camel/camel-sasl-anonymous.c:70
+#, c-format
 msgid "Authentication failed."
 msgstr "Autentifikazioak huts egin du."
 
-#: ../camel/camel-sasl-anonymous.c:130
+#: ../camel/camel-sasl-anonymous.c:81
 #, c-format
 msgid ""
 "Invalid email address trace information:\n"
@@ -1969,7 +2178,7 @@ msgstr ""
 "Helbide elektronikoaren aztarna-informazio baliogabea:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:142
+#: ../camel/camel-sasl-anonymous.c:95
 #, c-format
 msgid ""
 "Invalid opaque trace information:\n"
@@ -1978,7 +2187,7 @@ msgstr ""
 "Aztarna opakoaren informazio baliogabea:\n"
 "%s"
 
-#: ../camel/camel-sasl-anonymous.c:154
+#: ../camel/camel-sasl-anonymous.c:109
 #, c-format
 msgid ""
 "Invalid trace information:\n"
@@ -1987,11 +2196,11 @@ msgstr ""
 "Aztarna-informazio baliogabea:\n"
 "%s"
 
-#: ../camel/camel-sasl-cram-md5.c:38
+#: ../camel/camel-sasl-cram-md5.c:41
 msgid "CRAM-MD5"
 msgstr "CRAM-MD5"
 
-#: ../camel/camel-sasl-cram-md5.c:40
+#: ../camel/camel-sasl-cram-md5.c:43
 msgid ""
 "This option will connect to the server using a secure CRAM-MD5 password, if "
 "the server supports it."
@@ -1999,11 +2208,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:54
 msgid "DIGEST-MD5"
 msgstr "DIGEST-MD5"
 
-#: ../camel/camel-sasl-digest-md5.c:50
+#: ../camel/camel-sasl-digest-md5.c:56
 msgid ""
 "This option will connect to the server using a secure DIGEST-MD5 password, "
 "if the server supports it."
@@ -2011,41 +2220,47 @@ msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu DIGEST-MD5 pasahitz segurua "
 "erabiliz, zerbitzariak onartzen badu."
 
-#: ../camel/camel-sasl-digest-md5.c:844
+#: ../camel/camel-sasl-digest-md5.c:817
+#, c-format
 msgid "Server challenge too long (>2048 octets)"
 msgstr "Zerbitzari-erronka luzeegia (>2048 zortzikote)"
 
-#: ../camel/camel-sasl-digest-md5.c:853
+#: ../camel/camel-sasl-digest-md5.c:828
+#, c-format
 msgid "Server challenge invalid\n"
 msgstr "Zerbitzari-erronka baliogabea\n"
 
-#: ../camel/camel-sasl-digest-md5.c:859
+#: ../camel/camel-sasl-digest-md5.c:836
+#, c-format
 msgid "Server challenge contained invalid \"Quality of Protection\" token"
 msgstr "Zerbitzari-erronkak \"Quality of Protection\" token baliogabea du"
 
-#: ../camel/camel-sasl-digest-md5.c:889
+#: ../camel/camel-sasl-digest-md5.c:871
+#, c-format
 msgid "Server response did not contain authorization data"
 msgstr "Zerbitzariaren erantzunak ez dauka baimen-daturik"
 
-#: ../camel/camel-sasl-digest-md5.c:907
+#: ../camel/camel-sasl-digest-md5.c:892
+#, c-format
 msgid "Server response contained incomplete authorization data"
 msgstr "Zerbitzariaren erantzuneko baimen-datuak ez daude osorik"
 
-#: ../camel/camel-sasl-digest-md5.c:917
+#: ../camel/camel-sasl-digest-md5.c:905
+#, c-format
 msgid "Server response does not match"
 msgstr "Zerbitzariaren erantzuna ez dator bat"
 
-#: ../camel/camel-sasl-gssapi.c:72
+#: ../camel/camel-sasl-gssapi.c:86
 msgid "GSSAPI"
 msgstr "GSSAPI"
 
-#: ../camel/camel-sasl-gssapi.c:74
+#: ../camel/camel-sasl-gssapi.c:88
 msgid "This option will connect to the server using Kerberos 5 authentication."
 msgstr ""
 "Aukera honek zerbitzariarekin konektatuko zaitu Kerberos 5 "
 "autentifikazioaren bidez."
 
-#: ../camel/camel-sasl-gssapi.c:168
+#: ../camel/camel-sasl-gssapi.c:129
 msgid ""
 "The specified mechanism is not supported by the provided credential, or is "
 "unrecognized by the implementation."
@@ -2053,11 +2268,11 @@ msgstr ""
 "Zehaztutako mekanismoa ez du onartzen emandako kredentzialak, edo ez du "
 "ezagutzen inplementazioak."
 
-#: ../camel/camel-sasl-gssapi.c:173
+#: ../camel/camel-sasl-gssapi.c:134
 msgid "The provided target_name parameter was ill-formed."
 msgstr "target_name parametroa ez dago ondo osatuta."
 
-#: ../camel/camel-sasl-gssapi.c:176
+#: ../camel/camel-sasl-gssapi.c:137
 msgid ""
 "The provided target_name parameter contained an invalid or unsupported type "
 "of name."
@@ -2065,7 +2280,7 @@ msgstr ""
 "target_name parametroak baliogabeko edo onartzen ez den mota edo izen bat "
 "dauka."
 
-#: ../camel/camel-sasl-gssapi.c:180
+#: ../camel/camel-sasl-gssapi.c:141
 msgid ""
 "The input_token contains different channel bindings to those specified via "
 "the input_chan_bindings parameter."
@@ -2073,13 +2288,13 @@ msgstr ""
 "input_token-ek dauzkan kanal-loturak eta input_chan_bindings parametroaren "
 "bidez zehaztutakoak ez datoz bat."
 
-#: ../camel/camel-sasl-gssapi.c:185
+#: ../camel/camel-sasl-gssapi.c:146
 msgid ""
 "The input_token contains an invalid signature, or a signature that could not "
 "be verified."
 msgstr "input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
 
-#: ../camel/camel-sasl-gssapi.c:189
+#: ../camel/camel-sasl-gssapi.c:150
 msgid ""
 "The supplied credentials were not valid for context initiation, or the "
 "credential handle did not reference any credentials."
@@ -2087,51 +2302,54 @@ msgstr ""
 "Emandako kredentzialak ez dira baliozkoak testuingurua hasieratzeko, edo "
 "kredentzial-kudeatzaileak ez dauka kredentzial-erreferentziarik."
 
-#: ../camel/camel-sasl-gssapi.c:194
+#: ../camel/camel-sasl-gssapi.c:155
 msgid "The supplied context handle did not refer to a valid context."
 msgstr ""
 "Emandako testuinguru-kudeatzaileak ez dauka baliozko testuingururen baten "
 "erreferentziarik."
 
-#: ../camel/camel-sasl-gssapi.c:197
+#: ../camel/camel-sasl-gssapi.c:158
 msgid "The consistency checks performed on the input_token failed."
 msgstr "input_token-en egindako koherentzia-egiaztapenak huts egin du."
 
-#: ../camel/camel-sasl-gssapi.c:200
+#: ../camel/camel-sasl-gssapi.c:161
 msgid "The consistency checks performed on the credential failed."
 msgstr "Kredentzialean egindako koherentzia-egiaztapenak huts egin du."
 
-#: ../camel/camel-sasl-gssapi.c:203
+#: ../camel/camel-sasl-gssapi.c:164
 msgid "The referenced credentials have expired."
 msgstr "Erreferentziatutako kredentzialak iraungita daude."
 
-#: ../camel/camel-sasl-gssapi.c:209 ../camel/camel-sasl-gssapi.c:316
-#: ../camel/camel-sasl-gssapi.c:358 ../camel/camel-sasl-gssapi.c:373
-#: ../camel/providers/imap/camel-imap-store.c:1272
+#: ../camel/camel-sasl-gssapi.c:170 ../camel/camel-sasl-gssapi.c:310
+#: ../camel/camel-sasl-gssapi.c:354 ../camel/camel-sasl-gssapi.c:371
+#: ../camel/providers/smtp/camel-smtp-transport.c:1256
+#, c-format
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
 #: ../camel/camel-sasl-gssapi.c:383
+#, c-format
 msgid "Unsupported security layer."
 msgstr "Onartzen ez den segurtasun maila"
 
-#: ../camel/camel-sasl-login.c:36
+#: ../camel/camel-sasl-login.c:35
 msgid "Login"
 msgstr "Saio-hasiera"
 
-#: ../camel/camel-sasl-login.c:38 ../camel/camel-sasl-plain.c:38
+#: ../camel/camel-sasl-login.c:37 ../camel/camel-sasl-plain.c:41
 msgid "This option will connect to the server using a simple password."
 msgstr "Aukera honek zerbitzariarekin konektatuko zaitu pasahitz sinple baten bidez."
 
-#: ../camel/camel-sasl-login.c:134
+#: ../camel/camel-sasl-login.c:91
+#, c-format
 msgid "Unknown authentication state."
 msgstr "Autentifikazio-egoera ezezaguna."
 
-#: ../camel/camel-sasl-ntlm.c:34
+#: ../camel/camel-sasl-ntlm.c:37
 msgid "NTLM / SPA"
 msgstr "NTLM / SPA"
 
-#: ../camel/camel-sasl-ntlm.c:36
+#: ../camel/camel-sasl-ntlm.c:39
 msgid ""
 "This option will connect to a Windows-based server using NTLM / Secure "
 "Password Authentication."
@@ -2139,51 +2357,53 @@ msgstr ""
 "Aukera honek Windows-ean oinarritutako NTLM / Pasahitz Seguruaren "
 "autentifikazioaren bidez."
 
-#: ../camel/camel-sasl-plain.c:36
+#: ../camel/camel-sasl-plain.c:39
 msgid "PLAIN"
 msgstr "TESTU ARRUNTA"
 
-#: ../camel/camel-sasl-popb4smtp.c:39
+#: ../camel/camel-sasl-popb4smtp.c:42
 msgid "POP before SMTP"
 msgstr "POP SMTPren aurretik"
 
-#: ../camel/camel-sasl-popb4smtp.c:41
+#: ../camel/camel-sasl-popb4smtp.c:44
 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:106
+#: ../camel/camel-sasl-popb4smtp.c:79
 msgid "POP Source URI"
 msgstr "POP iturburuaren URIa"
 
-#: ../camel/camel-sasl-popb4smtp.c:109
-msgid "POP Before SMTP auth using an unknown transport"
+#: ../camel/camel-sasl-popb4smtp.c:86
+#, c-format
+msgid "POP Before SMTP authentication using an unknown transport"
 msgstr "'POP SMTPren aurretik' autentifikazioa garraio ezezaguna erabiliz"
 
-#: ../camel/camel-sasl-popb4smtp.c:114
-msgid "POP Before SMTP auth using a non-pop source"
+#: ../camel/camel-sasl-popb4smtp.c:94
+#, c-format
+msgid "POP Before SMTP authentication using a non-POP source"
 msgstr "'POP SMTPren aurretik' autentifikazioa POP ez den iturburua erabiliz"
 
-#: ../camel/camel-search-private.c:147
+#: ../camel/camel-search-private.c:112
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
 msgstr "Adierazpen erregularraren konpilazioak huts egin du: %s: %s"
 
-#: ../camel/camel-service.c:265
+#: ../camel/camel-service.c:85
 #, c-format
 msgid "URL '%s' needs a username component"
 msgstr "'%s' URLak erabiltzaile-izenaren osagaia behar du"
 
-#: ../camel/camel-service.c:269
+#: ../camel/camel-service.c:89
 #, c-format
 msgid "URL '%s' needs a host component"
 msgstr "'%s' URLak ostalari-osagaia behar du"
 
-#: ../camel/camel-service.c:273
+#: ../camel/camel-service.c:93
 #, c-format
 msgid "URL '%s' needs a path component"
 msgstr "'%s' URLak bide-izenaren osagaia behar du"
 
-#: ../camel/camel-session.c:305
+#: ../camel/camel-session.c:256
 #, c-format
 msgid ""
 "Could not create directory %s:\n"
@@ -2192,256 +2412,316 @@ msgstr ""
 "Ezin izan da %s direktorioa sortu:\n"
 "%s"
 
-#: ../camel/camel-session.c:477
+#: ../camel/camel-session.c:753
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
 msgstr "Idatzi %2$s(r)en %1$s pasahitza %3$s ostalarian."
 
-#: ../camel/camel-session.c:815
-msgid "Camel session doesn't support forwarding of a message."
-msgstr "Camel saioak ez du mezu bat birbidaltzea onartzen."
-
-#: ../camel/camel-smime-context.c:447 ../camel/camel-smime-context.c:1012
+#: ../camel/camel-smime-context.c:344 ../camel/camel-smime-context.c:1048
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ezin da '%s'(r)en ziurtagiria aurkitu."
 
-#: ../camel/camel-smime-context.c:453
+#: ../camel/camel-smime-context.c:372
 msgid "Cannot create CMS message"
 msgstr "Ezin da CMS mezua sortu"
 
-#: ../camel/camel-smime-context.c:458
+#: ../camel/camel-smime-context.c:377
 msgid "Cannot create CMS signed data"
 msgstr "Ezin da CMSren sinatutako datua sortu"
 
-#: ../camel/camel-smime-context.c:464
+#: ../camel/camel-smime-context.c:383
 msgid "Cannot attach CMS signed data"
 msgstr "Ezin da CMSren sinatutako daturik erantsi"
 
-#: ../camel/camel-smime-context.c:471
+#: ../camel/camel-smime-context.c:390
 msgid "Cannot attach CMS data"
 msgstr "Ezin da CMS daturik erantsi"
 
-#: ../camel/camel-smime-context.c:477
+#: ../camel/camel-smime-context.c:396
 msgid "Cannot create CMS Signer information"
 msgstr "Ezin da CMS sinatzailearen datuak sortu"
 
-#: ../camel/camel-smime-context.c:483
+#: ../camel/camel-smime-context.c:402
 msgid "Cannot find certificate chain"
 msgstr "Ezin da ziurtagiri-katea aurkitu"
 
-#: ../camel/camel-smime-context.c:489
+#: ../camel/camel-smime-context.c:408
 msgid "Cannot add CMS Signing time"
 msgstr "Ezin da CMS sinadura-ordua gehitu"
 
-#: ../camel/camel-smime-context.c:511 ../camel/camel-smime-context.c:523
+#: ../camel/camel-smime-context.c:432 ../camel/camel-smime-context.c:447
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Ez dago \"%s\"(r)en enkriptatze-ziurtagiririk"
 
-#: ../camel/camel-smime-context.c:530
+#: ../camel/camel-smime-context.c:454
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Ezin da SMIMEEncKeyPrefs atributua gehitu"
 
-#: ../camel/camel-smime-context.c:535
+#: ../camel/camel-smime-context.c:459
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Ezin da MS SMIMEEncKeyPrefs atributua gehitu"
 
-#: ../camel/camel-smime-context.c:540
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot add encryption certificate"
 msgstr "Ezin da enkriptatze-ziurtagiria gehitu"
 
-#: ../camel/camel-smime-context.c:546
+#: ../camel/camel-smime-context.c:470
 msgid "Cannot add CMS Signer information"
 msgstr "Ezin da CMS sinatzailearen datua gehitu"
 
-#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:1084
-msgid "Cannot create encoder context"
-msgstr "Ezin da kodetze-testuingurua sortu"
-
-#: ../camel/camel-smime-context.c:622
-msgid "Failed to add data to CMS encoder"
-msgstr "Huts egin du CMS kodeketari datua gehitzean"
-
-#: ../camel/camel-smime-context.c:627 ../camel/camel-smime-context.c:1101
-msgid "Failed to encode data"
-msgstr "Huts egin du datua kodetzean"
-
-#: ../camel/camel-smime-context.c:700
+#. Translators: A fallback message when couldn't verify an SMIME signature
+#: ../camel/camel-smime-context.c:503
 msgid "Unverified"
 msgstr "Egiaztatu gabe"
 
-#: ../camel/camel-smime-context.c:702
+#: ../camel/camel-smime-context.c:505
 msgid "Good signature"
 msgstr "Sinadura ona"
 
-#: ../camel/camel-smime-context.c:704
+#: ../camel/camel-smime-context.c:507
 msgid "Bad signature"
 msgstr "Sinadura txarra"
 
-#: ../camel/camel-smime-context.c:706
+#: ../camel/camel-smime-context.c:509
 msgid "Content tampered with or altered in transit"
 msgstr "Eduk¡a faltsutu edo aldatu egin da bidean"
 
-#: ../camel/camel-smime-context.c:708
+#: ../camel/camel-smime-context.c:511
 msgid "Signing certificate not found"
 msgstr "Sinadura-ziurtagiria ez da aurkitu."
 
-#: ../camel/camel-smime-context.c:710
+#: ../camel/camel-smime-context.c:513
 msgid "Signing certificate not trusted"
 msgstr "Sinadura-ziurtagiria ez da fidagarria"
 
-#: ../camel/camel-smime-context.c:712
+#: ../camel/camel-smime-context.c:515
 msgid "Signature algorithm unknown"
 msgstr "Sinadura-algoritmoa ezezaguna"
 
-#: ../camel/camel-smime-context.c:714
+#: ../camel/camel-smime-context.c:517
 msgid "Signature algorithm unsupported"
 msgstr "Sinadura-algoritmoa onartu gabea"
 
-#: ../camel/camel-smime-context.c:716
+#: ../camel/camel-smime-context.c:519
 msgid "Malformed signature"
 msgstr "Formatu okerreko sinadura"
 
-#: ../camel/camel-smime-context.c:718
+#: ../camel/camel-smime-context.c:521
 msgid "Processing error"
 msgstr "Prozesatze-errorea"
 
-#: ../camel/camel-smime-context.c:772
+#: ../camel/camel-smime-context.c:566
 msgid "No signed data in signature"
 msgstr "Ez dago daturik sinaduran"
 
-#: ../camel/camel-smime-context.c:777
+#: ../camel/camel-smime-context.c:571
 msgid "Digests missing from enveloped data"
 msgstr "Laburpena falta da bildutako datuan"
 
-#: ../camel/camel-smime-context.c:790 ../camel/camel-smime-context.c:800
+#: ../camel/camel-smime-context.c:584 ../camel/camel-smime-context.c:595
 msgid "Cannot calculate digests"
 msgstr "Ezin da laburpena kalkulatu"
 
-#: ../camel/camel-smime-context.c:807 ../camel/camel-smime-context.c:811
+#: ../camel/camel-smime-context.c:602 ../camel/camel-smime-context.c:606
 msgid "Cannot set message digests"
 msgstr "Ezin da mezuaren laburpena ezarri"
 
-#: ../camel/camel-smime-context.c:821 ../camel/camel-smime-context.c:826
+#: ../camel/camel-smime-context.c:616 ../camel/camel-smime-context.c:621
 msgid "Certificate import failed"
 msgstr "Ziurtagiria inportatzeak huts egin du"
 
-#: ../camel/camel-smime-context.c:836
+#: ../camel/camel-smime-context.c:631
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Mezuaren edukiak ziurtagiria bakarrik du, ezin dira ziurtagiriak egiaztatu"
 
-#: ../camel/camel-smime-context.c:839
+#: ../camel/camel-smime-context.c:634
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr ""
 "Mezuaren edukiak ziurtagiria bakarrik du, inportatutako eta egiaztatutako "
 "ziurtagiriak"
 
-#: ../camel/camel-smime-context.c:843
+#: ../camel/camel-smime-context.c:638
 msgid "Cannot find signature digests"
 msgstr "Ezin da sinadura-laburpena aurkitu"
 
-#: ../camel/camel-smime-context.c:859
+#: ../camel/camel-smime-context.c:654
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Sinatzailea: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:960 ../camel/camel-smime-context.c:1184
+#: ../camel/camel-smime-context.c:835 ../camel/camel-smime-context.c:1121
+msgid "Cannot create encoder context"
+msgstr "Ezin da kodetze-testuingurua sortu"
+
+#: ../camel/camel-smime-context.c:841
+msgid "Failed to add data to CMS encoder"
+msgstr "Huts egin du CMS kodeketari datua gehitzean"
+
+#: ../camel/camel-smime-context.c:846 ../camel/camel-smime-context.c:1138
+msgid "Failed to encode data"
+msgstr "Huts egin du datua kodetzean"
+
+#: ../camel/camel-smime-context.c:987 ../camel/camel-smime-context.c:1233
 msgid "Decoder failed"
 msgstr "Deskodetzaileak huts egin du"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Ezin da bloke-enkriptazioaren algoritmo arrunta aurkitu"
 
-#: ../camel/camel-smime-context.c:1027
+#: ../camel/camel-smime-context.c:1064
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ezin da enkriptazioaren gako-blokea esleitu"
 
-#: ../camel/camel-smime-context.c:1038
+#: ../camel/camel-smime-context.c:1075
 msgid "Cannot create CMS Message"
 msgstr "Ezin da CMS mezua sortu"
 
-#: ../camel/camel-smime-context.c:1044
+#: ../camel/camel-smime-context.c:1081
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ezin da bildutako CMS datua sortu"
 
-#: ../camel/camel-smime-context.c:1050
+#: ../camel/camel-smime-context.c:1087
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ezin da bildutako CMS datua erantsi"
 
-#: ../camel/camel-smime-context.c:1056
+#: ../camel/camel-smime-context.c:1093
 msgid "Cannot attach CMS data object"
 msgstr "Ezin da CMS datu-objektua erantsi"
 
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:1102
 msgid "Cannot create CMS Recipient information"
 msgstr "Ezin da CMS edukiaren informazioa sortu"
 
-#: ../camel/camel-smime-context.c:1070
+#: ../camel/camel-smime-context.c:1107
 msgid "Cannot add CMS Recipient information"
 msgstr "Ezin da CMS edukiaren informazioa gehitu"
 
-#: ../camel/camel-smime-context.c:1095
+#: ../camel/camel-smime-context.c:1132
 msgid "Failed to add data to encoder"
 msgstr "Huts egin du datuak kodetzailean gehitzean"
 
-#: ../camel/camel-smime-context.c:1191
+#: ../camel/camel-smime-context.c:1240
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME desenkriptatzea: ez da enkriptatutako edukirik aurkitu"
 
-#: ../camel/camel-smime-context.c:1219
-msgid "import keys: unimplemented"
-msgstr "inportatu gakoak: ez dago inplementatuta"
-
-#: ../camel/camel-smime-context.c:1227
-msgid "export keys: unimplemented"
-msgstr "esportatu gakoak: ez dago inplementatuta"
-
-#: ../camel/camel-store.c:283
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:171
-msgid "Cannot get folder: Invalid operation on this store"
-msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
-
-#: ../camel/camel-store.c:316
+#: ../camel/camel-store.c:2181
 #, c-format
 msgid "Cannot create folder '%s': folder exists"
 msgstr "Ezin da '%s' karpeta sortu: karpeta badago lehendik"
 
-#: ../camel/camel-store.c:395
-msgid "Cannot create folder: Invalid operation on this store"
-msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
+#. the name of the Trash folder, used for deleted messages
+#: ../camel/camel-store.c:2372 ../camel/camel-store.c:2382
+#: ../camel/camel-vtrash-folder.c:48
+msgid "Trash"
+msgstr "Zakarrontzia"
+
+#. the name of the Junk folder, used for spam messages
+#: ../camel/camel-store.c:2375 ../camel/camel-store.c:2386
+#: ../camel/camel-vtrash-folder.c:50
+msgid "Junk"
+msgstr "Baztergarria"
 
-#: ../camel/camel-store.c:423
+#: ../camel/camel-store.c:2829
 #, c-format
 msgid "Cannot create folder: %s: folder exists"
 msgstr "Ezin da karpeta sortu: %s: karpeta badago lehendik"
 
-#: ../camel/camel-store.c:487 ../camel/camel-vee-store.c:377
-#: ../camel/providers/local/camel-maildir-store.c:219
+#: ../camel/camel-store.c:2956 ../camel/camel-vee-store.c:367
+#: ../camel/providers/local/camel-maildir-store.c:272
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: eragiketa baliogabea"
 
-#: ../camel/camel-store.c:544 ../camel/camel-vee-store.c:414
-#: ../camel/providers/local/camel-maildir-store.c:291
+#: ../camel/camel-store.c:3097 ../camel/camel-vee-store.c:417
+#: ../camel/providers/local/camel-maildir-store.c:668
 #, c-format
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Ezin da karpetaren izena aldatu: %s: eragiketa baliogabea"
 
-#. the name of the Trash folder, used for deleted messages
-#: ../camel/camel-store.c:900 ../camel/camel-vtrash-folder.c:54
-msgid "Trash"
-msgstr "Zakarrontzia"
+#: ../camel/camel-tcp-stream-raw.c:749 ../camel/camel-tcp-stream-raw.c:760
+#, c-format
+msgid "The proxy host does not support SOCKS4"
+msgstr "Proxyaren ostalariak ez du SOCKS4 onartzen"
 
-#. the name of the Junk folder, used for spam messages
-#: ../camel/camel-store.c:903 ../camel/camel-vtrash-folder.c:56
-msgid "Junk"
-msgstr "Baztergarria"
+#: ../camel/camel-tcp-stream-raw.c:771
+#, c-format
+msgid "The proxy host denied our request: code %d"
+msgstr "Proxyaren ostalariak eskaera ukatu du: %d. kodea"
+
+#: ../camel/camel-tcp-stream-raw.c:867 ../camel/camel-tcp-stream-raw.c:873
+#, c-format
+msgid "The proxy host does not support SOCKS5"
+msgstr "Proxyaren ostalariak ez du SOCKS5 onartzen"
+
+#: ../camel/camel-tcp-stream-raw.c:879
+#, c-format
+msgid "Could not find a suitable authentication type: code 0x%x"
+msgstr "Ezin izan da autentifikazio mota egokirik aurkitu: Ox%x kodea"
+
+#: ../camel/camel-tcp-stream-raw.c:891
+msgid "General SOCKS server failure"
+msgstr "SOCKS zerbitzariaren hutsegite orokorra"
+
+#: ../camel/camel-tcp-stream-raw.c:892
+msgid "SOCKS server's rules do not allow connection"
+msgstr "SOCKS zerbitzariaren arauek ez dute konexioa baimentzen"
+
+#: ../camel/camel-tcp-stream-raw.c:893
+msgid "Network is unreachable from SOCKS server"
+msgstr "Sarea ez da atzigarria SOCKS zerbitzaritik"
+
+#: ../camel/camel-tcp-stream-raw.c:894
+msgid "Host is unreachable from SOCKS server"
+msgstr "Ostalaria ez da atzigarria SOCKS zerbitzaritik"
+
+#: ../camel/camel-tcp-stream-raw.c:895
+msgid "Connection refused"
+msgstr "Konexioa ukatuta"
+
+#: ../camel/camel-tcp-stream-raw.c:896
+msgid "Time-to-live expired"
+msgstr "Bizi iraupena iraungituta"
+
+#: ../camel/camel-tcp-stream-raw.c:897
+msgid "Command not supported by SOCKS server"
+msgstr "SOCKS zerbitzariak ez du komandoa onartzen"
+
+#: ../camel/camel-tcp-stream-raw.c:898
+msgid "Address type not supported by SOCKS server"
+msgstr "SOKCS zerbitzariak ez du helbide mota onartzen"
+
+#: ../camel/camel-tcp-stream-raw.c:899
+msgid "Unknown error from SOCKS server"
+msgstr "Errore ezezaguna SOCKS zerbitzaritik"
+
+#: ../camel/camel-tcp-stream-raw.c:932
+#, c-format
+msgid "Got unknown address type from SOCKS server"
+msgstr "Helbide mota ezezaguna lortu da SOCKS zerbitzaritik"
+
+#: ../camel/camel-tcp-stream-raw.c:950
+#, c-format
+msgid "Incomplete reply from SOCKS server"
+msgstr "SOCKS zerbitzariak erantzun baliogabea eman du"
+
+#: ../camel/camel-tcp-stream-raw.c:970
+#, c-format
+msgid "Hostname is too long (maximum is 255 characters)"
+msgstr "Ostalari-izena luzeegia da (gehienez 255 karaktere)"
+
+#. SOCKS5
+#. reserved - must be 0
+#: ../camel/camel-tcp-stream-raw.c:1002 ../camel/camel-tcp-stream-raw.c:1012
+#, c-format
+msgid "Invalid reply from proxy server"
+msgstr "Proxy zerbitzariak erantzun baliogabea eman du"
 
-#: ../camel/camel-tcp-stream-ssl.c:870
+#: ../camel/camel-tcp-stream-ssl.c:453
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2454,16 +2734,16 @@ msgstr ""
 "Hatz-marka:        %s\n"
 "Sinadura:          %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "GOOD"
 msgstr "ONA"
 
-#: ../camel/camel-tcp-stream-ssl.c:876
+#: ../camel/camel-tcp-stream-ssl.c:459
 msgid "BAD"
 msgstr "TXARRA"
 
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:880
+#: ../camel/camel-tcp-stream-ssl.c:463
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2478,7 +2758,7 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: ../camel/camel-tcp-stream-ssl.c:924
+#: ../camel/camel-tcp-stream-ssl.c:507
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2487,7 +2767,7 @@ msgstr ""
 "Ziurtagiri-arazoa: %s\n"
 "Jaulkitzailea: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:976
+#: ../camel/camel-tcp-stream-ssl.c:559
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2496,7 +2776,7 @@ msgstr ""
 "Ziurtagiri-domeinu txarra: %s\n"
 "Jaulkitzailea: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:994
+#: ../camel/camel-tcp-stream-ssl.c:577
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2505,7 +2785,7 @@ msgstr ""
 "Ziurtagiria iraungituta: %s\n"
 "Bidaltzailea: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1011
+#: ../camel/camel-tcp-stream-ssl.c:594
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2514,292 +2794,285 @@ msgstr ""
 "Ziurtagiri-errebokatzeen zerrenda iraungitua: %s\n"
 "Bidaltzailea: %s"
 
-#: ../camel/camel-url.c:313
+#: ../camel/camel-url.c:316
 #, c-format
 msgid "Could not parse URL '%s'"
 msgstr "Ezin izan da '%s' URLa analizatu"
 
-#: ../camel/camel-vee-folder.c:577
+#: ../camel/camel-vee-folder.c:1235 ../camel/camel-vee-folder.c:1398
 #, c-format
-msgid "Error storing '%s': %s"
-msgstr "Errorea %s gordetzean: %s"
+msgid "Cannot copy or move messages into a Virtual Folder"
+msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: ../camel/camel-vee-folder.c:654
+#: ../camel/camel-vee-folder.c:1271
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: ../camel/camel-vee-folder.c:813 ../camel/camel-vee-folder.c:819
-msgid "Cannot copy or move messages into a Virtual Folder"
-msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
+#: ../camel/camel-vee-folder.c:1339
+#, c-format
+msgid "Error storing '%s': "
+msgstr "Errorea '%s' gordetzean: "
 
-#: ../camel/camel-vee-store.c:113 ../camel/camel-vee-store.c:114
-#: ../camel/camel-vee-store.c:353
+#: ../camel/camel-vee-store.c:141 ../camel/camel-vee-store.c:143
+#: ../camel/camel-vee-store.c:322
 msgid "Unmatched"
 msgstr "Ez dator bat"
 
-#: ../camel/camel-vee-store.c:400
+#: ../camel/camel-vee-store.c:393
 #, c-format
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: ez dago horrelako karpetarik"
 
-#: ../camel/camel-vee-store.c:422
+#: ../camel/camel-vee-store.c:427
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
 msgstr "Ezin izan zaio izena aldatu karpetari: %s: ez dago horrelako karpetarik"
 
-#: ../camel/camel-vtrash-folder.c:55
+#: ../camel/camel-vtrash-folder.c:49
 msgid "Cannot copy messages to the Trash folder"
 msgstr "Ezin dira mezuak Zakarrontzia karpetan kopiatu"
 
-#: ../camel/camel-vtrash-folder.c:57
+#: ../camel/camel-vtrash-folder.c:51
 msgid "Cannot copy messages to the Junk folder"
 msgstr "Ezin dira mezuak Baztergarria karpetan kopiatu"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#, c-format
-msgid ""
-"Cannot get message: %s\n"
-"  %s"
-msgstr ""
-"Ezin da mezua hartu: %s\n"
-"  %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:137
-#: ../camel/providers/local/camel-maildir-folder.c:264
-#: ../camel/providers/local/camel-maildir-folder.c:293
-#: ../camel/providers/local/camel-maildir-folder.c:401
-#: ../camel/providers/local/camel-mbox-folder.c:363
-#: ../camel/providers/local/camel-mbox-folder.c:414
-#: ../camel/providers/local/camel-mh-folder.c:226
-msgid "No such message"
-msgstr "Ez dago horrelako mezurik"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:149
-#: ../camel/providers/imap4/camel-imap4-folder.c:814
-#: ../camel/providers/nntp/camel-nntp-folder.c:173
-#: ../camel/providers/nntp/camel-nntp-folder.c:248
-#: ../camel/providers/nntp/camel-nntp-folder.c:408
-#: ../camel/providers/pop3/camel-pop3-folder.c:268
-#: ../camel/providers/pop3/camel-pop3-folder.c:578
-#: ../camel/providers/pop3/camel-pop3-folder.c:639
-#: ../camel/providers/pop3/camel-pop3-folder.c:657
-msgid "User canceled"
-msgstr "Erabiltzaileak bertan behera utzi du"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:156
-#: ../camel/providers/imap4/camel-imap4-folder.c:819
-#: ../camel/providers/nntp/camel-nntp-folder.c:164
-#: ../camel/providers/nntp/camel-nntp-folder.c:166
-#: ../camel/providers/nntp/camel-nntp-folder.c:175
-#: ../camel/providers/nntp/camel-nntp-folder.c:250
-#: ../camel/providers/pop3/camel-pop3-folder.c:388
-#: ../camel/providers/pop3/camel-pop3-folder.c:581
-#: ../camel/providers/pop3/camel-pop3-folder.c:642
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-#: ../camel/providers/pop3/camel-pop3-folder.c:660
-#, c-format
-msgid "Cannot get message %s: %s"
-msgstr "Ezin da %s mezua hartu: %s"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:173
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:181
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2506
-#: ../camel/providers/imap4/camel-imap4-folder.c:837
-msgid "This message is not available in offline mode."
-msgstr "Mezu hau ez dago erabilgarri lineaz kanpo moduan"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:195
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:202
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2009
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2060
-msgid "Could not get message"
-msgstr "Ezin izan da mezua eskuratu"
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:982
-#: ../camel/providers/imap/camel-imap-folder.c:295
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:954
+#: ../camel/providers/imap/camel-imap-folder.c:392
 #, c-format
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1055
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1030
 #, c-format
 msgid "Checking for deleted messages %s"
 msgstr "Ezabatutako %s mezuak begiratzen"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1330
-msgid "Trash Folder Full. Please Empty."
-msgstr "Zakarrontzia beteta dago, hustu."
-
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:1564
-#: ../camel/providers/groupwise/camel-groupwise-store.c:626
-#: ../camel/providers/groupwise/camel-groupwise-store.c:756
-#: ../camel/providers/imap/camel-imap-folder.c:3429
-#: ../camel/providers/imap/camel-imap-folder.c:3505
-#: ../camel/providers/imapx/camel-imapx-server.c:2774
-#: ../camel/providers/imapx/camel-imapx-server.c:2860
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1517
+#: ../camel/providers/groupwise/camel-groupwise-store.c:665
+#: ../camel/providers/groupwise/camel-groupwise-store.c:796
+#: ../camel/providers/imap/camel-imap-folder.c:3962
+#: ../camel/providers/imap/camel-imap-folder.c:4044
+#: ../camel/providers/imapx/camel-imapx-server.c:3871
+#: ../camel/providers/imapx/camel-imapx-server.c:4002
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "Mezu berrien laburpen-informazioa eskuratzen %s(e)n"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2360
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2403
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:1987
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2040
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2704
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2714
+#, c-format
+msgid "Could not get message"
+msgstr "Ezin izan da mezua eskuratu"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2424
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2474
 #, c-format
 msgid "Cannot append message to folder '%s': %s"
 msgstr "Ezin zaio mezua '%s' karpetari erantsi: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-folder.c:2391
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2460
 #, c-format
 msgid "Cannot create message: %s"
 msgstr "Ezin da mezua sortu: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:281
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#, c-format
+msgid ""
+"Cannot get message: %s\n"
+"  %s"
+msgstr ""
+"Ezin da mezua hartu: %s\n"
+"  %s"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2640
+#: ../camel/providers/local/camel-maildir-folder.c:100
+#: ../camel/providers/local/camel-maildir-folder.c:307
+#: ../camel/providers/local/camel-mbox-folder.c:117
+#: ../camel/providers/local/camel-mbox-folder.c:325
+#: ../camel/providers/local/camel-mh-folder.c:156
+msgid "No such message"
+msgstr "Ez dago horrelako mezurik"
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2659
+#: ../camel/providers/nntp/camel-nntp-folder.c:246
+#: ../camel/providers/nntp/camel-nntp-folder.c:413
+#: ../camel/providers/pop3/camel-pop3-folder.c:457
+#, c-format
+msgid "Cannot get message %s: "
+msgstr "Ezin da %s mezua hartu: "
+
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2677
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2687
+#: ../camel/providers/groupwise/camel-groupwise-folder.c:2890
+#, c-format
+msgid "This message is not available in offline mode."
+msgstr "Mezu hau ez dago erabilgarri lineaz kanpo moduan"
+
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:248
 #, c-format
 msgid "Cannot get folder container %s"
 msgstr "Ezin da %s edukiontzia hartu"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:343
-#: ../camel/providers/imap4/camel-imap4-journal.c:311
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:318
+#, c-format
 msgid "Cannot append message in offline mode: cache unavailable"
 msgstr "Ezin da mezua erantsi lineaz kanpo moduan: cache-a ez dago eskuragarri"
 
-#: ../camel/providers/groupwise/camel-groupwise-journal.c:359
-#: ../camel/providers/imap4/camel-imap4-journal.c:327
-#, c-format
-msgid "Cannot append message in offline mode: %s"
-msgstr "Ezin da mezua erantsi lineaz kanpo moduan: %s"
+#: ../camel/providers/groupwise/camel-groupwise-journal.c:335
+msgid "Cannot append message in offline mode: "
+msgstr "Ezin izan da mezua erantsi lineaz kanpo moduan: "
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:54
-#: ../camel/providers/imap4/camel-imap4-provider.c:38
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:48
 msgid "Checking for new mail"
 msgstr "Mezu berririk dagoen begiratzen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:56
-#: ../camel/providers/hula/camel-hula-provider.c:50
-#: ../camel/providers/imap/camel-imap-provider.c:46
-#: ../camel/providers/imap4/camel-imap4-provider.c:40
-#: ../camel/providers/imapx/camel-imapx-provider.c:48
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:50
+#: ../camel/providers/imap/camel-imap-provider.c:42
+#: ../camel/providers/imapx/camel-imapx-provider.c:46
 msgid "C_heck for new messages in all folders"
 msgstr "_Begiratu karpeta guztietan mezu berririk dagoen"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
-#: ../camel/providers/imap/camel-imap-provider.c:68
-#: ../camel/providers/imap4/camel-imap4-provider.c:51
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:53
+#: ../camel/providers/imap/camel-imap-provider.c:64
 #: ../camel/providers/imapx/camel-imapx-provider.c:72
-#: ../camel/providers/local/camel-local-provider.c:46
-#: ../camel/providers/local/camel-local-provider.c:86
-#: ../camel/providers/local/camel-local-provider.c:106
+#: ../camel/providers/local/camel-local-provider.c:42
+#: ../camel/providers/local/camel-local-provider.c:84
+#: ../camel/providers/local/camel-local-provider.c:105
 msgid "Options"
 msgstr "Aukerak"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:55
+#: ../camel/providers/imap/camel-imap-provider.c:66
+#: ../camel/providers/imapx/camel-imapx-provider.c:74
 msgid "_Apply filters to new messages in Inbox on this server"
 msgstr "_Aplikatu iragazkiak zerbitzari honetako 'Sarrera'ko ontziko mezu berriei"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:63
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:57
 msgid "Check new messages for J_unk contents"
 msgstr "Begiratu mezu berrietan eduki _baztergarriak dituzten"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:65
-#: ../camel/providers/imap/camel-imap-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:70
 #: ../camel/providers/imapx/camel-imapx-provider.c:78
 msgid "Only check for Junk messages in the IN_BOX folder"
 msgstr "Begiratu mezuak baztergarriak diren _Sarrera ontzian bakarrik"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:67
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:61
 msgid "Automatically synchroni_ze account locally"
 msgstr "_Sinkronizatu automatikoki lokaleko kontua"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:72
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:66
 msgid "SOAP Settings"
 msgstr "SOAP ezarpenak"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:75
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:69
 msgid "Post Office Agent SOAP _Port:"
 msgstr "SOAP posta-bulego agentearen _ataka:"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:87
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:80
+msgid "Default GroupWise port"
+msgstr "GroupWise-ren ataka lehenetsia"
+
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:86
 msgid "Novell GroupWise"
 msgstr "Novell GroupWise"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:89
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:88
 msgid "For accessing Novell GroupWise servers"
 msgstr "Novell Groupwise zerbitzariekin sarbidetzeko"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:104
-#: ../camel/providers/hula/camel-hula-provider.c:93
-#: ../camel/providers/imap/camel-imap-provider.c:100
-#: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapx/camel-imapx-provider.c:104
-#: ../camel/providers/nntp/camel-nntp-provider.c:74
-#: ../camel/providers/pop3/camel-pop3-provider.c:74
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:105
+#: ../camel/providers/imap/camel-imap-provider.c:105
+#: ../camel/providers/imapx/camel-imapx-provider.c:113
+#: ../camel/providers/nntp/camel-nntp-provider.c:80
+#: ../camel/providers/pop3/camel-pop3-provider.c:81
 msgid "Password"
 msgstr "Pasahitza"
 
-#: ../camel/providers/groupwise/camel-groupwise-provider.c:106
+#: ../camel/providers/groupwise/camel-groupwise-provider.c:107
 msgid "This option will connect to the GroupWise server using a plaintext password."
 msgstr ""
 "Aukera honek Groupwise zerbitzariarekin konektatuko zaitu testu arrunteko "
 "pasahitzaren bidez."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:102
+#: ../camel/providers/groupwise/camel-groupwise-store.c:103
+#, c-format
 msgid "Host or user not available in url"
 msgstr "Ostalaria edo erabiltzailea ez dago erabilgarri URLan"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:197
-#: ../camel/providers/imap/camel-imap-store.c:1356
+#: ../camel/providers/groupwise/camel-groupwise-store.c:205
+#: ../camel/providers/imap/camel-imap-store.c:801
+#: ../camel/providers/imapx/camel-imapx-server.c:3085
+#, c-format
 msgid "You did not enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:312
+#: ../camel/providers/groupwise/camel-groupwise-store.c:328
 msgid "Some features may not work correctly with your current server version"
 msgstr "Funtzio batzuk ez dute uneko zure zerbitzariaren bertsioarekin funtzionatuko"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:533
-#: ../camel/providers/imap/camel-imap-store.c:1879
-#: ../camel/providers/imap/camel-imap-store.c:2077
-#: ../camel/providers/imapx/camel-imapx-store.c:297
+#: ../camel/providers/groupwise/camel-groupwise-store.c:556
+#: ../camel/providers/imap/camel-imap-store.c:1808
+#: ../camel/providers/imap/camel-imap-store.c:2005
+#: ../camel/providers/imapx/camel-imapx-store.c:341
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1201
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1217
+#, c-format
 msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ezin dira GroupWise-ren karpetak sortu lineaz kanpo moduan"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1215
-#: ../camel/providers/imap/camel-imap-store.c:1954
-#: ../camel/providers/imap/camel-imap-store.c:2334
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1226
+#, c-format
+msgid "Cannot create a special system folder"
+msgstr "Ezin da sistemako karpeta berezirik sortu"
+
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1236
+#: ../camel/providers/imap/camel-imap-store.c:1886
+#: ../camel/providers/imap/camel-imap-store.c:2323
+#: ../camel/providers/imapx/camel-imapx-store.c:1340
+#, c-format
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Karpeta gurasoak ez du azpikarpetak edukitzeko baimenik"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1294
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1317
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1321
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1346
 #, c-format
 msgid "Cannot rename GroupWise folder '%s' to '%s'"
 msgstr "Ezin da GroupWise-ren '%s' karpeta '%s' izenagatik aldatu"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1349
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:120
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1380
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:47
 #, c-format
 msgid "GroupWise server %s"
 msgstr "GroupWise zerbitzaria: %s"
 
-#: ../camel/providers/groupwise/camel-groupwise-store.c:1351
+#: ../camel/providers/groupwise/camel-groupwise-store.c:1382
 #, c-format
 msgid "GroupWise service for %s on %s"
 msgstr "GroupWise zerbitzua %s(e)rako %s(e)n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:122
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:51
 #, c-format
 msgid "GroupWise mail delivery via %s"
 msgstr "GroupWise posta-banaketa %s bidez"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:164
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:97
 msgid "Sending Message"
 msgstr "Mezua bidaltzen"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:212
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:107
+#, c-format
+msgid "Cannot get folder: Invalid operation on this store"
+msgstr "Ezin da karpeta hartu: eragiketa baliogabea biltegi honetarako"
+
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:154
+#, c-format
 msgid ""
 "You have exceeded this account's storage limit. Your messages are queued in "
 "your Outbox. Resend by pressing Send/Receive after deleting/archiving some "
@@ -2809,102 +3082,36 @@ msgstr ""
 "daude. Birbidaltzeko sakatu 'Bidali/Jaso' mezuetariko batzuk ezabatu/"
 "artxibatu ondoren.\n"
 
-#: ../camel/providers/groupwise/camel-groupwise-transport.c:214
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:207
+#: ../camel/providers/groupwise/camel-groupwise-transport.c:159
 #, c-format
 msgid "Could not send message: %s"
 msgstr "Ezin izan da mezua bidali: %s"
 
-#: ../camel/providers/hula/camel-hula-provider.c:48
-#: ../camel/providers/imap/camel-imap-provider.c:44
-#: ../camel/providers/imapx/camel-imapx-provider.c:44
-msgid "Checking for New Mail"
-msgstr "Mezu berririk dagoen begiratzen"
-
-#: ../camel/providers/hula/camel-hula-provider.c:53
-#: ../camel/providers/imap/camel-imap-provider.c:52
-#: ../camel/providers/imapx/camel-imapx-provider.c:54
-msgid "Connection to Server"
-msgstr "Zerbitzariarekin konexioa"
-
-#: ../camel/providers/hula/camel-hula-provider.c:55
-#: ../camel/providers/imap/camel-imap-provider.c:54
-#: ../camel/providers/imapx/camel-imapx-provider.c:56
-msgid "_Use custom command to connect to server"
-msgstr "_Erabili komando pertsonalizatua zerbitzariarekin konektatzeko"
-
-#: ../camel/providers/hula/camel-hula-provider.c:57
-#: ../camel/providers/imap/camel-imap-provider.c:56
-#: ../camel/providers/imapx/camel-imapx-provider.c:58
-msgid "Command:"
-msgstr "Komandoa:"
-
-#: ../camel/providers/hula/camel-hula-provider.c:60
-#: ../camel/providers/imap/camel-imap-provider.c:60
-#: ../camel/providers/imap4/camel-imap4-provider.c:43
-#: ../camel/providers/imapx/camel-imapx-provider.c:64
-#: ../camel/providers/nntp/camel-nntp-provider.c:44
-msgid "Folders"
-msgstr "Karpetak"
-
-#: ../camel/providers/hula/camel-hula-provider.c:62
-#: ../camel/providers/imap/camel-imap-provider.c:62
-#: ../camel/providers/imap4/camel-imap4-provider.c:45
-#: ../camel/providers/imapx/camel-imapx-provider.c:66
-msgid "_Show only subscribed folders"
-msgstr "E_rakutsi harpidetutako karpetak soilik"
-
-#: ../camel/providers/hula/camel-hula-provider.c:64
-#: ../camel/providers/imap/camel-imap-provider.c:64
-#: ../camel/providers/imap4/camel-imap4-provider.c:47
-#: ../camel/providers/imapx/camel-imapx-provider.c:68
-msgid "O_verride server-supplied folder namespace"
-msgstr "_Gainidatzi zerbitzariak emandako karpeta-izena"
-
-#: ../camel/providers/hula/camel-hula-provider.c:66
-msgid "Namespace"
-msgstr "Izena"
-
-#: ../camel/providers/hula/camel-hula-provider.c:76
-msgid "Hula"
-msgstr "Hula"
-
-#: ../camel/providers/hula/camel-hula-provider.c:78
-msgid "For accessing Hula servers"
-msgstr "Hula zerbitzariekin sarbidetzeko"
-
-#: ../camel/providers/hula/camel-hula-provider.c:95
-msgid "This option will connect to the Hula server using a plaintext password."
-msgstr ""
-"Aukera honek Hula zerbitzariarekin konektatuko zaitu testu arrunteko "
-"pasahitzaren bidez."
-
-#: ../camel/providers/imap/camel-imap-command.c:181
-#: ../camel/providers/imap/camel-imap-command.c:265
+#: ../camel/providers/imap/camel-imap-command.c:197
+#: ../camel/providers/imap/camel-imap-command.c:301
+#, c-format
 msgid "No output stream"
 msgstr "Ez dago irteerako korronterik"
 
-#: ../camel/providers/imap/camel-imap-command.c:186
-#: ../camel/providers/imap/camel-imap-command.c:270
+#: ../camel/providers/imap/camel-imap-command.c:205
+#: ../camel/providers/imap/camel-imap-command.c:309
+#, c-format
 msgid "No input stream"
 msgstr "Ez dago sarrerako korronterik"
 
-#: ../camel/providers/imap/camel-imap-command.c:229
-#: ../camel/providers/imap/camel-imap-command.c:278
-#: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3105
+#: ../camel/providers/imap/camel-imap-command.c:255
+#, c-format
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
-#: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3110
+#: ../camel/providers/imap/camel-imap-command.c:373
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean: %s"
 
 #. for imap ALERT codes, account user host
 #. we might get a ']' from a BAD response since we +12, but who cares?
-#: ../camel/providers/imap/camel-imap-command.c:352
+#: ../camel/providers/imap/camel-imap-command.c:394
 #, c-format
 msgid ""
 "Alert from IMAP server %s %s:\n"
@@ -2913,261 +3120,256 @@ msgstr ""
 "Abisua %s %s IMAP zerbitzaritik:\n"
 "%s"
 
-#: ../camel/providers/imap/camel-imap-command.c:421
+#: ../camel/providers/imap/camel-imap-command.c:468
 #, c-format
 msgid "Unexpected response from IMAP server: %s"
 msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:431
+#: ../camel/providers/imap/camel-imap-command.c:480
 #, c-format
 msgid "IMAP command failed: %s"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: ../camel/providers/imap/camel-imap-command.c:506
+#: ../camel/providers/imap/camel-imap-command.c:560
+#, c-format
 msgid "Server response ended too soon."
 msgstr "Zerbitzariaren erantzuna lasterregi amaitu da."
 
-#: ../camel/providers/imap/camel-imap-command.c:712
+#: ../camel/providers/imap/camel-imap-command.c:771
 #, c-format
 msgid "IMAP server response did not contain %s information"
 msgstr "IMAP zerbitzariaren erantzunak ez zeukan %s informaziorik"
 
-#: ../camel/providers/imap/camel-imap-command.c:748
+#: ../camel/providers/imap/camel-imap-command.c:809
 #, c-format
 msgid "Unexpected OK response from IMAP server: %s"
 msgstr "Ustekabeko baiezko erantzuna IMAP zerbitzaritik: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:90
+#: ../camel/providers/imap/camel-imap-folder.c:292
 msgid "Always check for new mail in this folder"
 msgstr "Begiratu beti mezu berriak dauden karpeta honetan"
 
-#: ../camel/providers/imap/camel-imap-folder.c:276
+#: ../camel/providers/imap/camel-imap-folder.c:369
 #, c-format
 msgid "Could not create directory %s: %s"
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#. Check UIDs and flags of all messages we already know of.
-#: ../camel/providers/imap/camel-imap-folder.c:918
-#: ../camel/providers/imapx/camel-imapx-server.c:2804
+#: ../camel/providers/imap/camel-imap-folder.c:992
+#: ../camel/providers/imapx/camel-imapx-server.c:3915
 #, c-format
 msgid "Scanning for changed messages in %s"
 msgstr "Aldatutako mezuen bila eskaneatzen %s(e)n"
 
-#: ../camel/providers/imap/camel-imap-folder.c:1986
-#, c-format
-msgid "Unexpected response status '%s' after APPEND command"
-msgstr "Ustekabeko '%s' erantzun-egorea APPEND komandoaren ondoren"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2001
-msgid "No response on continuation after APPEND command"
-msgstr "Ez dago erantzunik APPEND komandoaren ondoren"
+#: ../camel/providers/imap/camel-imap-folder.c:3369
+msgid "Unable to retrieve message: "
+msgstr "Ezin da mezua eskuratu: "
 
-#: ../camel/providers/imap/camel-imap-folder.c:2046
-msgid "Unknown error occurred during APPEND command!"
-msgstr "Errore ezezaguna gertatuta da APPEND komandoan."
-
-#: ../camel/providers/imap/camel-imap-folder.c:2877
-#, c-format
-msgid "Unable to retrieve message: %s"
-msgstr "Ezin da mezua eskuratu: %s"
-
-#: ../camel/providers/imap/camel-imap-folder.c:2912
+#: ../camel/providers/imap/camel-imap-folder.c:3404
+#: ../camel/providers/imapx/camel-imapx-server.c:5193
 #, c-format
 msgid "Cannot get message with message ID %s: %s"
 msgstr "Ezin da %s IDa duen mezua hartu: %s"
 
-#: ../camel/providers/imap/camel-imap-folder.c:2913
+#: ../camel/providers/imap/camel-imap-folder.c:3405
+#: ../camel/providers/imapx/camel-imapx-server.c:5194
 msgid "No such message available."
 msgstr "Ez dago horrelako mezurik erabilgarri."
 
-#: ../camel/providers/imap/camel-imap-folder.c:2974
-#: ../camel/providers/imap/camel-imap-folder.c:3819
-#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/imap/camel-imap-folder.c:3480
+#: ../camel/providers/imap/camel-imap-folder.c:4375
+#: ../camel/providers/nntp/camel-nntp-folder.c:402
+#, c-format
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:4176
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Zerbitzariaren osatu gabeko erantzuna: ez da %d mezuaren informaziorik eman"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3640
+#: ../camel/providers/imap/camel-imap-folder.c:4186
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Zerbitzariaren osatu gabeko erantzuna: ez da %d mezuaren UIDrik eman"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3857
+#: ../camel/providers/imap/camel-imap-folder.c:4415
+#, c-format
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:181
-#: ../camel/providers/imap/camel-imap-message-cache.c:244
-#, c-format
-msgid "Could not open cache directory: %s"
-msgstr "Ezin izan da cache-direktorioa ireki: %s"
+#: ../camel/providers/imap/camel-imap-message-cache.c:193
+#: ../camel/providers/imap/camel-imap-message-cache.c:253
+msgid "Could not open cache directory: "
+msgstr "Ezin izan da cache-direktorioa ireki: "
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:330
-#: ../camel/providers/imap/camel-imap-message-cache.c:387
-#: ../camel/providers/imap/camel-imap-message-cache.c:418
-#: ../camel/providers/imap/camel-imap-message-cache.c:450
+#: ../camel/providers/imap/camel-imap-message-cache.c:326
 #, c-format
 msgid "Failed to cache message %s: %s"
 msgstr "Huts egin du %s mezua cache-an gordetzean: %s"
 
-#: ../camel/providers/imap/camel-imap-message-cache.c:530
+#: ../camel/providers/imap/camel-imap-message-cache.c:391
 #, c-format
-msgid "Failed to cache %s: %s"
-msgstr "Huts egin du %s cache-a araztean: %s"
+msgid "Failed to cache message %s: "
+msgstr "Huts egin du %s mezua cache-an gordetzean: "
 
-#: ../camel/providers/imap/camel-imap-provider.c:48
-#: ../camel/providers/imapx/camel-imapx-provider.c:50
+#: ../camel/providers/imap/camel-imap-message-cache.c:529
+#, c-format
+msgid "Failed to cache %s: "
+msgstr "Huts egin du %s cache-an gordetzean: "
+
+#: ../camel/providers/imap/camel-imap-provider.c:40
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
+msgid "Checking for New Mail"
+msgstr "Mezu berririk dagoen begiratzen"
+
+#: ../camel/providers/imap/camel-imap-provider.c:44
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "Ch_eck for new messages in subscribed folders"
 msgstr "_Begiratu harpidetutako karpetetan mezu berririk dagoen"
 
-#: ../camel/providers/imap/camel-imap-provider.c:66
-#: ../camel/providers/imap4/camel-imap4-provider.c:49
-#: ../camel/providers/imapx/camel-imapx-provider.c:70
-msgid "Namespace:"
-msgstr "Izen-lekua:"
+#: ../camel/providers/imap/camel-imap-provider.c:48
+#: ../camel/providers/imapx/camel-imapx-provider.c:52
+msgid "Connection to Server"
+msgstr "Zerbitzariarekin konexioa"
 
-#: ../camel/providers/imap/camel-imap-provider.c:70
-#: ../camel/providers/imap4/camel-imap4-provider.c:53
-#: ../camel/providers/imapx/camel-imapx-provider.c:74
-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:50
+#: ../camel/providers/imapx/camel-imapx-provider.c:54
+msgid "_Use custom command to connect to server"
+msgstr "_Erabili komando pertsonalizatua zerbitzariarekin konektatzeko"
 
-#: ../camel/providers/imap/camel-imap-provider.c:72
+#: ../camel/providers/imap/camel-imap-provider.c:52
+msgid "Co_mmand:"
+msgstr "Ko_mandoa:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:56
+#: ../camel/providers/imapx/camel-imapx-provider.c:62
+#: ../camel/providers/nntp/camel-nntp-provider.c:42
+msgid "Folders"
+msgstr "Karpetak"
+
+#: ../camel/providers/imap/camel-imap-provider.c:58
+#: ../camel/providers/imapx/camel-imapx-provider.c:64
+msgid "_Show only subscribed folders"
+msgstr "E_rakutsi harpidetutako karpetak soilik"
+
+#: ../camel/providers/imap/camel-imap-provider.c:60
+#: ../camel/providers/imapx/camel-imapx-provider.c:67
+msgid "O_verride server-supplied folder namespace"
+msgstr "_Gainidatzi zerbitzariak emandako karpeta-izena"
+
+#: ../camel/providers/imap/camel-imap-provider.c:62
+msgid "Names_pace:"
+msgstr "_Izen-lekua:"
+
+#: ../camel/providers/imap/camel-imap-provider.c:68
 #: ../camel/providers/imapx/camel-imapx-provider.c:76
 msgid "Check new messages for Jun_k contents"
 msgstr "Begiratu mezu berrietan eduki _baztergarriak dituzten"
 
-#: ../camel/providers/imap/camel-imap-provider.c:76
-#: ../camel/providers/imap4/camel-imap4-provider.c:59
+#: ../camel/providers/imap/camel-imap-provider.c:72
 #: ../camel/providers/imapx/camel-imapx-provider.c:80
 msgid "Automatically synchroni_ze remote mail locally"
 msgstr "_Sinkronizatu automatikoki urruneko mezuak lokalki"
 
-#: ../camel/providers/imap/camel-imap-provider.c:83
+#: ../camel/providers/imap/camel-imap-provider.c:78
+msgid "IMAP default port"
+msgstr "IMAPen ataka lehenetsia"
+
+#: ../camel/providers/imap/camel-imap-provider.c:79
+#: ../camel/providers/imapx/camel-imapx-provider.c:87
+msgid "IMAP over SSL"
+msgstr "IMAP SSLren gainean"
+
+#: ../camel/providers/imap/camel-imap-provider.c:85
 msgid "IMAP"
 msgstr "IMAP"
 
-#: ../camel/providers/imap/camel-imap-provider.c:85
-#: ../camel/providers/imapx/camel-imapx-provider.c:90
+#: ../camel/providers/imap/camel-imap-provider.c:87
+#: ../camel/providers/imapx/camel-imapx-provider.c:96
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP zerbitzarietan posta irakurri eta gordetzeko."
 
-#: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapx/camel-imapx-provider.c:106
+#: ../camel/providers/imap/camel-imap-provider.c:107
+#: ../camel/providers/imapx/camel-imapx-provider.c:115
 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:435
-#: ../camel/providers/imap4/camel-imap4-store.c:210
-#: ../camel/providers/imapx/camel-imapx-store.c:167
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP zerbitzaria"
-
-#: ../camel/providers/imap/camel-imap-store.c:437
-#: ../camel/providers/imap4/camel-imap4-store.c:212
-#: ../camel/providers/imapx/camel-imapx-store.c:169
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP zerbitzua %s(e)rako %s(e)n"
-
-#: ../camel/providers/imap/camel-imap-store.c:566
-#: ../camel/providers/imap/camel-imap-store.c:581
-#: ../camel/providers/imap4/camel-imap4-store.c:247
-#: ../camel/providers/imap4/camel-imap4-store.c:262
-#: ../camel/providers/nntp/camel-nntp-store.c:182
-#: ../camel/providers/nntp/camel-nntp-store.c:197
-#: ../camel/providers/pop3/camel-pop3-store.c:192
-#: ../camel/providers/pop3/camel-pop3-store.c:206
-#: ../camel/providers/smtp/camel-smtp-transport.c:259
-#: ../camel/providers/smtp/camel-smtp-transport.c:274
+#: ../camel/providers/imap/camel-imap-store.c:243
+#: ../camel/providers/nntp/camel-nntp-store.c:342
+#: ../camel/providers/pop3/camel-pop3-store.c:135
+#: ../camel/providers/smtp/camel-smtp-transport.c:151
 #, c-format
 msgid "Could not connect to %s: %s"
 msgstr "Ezin da %s(r)ekin konektatu: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:567
-#: ../camel/providers/imap4/camel-imap4-store.c:248
-#: ../camel/providers/nntp/camel-nntp-store.c:183
-#: ../camel/providers/pop3/camel-pop3-store.c:193
-#: ../camel/providers/smtp/camel-smtp-transport.c:260
+#: ../camel/providers/imap/camel-imap-store.c:244
+#: ../camel/providers/nntp/camel-nntp-store.c:343
+#: ../camel/providers/pop3/camel-pop3-store.c:136
+#: ../camel/providers/smtp/camel-smtp-transport.c:152
 msgid "SSL unavailable"
 msgstr "SSL ez dago erabilgarri"
 
-#: ../camel/providers/imap/camel-imap-store.c:578
-#: ../camel/providers/imap/camel-imap-store.c:860
-#: ../camel/providers/imapx/camel-imapx-server.c:2038
-msgid "Connection cancelled"
-msgstr "Konexioa etenda"
+#: ../camel/providers/imap/camel-imap-store.c:264
+#: ../camel/providers/nntp/camel-nntp-store.c:362
+#, c-format
+msgid "Could not connect to %s: "
+msgstr "Ezin izan da %s(r)ekin konektatu: "
 
-#: ../camel/providers/imap/camel-imap-store.c:689
-#: ../camel/providers/imap/camel-imap-store.c:708
-#: ../camel/providers/imap/camel-imap-store.c:714
-#: ../camel/providers/imap/camel-imap-store.c:740
-#: ../camel/providers/imap4/camel-imap4-store.c:310
-#: ../camel/providers/imap4/camel-imap4-store.c:325
-#: ../camel/providers/imap4/camel-imap4-store.c:334
-#: ../camel/providers/imapx/camel-imapx-server.c:2078
-#: ../camel/providers/imapx/camel-imapx-server.c:2092
+#: ../camel/providers/imap/camel-imap-store.c:370
+#: ../camel/providers/imap/camel-imap-store.c:390
+#: ../camel/providers/imap/camel-imap-store.c:397
+#: ../camel/providers/imap/camel-imap-store.c:424
+#: ../camel/providers/imapx/camel-imapx-server.c:2927
+#: ../camel/providers/imapx/camel-imapx-server.c:2967
 #, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ezin da %s IMAP zerbitzariarekin konektatu modu seguruan: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:690
-#: ../camel/providers/imapx/camel-imapx-server.c:2079
-#: ../camel/providers/smtp/camel-smtp-transport.c:332
+#: ../camel/providers/imap/camel-imap-store.c:371
+#: ../camel/providers/imapx/camel-imapx-server.c:2928
+#: ../camel/providers/smtp/camel-smtp-transport.c:238
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ez da onartzen"
 
-#: ../camel/providers/imap/camel-imap-store.c:709
-#: ../camel/providers/imapx/camel-imapx-server.c:2093
+#: ../camel/providers/imap/camel-imap-store.c:391
+#: ../camel/providers/imapx/camel-imapx-server.c:2968
 msgid "SSL negotiations failed"
 msgstr "SSL negoziazioak huts egin du."
 
-#: ../camel/providers/imap/camel-imap-store.c:715
-#: ../camel/providers/imap4/camel-imap4-store.c:335
-#: ../camel/providers/smtp/camel-smtp-transport.c:371
+#: ../camel/providers/imap/camel-imap-store.c:398
+#: ../camel/providers/smtp/camel-smtp-transport.c:285
 msgid "SSL is not available in this build"
 msgstr "SSL ez da onartzen bertsio honetan"
 
-#: ../camel/providers/imap/camel-imap-store.c:863
+#: ../camel/providers/imap/camel-imap-store.c:549
+#: ../camel/providers/imapx/camel-imapx-server.c:2755
+#, c-format
+msgid "Connection cancelled"
+msgstr "Konexioa etenda"
+
+#: ../camel/providers/imap/camel-imap-store.c:554
+#: ../camel/providers/imapx/camel-imapx-server.c:2760
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ezin da \"%s\" komandoarekin konektatu: %s"
 
-#. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1051
-#: ../camel/providers/imap/camel-imap-store.c:2430
-#: ../camel/providers/imap4/camel-imap4-store-summary.c:356
-#: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/imapx/camel-imapx-store.c:349
-#: ../camel/providers/imapx/camel-imapx-store.c:578
-#: ../camel/providers/local/camel-maildir-folder.c:81
-#: ../camel/providers/local/camel-maildir-store.c:219
-#: ../camel/providers/local/camel-maildir-store.c:291
-#: ../camel/providers/local/camel-maildir-store.c:517
-#: ../camel/providers/local/camel-maildir-store.c:530
-#: ../camel/providers/local/camel-spool-store.c:461
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
-#: ../camel/providers/imap/camel-imap-store.c:1303
+#: ../camel/providers/imap/camel-imap-store.c:740
+#: ../camel/providers/imapx/camel-imapx-server.c:3041
 #, 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:1313
-#: ../camel/providers/smtp/camel-smtp-transport.c:506
+#: ../camel/providers/imap/camel-imap-store.c:752
+#: ../camel/providers/imapx/camel-imapx-server.c:3053
+#: ../camel/providers/smtp/camel-smtp-transport.c:420
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "%s motako autentifikazioa ez da onartzen"
 
-#: ../camel/providers/imap/camel-imap-store.c:1387
+#: ../camel/providers/imap/camel-imap-store.c:836
+#: ../camel/providers/imapx/camel-imapx-server.c:3129
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3178,420 +3380,185 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1891
-#: ../camel/providers/imap/camel-imap-store.c:2272
-#: ../camel/providers/imap4/camel-imap4-store.c:954
+#: ../camel/providers/imap/camel-imap-store.c:997
+#: ../camel/providers/imapx/camel-imapx-store.c:182
+#, c-format
+msgid "IMAP server %s"
+msgstr "%s IMAP zerbitzaria"
+
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imapx/camel-imapx-store.c:184
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP zerbitzua %s(e)rako %s(e)n"
+
+#. create a dummy "." parent inbox, use to scan, then put back at the top level
+#: ../camel/providers/imap/camel-imap-store.c:1367
+#: ../camel/providers/imap/camel-imap-store.c:2416
+#: ../camel/providers/imapx/camel-imapx-store.c:371
+#: ../camel/providers/imapx/camel-imapx-store.c:793
+#: ../camel/providers/local/camel-maildir-folder.c:409
+#: ../camel/providers/local/camel-maildir-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:615
+#: ../camel/providers/local/camel-maildir-store.c:621
+#: ../camel/providers/local/camel-maildir-store.c:669
+#: ../camel/providers/local/camel-spool-store.c:289
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: ../camel/providers/imap/camel-imap-store.c:1822
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imapx/camel-imapx-store.c:1319
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
 
-#: ../camel/providers/imap/camel-imap-store.c:2008
-#: ../camel/providers/local/camel-maildir-store.c:192
-#: ../camel/providers/local/camel-mbox-store.c:202
-#: ../camel/providers/local/camel-mh-store.c:249
+#: ../camel/providers/imap/camel-imap-store.c:1939
+#: ../camel/providers/local/camel-maildir-store.c:244
+#: ../camel/providers/local/camel-mbox-store.c:407
+#: ../camel/providers/local/camel-mh-store.c:504
 #, c-format
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ezin da '%s' karpeta sortu: karpeta badago lehendik."
 
-#: ../camel/providers/imap/camel-imap-store.c:2283
+#: ../camel/providers/imap/camel-imap-store.c:2272
+#: ../camel/providers/imapx/camel-imapx-store.c:1330
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Karpetaren guraso ezezaguna: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3107
+#: ../camel/providers/imap/camel-imap-store.c:3137
+#, c-format
 msgid "Server unexpectedly disconnected"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean"
 
-#: ../camel/providers/imap4/camel-imap4-command.c:572
-#: ../camel/providers/imap4/camel-imap4-command.c:579
-#, c-format
-msgid "Failed sending command to IMAP server %s: %s"
-msgstr "Huts egin du %s IMAP zerbitzarira komandoa bidaltzean: %s"
-
-#: ../camel/providers/imap4/camel-imap4-command.c:681
-#, c-format
-msgid "Unexpected response from IMAP4 server %s: %s"
-msgstr "Ustekabeko erantzuna %s IMAP4 zerbitzaritik: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:215
-#, c-format
-msgid "Unexpected greeting from IMAP server %s."
-msgstr "Ustekabeko erantzuna %s IMAP zerbitzaritik."
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:440
-#, c-format
-msgid "Cannot select folder '%s': Invalid mailbox name"
-msgstr "Ezin da '%s' karpeta hautatu: postontzi-izen baliogabea"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:446
-#, c-format
-msgid "Cannot select folder '%s': Bad command"
-msgstr "Ezin da '%s' karpeta hautatu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1414
-#, c-format
-msgid "Failed to send command to IMAP server %s: %s"
-msgstr "Huts egin du %s IMAP zerbitzarira komandoa bidaltzean: %s"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1416
-msgid "service unavailable"
-msgstr "zerbitzua ez dago erabilgarri"
-
-#: ../camel/providers/imap4/camel-imap4-engine.c:1546
-#: ../camel/providers/imap4/camel-imap4-engine.c:1584
-#: ../camel/providers/imap4/camel-imap4-engine.c:1628
-#: ../camel/providers/imap4/camel-imap4-engine.c:1683
-#, c-format
-msgid "IMAP4 server %s unexpectedly disconnected: %s"
-msgstr "%s IMAP4 zerbitzaria deskonektatu egin da ustekabean: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:87
-msgid ""
-"Enable extended Mailing-List detection required for some filter and vFolder "
-"rules"
-msgstr ""
-"Hedatutako posta-zerrendak gaitzeko iragazkien eta KBirtualen arauak behar "
-"dira"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:88
-msgid "Expire cached messages that haven't been read in X seconds"
-msgstr "Iraungitu cacheko mezuak (X segundotan irakurri ez direnak)"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:89
-msgid "Expire cached messages older than X seconds"
-msgstr "Iraungitu cacheko mezuak (X segundo baino zaharragoak)"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:427
-#, c-format
-msgid "Cannot access folder '%s': %s"
-msgstr "Ezin da '%s' karpeta atzitu: %s"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:484
-#, c-format
-msgid "Cannot sync flags to folder '%s': Unknown error"
-msgstr "Ezin da '%s' karpetaren banderak sinkronizatu: errore ezezaguna"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:490
-#, c-format
-msgid "Cannot sync flags to folder '%s': Bad command"
-msgstr "Ezin da '%s' karpetaren banderak sinkronizatu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:630
-#, c-format
-msgid "Cannot expunge folder '%s': Unknown error"
-msgstr "Ezin da %s karpeta betirako ezabatu: errore ezezaguna"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:635
-#, c-format
-msgid "Cannot expunge folder '%s': Bad command"
-msgstr "Ezin da %s karpeta betirako ezabatu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:891
-#, c-format
-msgid "Cannot get message %s from folder '%s': No such message"
-msgstr "Ezin da %s mezua '%s' karpetatik hartu: ez dago halako mezurik"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:896
-#, c-format
-msgid "Cannot get message %s from folder '%s': Bad command"
-msgstr "Ezin da %s mezua '%s' karpetatik hartu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:940
-#, c-format
-msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Ezin zaio mezua '%s' karpetari erantsi: karpeta irakurtzeko soilik da"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1033
-#, c-format
-msgid "Cannot append message to folder '%s': Unknown error"
-msgstr "Ezin zaio mezua erantsi '%s' karpetari: errore ezezaguna"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1063
-#, c-format
-msgid "Cannot append message to folder '%s': Bad command"
-msgstr "Ezin zaio mezua erantsi '%s' karpetari: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1182
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Ezin da '%s' karpetako mezuak '%s' karpetara eraman: errore ezezaguna"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1186
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Unknown error"
-msgstr "Ezin da '%s' karpetako mezuak '%s' karpetan kopiatu: errore ezezaguna"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1194
-#, c-format
-msgid "Cannot move messages from folder '%s' to folder '%s': Bad command"
-msgstr "Ezin da '%s' karpetako mezuak '%s' karpetara eraman: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-folder.c:1198
-#, c-format
-msgid "Cannot copy messages from folder '%s' to folder '%s': Bad command"
-msgstr "Ezin da '%s' karpetako mezuak '%s' karpetan kopiatu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:55
-msgid "Check new messages for _Junk contents"
-msgstr "Begiratu mezu ba_ztergarririk dagoen"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:57
-msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "Begiratu _mezu baztergarriak sarrerako ontzian soilik"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:66
-msgid "IMAP4rev1"
-msgstr "IMAP4rev1"
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:68
-msgid "For reading and storing mail on IMAPv4rev1 servers."
-msgstr "IMAPv4rev1 zerbitzarietan posta irakurri eta gordetzeko."
-
-#: ../camel/providers/imap4/camel-imap4-provider.c:85
-msgid "This option will connect to the IMAPv4rev1 server using a plaintext password."
-msgstr ""
-"Aukera honek IMAPv4rev1 zerbitzariarekin konektatuko zaitu testu arrunteko "
-"pasahitzaren bidez."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/nntp/camel-nntp-store.c:194
-#: ../camel/providers/nntp/camel-nntp-store.c:213
-#: ../camel/providers/pop3/camel-pop3-store.c:203
-#: ../camel/providers/smtp/camel-smtp-transport.c:271
-msgid "Connection canceled"
-msgstr "Konexioa etenda"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:296
-#, c-format
-msgid ""
-"Failed to connect to IMAP server %s in secure mode: Server does not support "
-"STARTTLS"
-msgstr ""
-"Ezin da %s IMAP zerbitzariarekin konektatu modu seguruan: zerbitzariak ez du "
-"STARTTLS onartzen"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:326
-#: ../camel/providers/pop3/camel-pop3-store.c:275
-msgid "TLS negotiations failed"
-msgstr "TSL negoziazioak huts egin du."
-
-#: ../camel/providers/imap4/camel-imap4-store.c:411
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using the %s authentication mechanism"
-msgstr ""
-"Ezin da %s IMAP zerbitzariarekin autentifikatu %s autentifikazio-mekanismoa "
-"erabiliz"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:534
-#, c-format
-msgid "Cannot authenticate to IMAP server %s using %s"
-msgstr "Ezin du %s IMAP zerbitzarian autentifikatu %s erabiliz"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:697
-#: ../camel/providers/imap4/camel-imap4-store.c:964
-msgid "Cannot create IMAP folders in offline mode."
-msgstr "Ezin da IMAP karpetarik sortu lineaz kanpo moduan"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:736
-#, c-format
-msgid "Cannot get folder '%s' on IMAP server %s: Unknown error"
-msgstr "Ezin da '%s' karpeta atzitu %s IMAP zerbitzarian: errore ezezaguna"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:816
-#, c-format
-msgid "Cannot get LIST information for '%s' on IMAP server %s: %s"
-msgstr "Ezin da %2$s IMAP zerbitzariko '%1$s'(r)en LIST informazioa lortu: %3$s"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:818
-#: ../camel/providers/imap4/camel-imap4-store.c:1574
-msgid "Bad command"
-msgstr "Komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:897
-#, c-format
-msgid "Cannot create folder '%s': Invalid mailbox name"
-msgstr "Ezin da '%s' karpeta sortu: postontzi-izen baliogabea"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:902
-#, c-format
-msgid "Cannot create folder '%s': Bad command"
-msgstr "Ezin da '%s' karpeta sortu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1008
-#, c-format
-msgid "Cannot delete folder '%s': Special folder"
-msgstr "Ezin da '%s' karpeta ezabatu: karpeta berezia"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1015
-msgid "Cannot delete IMAP folders in offline mode."
-msgstr "Ezin dira IMAP karpetak ezabatu lineaz kanpo moduan"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1074
-#, c-format
-msgid "Cannot delete folder '%s': Invalid mailbox name"
-msgstr "Ezin da '%s' karpeta ezabatu: postontzi-izen baliogabea"
+#: ../camel/providers/imap/camel-imap-store.c:3140
+msgid "Server unexpectedly disconnected: "
+msgstr "Zerbitzaria ustekabean deskonektatu da: "
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1079
+#: ../camel/providers/imapx/camel-imapx-folder.c:74
 #, c-format
-msgid "Cannot delete folder '%s': Bad command"
-msgstr "Ezin da '%s' karpeta ezabatu: komando okerra"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1099
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Special folder"
-msgstr "Ezin da '%s' karpeta '%s' izenagatik aldatu: karpeta berezia"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1106
-msgid "Cannot rename IMAP folders in offline mode."
-msgstr "Ezin dira IMAP karpetak izenez aldatu lineaz kanpo moduan"
-
-#: ../camel/providers/imap4/camel-imap4-store.c:1137
-#, c-format
-msgid "Cannot rename folder '%s' to '%s': Invalid mailbox name"
-msgstr "Ezin da '%s' karpeta '%s' izenagatik aldatu: postontzi-izen baliogabea"
+msgid "Could not create folder summary for %s"
+msgstr "Ezin izan da %s(r)en laburpenaren karpeta sortu"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1142
+#: ../camel/providers/imapx/camel-imapx-folder.c:82
 #, c-format
-msgid "Cannot rename folder '%s' to '%s': Bad command"
-msgstr "Ezin da '%s' karpeta '%s' izenagatik aldatu: komando okerra"
+msgid "Could not create cache for %s: "
+msgstr "Ezin izan da %s(r)en cache-a sortu: "
 
-#. Translators: the first %s is an IMAP4 command, either LSUB or LIST.
-#. * The fourth one is an error message.
-#: ../camel/providers/imap4/camel-imap4-store.c:1572
-#, c-format
-msgid "Cannot get %s information for pattern '%s' on IMAP server %s: %s"
-msgstr "Ezin da  %3$s IMAP zerbitzariko '%2$s' ereduaren %1$s informazioa lortu: %4$s"
+#: ../camel/providers/imapx/camel-imapx-provider.c:42
+msgid "Use _Quick Resync if the server supports it"
+msgstr "Erabili _birsinkronizatze azkarra zerbitzariak onartzen badu"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1633
-msgid "Cannot subscribe to IMAP folders in offline mode."
-msgstr "Ezin da IMAP karpetetara harpidetu lineaz kanpo moduan."
+#: ../camel/providers/imapx/camel-imapx-provider.c:44
+msgid "Use I_dle if the server supports it"
+msgstr "Erabili _inaktibitatea zerbitzariak onartzen badu"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1678
-#, c-format
-msgid "Cannot subscribe to folder '%s': Invalid mailbox name"
-msgstr "Ezin da '%s' karpetara harpidetu: postontzi-izen baliogabea"
+#: ../camel/providers/imapx/camel-imapx-provider.c:56
+msgid "Command:"
+msgstr "Komandoa:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1683
-#, c-format
-msgid "Cannot subscribe to folder '%s': Bad command"
-msgstr "Ezin da '%s' karpetara harpidetu: komando okerra"
+#: ../camel/providers/imapx/camel-imapx-provider.c:58
+msgid "Numbe_r of cached connections to use"
+msgstr "Cachean gordetako erabiliko diren konexio kopurua"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1705
-msgid "Cannot unsubscribe from IMAP folders in offline mode."
-msgstr "Ezin da IMAP karpetetik harpidetza kendu lineaz kanpo moduan"
+#: ../camel/providers/imapx/camel-imapx-provider.c:69
+msgid "Namespace:"
+msgstr "Izen-lekua:"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1750
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Invalid mailbox name"
-msgstr "Ezin da '%s' karpetatik harpidetza kendu: postontzi-izen baliogabea"
+#: ../camel/providers/imapx/camel-imapx-provider.c:86
+msgid "Defalut IMAP port"
+msgstr "IMAPen ataka lehenetsia"
 
-#: ../camel/providers/imap4/camel-imap4-store.c:1755
-#, c-format
-msgid "Cannot unsubscribe from folder '%s': Bad command"
-msgstr "Ezin da '%s' karpetatik harpidetza kendu: komando okerra"
+#: ../camel/providers/imapx/camel-imapx-provider.c:94
+msgid "IMAP+"
+msgstr "IMAP+"
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1590
-msgid "Scanning for changed messages"
-msgstr "Aldatutako mezuen bila eskaneatzen"
+#: ../camel/providers/imapx/camel-imapx-server.c:1404
+msgid "Error writing to cache stream: "
+msgstr "Errorea cachearen korrontean idaztean: "
 
-#: ../camel/providers/imap4/camel-imap4-summary.c:1611
+#: ../camel/providers/imapx/camel-imapx-server.c:2083
 #, c-format
-msgid "IMAP server %s is in an inconsistent state."
-msgstr "%s IMAP zerbitzaria sendotasunik gabeko egoeran dago."
-
-#: ../camel/providers/imap4/camel-imap4-summary.c:1638
-msgid "Fetching envelopes of new messages"
-msgstr "Mezu berrien gutun-azalak eskuratzen"
+msgid "Not authenticated"
+msgstr "Ez da autentifikatu"
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:429
+#: ../camel/providers/imapx/camel-imapx-server.c:2850
 #, c-format
-msgid "Unexpected token in response from IMAP server %s: "
-msgstr "Ustekabeko token-a %s IMAP zerbitzariko erantzunean:"
+msgid "Could not connect to %s (port %s): "
+msgstr "Ezin da %s(r)ekin konektatu (%s ataka): "
 
-#: ../camel/providers/imap4/camel-imap4-utils.c:452
-msgid "No data"
-msgstr "Daturik ez"
-
-#: ../camel/providers/imap4/camel-imap4-utils.c:613
-#, c-format
-msgid "IMAP server %s unexpectedly disconnected: %s"
-msgstr "%s IMAP zerbitzaria deskonektatu egin da ustekabean: %s"
+#: ../camel/providers/imapx/camel-imapx-server.c:3311
+msgid "Closing tmp stream failed: "
+msgstr "Huts egin du aldi baterako korrontea ixtean: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:84
-#, c-format
-#| msgid "Could not load summary for %s"
-msgid "Could not create folder summary for %s"
-msgstr "Ezin izan da %s(r)en laburpenaren karpeta sortu"
+#: ../camel/providers/imapx/camel-imapx-server.c:5343
+#: ../camel/providers/imapx/camel-imapx-server.c:5358
+msgid "Cannot create spool file: "
+msgstr "Ezin da ilararen fitxategia sortu: "
 
-#: ../camel/providers/imapx/camel-imapx-folder.c:92
+#: ../camel/providers/imapx/camel-imapx-store.c:1135
+#: ../camel/providers/nntp/camel-nntp-store.c:1666
 #, c-format
-#| msgid "Could not create cache file"
-msgid "Could not create cache for %s"
-msgstr "Ezin izan da '%s'(r)en cachea sortu"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:46
-msgid "Use I_dle if the server supports it"
-msgstr "Erabili _inaktibitatea zerbitzariak onartzen badu"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:60
-msgid "Numbe_r of cached connections to use"
-msgstr "Cachean gordetako erabiliko diren konexio kopurua"
-
-#: ../camel/providers/imapx/camel-imapx-provider.c:88
-msgid "IMAP+"
-msgstr "IMAP+"
+msgid "No such folder: %s"
+msgstr "Karpeta ez dago: %s"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2041
+#: ../camel/providers/imapx/camel-imapx-stream.c:70
 #, c-format
-msgid "Could not connect to %s (port %s): %s"
-msgstr "Ezin da %s(r)ekin konektatu (%s ataka): %s"
+msgid "Source stream returned no data"
+msgstr "Iturburuko korronteak ez du daturik itzuli"
 
-#: ../camel/providers/imapx/camel-imapx-server.c:2121
+#: ../camel/providers/imapx/camel-imapx-stream.c:79
 #, c-format
-#| msgid "Please enter the %s password for %s on host %s."
-msgid "%sPlease enter the IMAP password for %s %s"
-msgstr "%1$s Idatzi %2$s %3$s(r)en IMAP pasahitza"
+msgid "Source stream unavailable"
+msgstr "Iturburuaren korrontea ez dago erabilgarri"
 
 #: ../camel/providers/local/camel-local-folder.c:178
-msgid "Index message body data"
-msgstr "Indexatu mezuaren gorputzaren datuak"
-
-#. $HOME relative path + protocol string
-#: ../camel/providers/local/camel-local-folder.c:395
 #, c-format
 msgid "~%s (%s)"
 msgstr "~%s (%s)"
 
-#. /var/spool/mail relative path + protocol
-#: ../camel/providers/local/camel-local-folder.c:399
-#: ../camel/providers/local/camel-local-folder.c:402
+#: ../camel/providers/local/camel-local-folder.c:188
+#: ../camel/providers/local/camel-local-folder.c:197
 #, c-format
 msgid "mailbox: %s (%s)"
 msgstr "postontzia: %s (%s)"
 
-#. a full path + protocol
-#: ../camel/providers/local/camel-local-folder.c:406
+#: ../camel/providers/local/camel-local-folder.c:206
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../camel/providers/local/camel-local-provider.c:48
+#: ../camel/providers/local/camel-local-folder.c:466
+msgid "Index message body data"
+msgstr "Indexatu mezuaren gorputzaren datuak"
+
+#: ../camel/providers/local/camel-local-folder.c:700
+#, c-format
+msgid ""
+"Cannot get message %s from folder %s\n"
+"%s"
+msgstr ""
+"Ezin da '%s' mezua hartu '%s' karpetatik\n"
+"%s"
+
+#: ../camel/providers/local/camel-local-provider.c:44
 msgid "_Use the '.folders' folder summary file (exmh)"
 msgstr "_Erabili '.folders' karpeten laburpen-fitxategia (exmh)"
 
-#: ../camel/providers/local/camel-local-provider.c:55
+#: ../camel/providers/local/camel-local-provider.c:51
 msgid "MH-format mail directories"
 msgstr "MH formatuko posta-direktorioak"
 
-#: ../camel/providers/local/camel-local-provider.c:56
+#: ../camel/providers/local/camel-local-provider.c:52
 msgid "For storing local mail in MH-like mail directories."
 msgstr "Posta lokala MH gisako posta-direktorioetan gordetzeko."
 
-#: ../camel/providers/local/camel-local-provider.c:73
+#: ../camel/providers/local/camel-local-provider.c:70
 msgid "Local delivery"
 msgstr "Banaketa lokala"
 
-#: ../camel/providers/local/camel-local-provider.c:74
+#: ../camel/providers/local/camel-local-provider.c:71
 msgid ""
 "For retrieving (moving) local mail from standard mbox-formatted spools into "
 "folders managed by Evolution."
@@ -3599,28 +3566,28 @@ msgstr ""
 "Posta lokala mbox formatuko ilara estandarretatik Evolutionek kudeatzen "
 "dituen karpetetan berreskuratzeko (lekuz aldatzeko)."
 
-#: ../camel/providers/local/camel-local-provider.c:88
-#: ../camel/providers/local/camel-local-provider.c:107
+#: ../camel/providers/local/camel-local-provider.c:86
+#: ../camel/providers/local/camel-local-provider.c:106
 msgid "_Apply filters to new messages in INBOX"
 msgstr "_Aplikatu iragazkiak sarrerako ontziko mezu berriei"
 
-#: ../camel/providers/local/camel-local-provider.c:95
+#: ../camel/providers/local/camel-local-provider.c:93
 msgid "Maildir-format mail directories"
 msgstr "Maildir formatuko posta-direktorioak"
 
-#: ../camel/providers/local/camel-local-provider.c:96
+#: ../camel/providers/local/camel-local-provider.c:94
 msgid "For storing local mail in maildir directories."
 msgstr "Posta lokala gordetzeko maildir direktorioetan."
 
-#: ../camel/providers/local/camel-local-provider.c:108
+#: ../camel/providers/local/camel-local-provider.c:107
 msgid "_Store status headers in Elm/Pine/Mutt format"
 msgstr "_Biltegiratu egoera-goiburuak Elm/Pine/Mutt formatuan"
 
-#: ../camel/providers/local/camel-local-provider.c:115
+#: ../camel/providers/local/camel-local-provider.c:114
 msgid "Standard Unix mbox spool file"
 msgstr "Unix-eko mbox ilara-fitxategi estandarra"
 
-#: ../camel/providers/local/camel-local-provider.c:116
+#: ../camel/providers/local/camel-local-provider.c:115
 #: ../camel/providers/local/camel-local-provider.c:127
 msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
@@ -3635,209 +3602,216 @@ msgstr ""
 msgid "Standard Unix mbox spool directory"
 msgstr "Unix-eko mbox ilara-direktorio estandarra"
 
-#: ../camel/providers/local/camel-local-store.c:163
-#: ../camel/providers/local/camel-local-store.c:274
-#: ../camel/providers/local/camel-mbox-store.c:357
-#: ../camel/providers/local/camel-spool-store.c:126
+#: ../camel/providers/local/camel-local-store.c:174
+#: ../camel/providers/local/camel-local-store.c:319
+#: ../camel/providers/local/camel-maildir-store.c:92
+#: ../camel/providers/local/camel-mbox-store.c:526
+#: ../camel/providers/local/camel-spool-store.c:318
 #, 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:170
+#: ../camel/providers/local/camel-local-store.c:183
 #, 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:179
-#: ../camel/providers/local/camel-local-store.c:187
-#: ../camel/providers/local/camel-local-store.c:285
+#: ../camel/providers/local/camel-local-store.c:194
+#: ../camel/providers/local/camel-local-store.c:204
+#: ../camel/providers/local/camel-local-store.c:332
+#: ../camel/providers/local/camel-maildir-store.c:124
 #, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Ezin da karpeta hartu: %s: %s"
 
-#: ../camel/providers/local/camel-local-store.c:199
+#: ../camel/providers/local/camel-local-store.c:220
+#, c-format
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: ../camel/providers/local/camel-local-store.c:245
+#: ../camel/providers/local/camel-local-store.c:281
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: ../camel/providers/local/camel-local-store.c:340
+#: ../camel/providers/local/camel-local-store.c:393
 #, 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:408
+#: ../camel/providers/local/camel-local-store.c:467
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan da '%s' karpeta izenez aldatu: %s"
 
-#: ../camel/providers/local/camel-local-store.c:433
-#: ../camel/providers/local/camel-mbox-store.c:298
+#: ../camel/providers/local/camel-local-store.c:498
+#: ../camel/providers/local/camel-mbox-store.c:695
 #, c-format
 msgid "Could not delete folder index file '%s': %s"
 msgstr "Ezin izan da karpetaren '%s'indize-fitxategia ezabatu: %s"
 
-#: ../camel/providers/local/camel-local-store.c:456
-#: ../camel/providers/local/camel-mbox-store.c:322
+#: ../camel/providers/local/camel-local-store.c:526
+#: ../camel/providers/local/camel-mbox-store.c:724
 #, c-format
 msgid "Could not delete folder meta file '%s': %s"
 msgstr "Ezin izan da karpetaren '%s' meta-fitxategia ezabatu: %s"
 
-#: ../camel/providers/local/camel-local-summary.c:515
+#: ../camel/providers/local/camel-local-summary.c:548
+#, c-format
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ezin zaio mezua gehitu laburpenari: arrazoi ezezaguna"
 
-#: ../camel/providers/local/camel-maildir-folder.c:230
-msgid "Maildir append message canceled"
-msgstr "Maildir mezua eranstea bertan behera utzi da"
-
-#: ../camel/providers/local/camel-maildir-folder.c:233
-#, 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:263
-#: ../camel/providers/local/camel-maildir-folder.c:292
-#: ../camel/providers/local/camel-maildir-folder.c:306
-#: ../camel/providers/local/camel-maildir-folder.c:314
-#: ../camel/providers/local/camel-maildir-folder.c:400
-#: ../camel/providers/local/camel-mbox-folder.c:362
-#: ../camel/providers/local/camel-mbox-folder.c:413
-#: ../camel/providers/local/camel-mbox-folder.c:434
-#: ../camel/providers/local/camel-mbox-folder.c:465
-#: ../camel/providers/local/camel-mbox-folder.c:473
-#: ../camel/providers/local/camel-mh-folder.c:225
-#: ../camel/providers/local/camel-mh-folder.c:236
-#: ../camel/providers/local/camel-mh-folder.c:244
+#: ../camel/providers/local/camel-maildir-folder.c:198
 #, c-format
-msgid ""
-"Cannot get message: %s from folder %s\n"
-"  %s"
-msgstr ""
-"Ezin da mezua hartu: %s %s karpetatik\n"
-"  %s"
+msgid "Cannot append message to maildir folder: %s: "
+msgstr "Ezin zaio mezua erantsi maildir karpetari: %s: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:246
+#: ../camel/providers/local/camel-maildir-folder.c:256
+#: ../camel/providers/local/camel-mbox-folder.c:386
+#: ../camel/providers/local/camel-mh-folder.c:168
+#: ../camel/providers/local/camel-mh-folder.c:178
+#, c-format
+msgid "Cannot get message %s from folder %s: "
+msgstr "Ezin da '%s' mezua %s karpetatik hartu: "
+
+#: ../camel/providers/local/camel-maildir-folder.c:326
+#, c-format
+msgid "Cannot transfer message to destination folder: %s"
+msgstr "Ezin da mezua helburuko karpetara transferitu: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:315
-msgid "Invalid message contents"
-msgstr "Mezu-eduki baliogabea"
+#: ../camel/providers/local/camel-maildir-store.c:100
+#, c-format
+msgid "Cannot create folder: %s : Folder name cannot contain a dot"
+msgstr "Ezin da karpeta sortu: %s. Karpetaren izenak ezin du puntua karakterea eduki"
 
-#: ../camel/providers/local/camel-maildir-folder.c:418
-#| msgid "Cannot copy messages to the Junk folder"
-msgid "Cannot transfer message to destination folder"
-msgstr "Ezin da mezua helburuko karpetara transferitu"
+#: ../camel/providers/local/camel-maildir-store.c:109
+#: ../camel/providers/local/camel-maildir-store.c:686
+#, c-format
+msgid "Folder %s already exists"
+msgstr "%s karpeta badago lehendik ere"
 
-#: ../camel/providers/local/camel-maildir-store.c:148
-#: ../camel/providers/local/camel-maildir-store.c:173
-#: ../camel/providers/local/camel-mbox-store.c:174
-#: ../camel/providers/local/camel-mbox-store.c:186
+#: ../camel/providers/local/camel-maildir-store.c:191
+#: ../camel/providers/local/camel-maildir-store.c:222
+#: ../camel/providers/local/camel-mbox-store.c:375
+#: ../camel/providers/local/camel-mbox-store.c:389
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Ezin izan da '%s' karpeta sortu: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:161
-#: ../camel/providers/local/camel-mbox-store.c:145
-#: ../camel/providers/local/camel-mh-store.c:217
+#: ../camel/providers/local/camel-maildir-store.c:206
+#: ../camel/providers/local/camel-mbox-store.c:341
+#: ../camel/providers/local/camel-mh-store.c:464
 #, c-format
 msgid "Cannot get folder '%s': %s"
 msgstr "Ezin da '%s' karpeta atzitu: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:165
-#: ../camel/providers/local/camel-mbox-store.c:153
-#: ../camel/providers/local/camel-mh-store.c:224
+#: ../camel/providers/local/camel-maildir-store.c:212
+#: ../camel/providers/local/camel-mbox-store.c:351
+#: ../camel/providers/local/camel-mh-store.c:473
 #, c-format
 msgid "Cannot get folder '%s': folder does not exist."
 msgstr "Ezin da '%s' karpeta atzitu: karpeta ez dago."
 
-#: ../camel/providers/local/camel-maildir-store.c:189
+#: ../camel/providers/local/camel-maildir-store.c:239
 #, c-format
 msgid "Cannot get folder '%s': not a maildir directory."
 msgstr "Ezin da '%s' karpeta atzitu: ez da maildir direktorioa."
 
-#: ../camel/providers/local/camel-maildir-store.c:234
-#: ../camel/providers/local/camel-maildir-store.c:272
-#: ../camel/providers/local/camel-mh-store.c:273
+#: ../camel/providers/local/camel-maildir-store.c:293
+#: ../camel/providers/local/camel-maildir-store.c:333
+#: ../camel/providers/local/camel-mh-store.c:584
 #, c-format
 msgid "Could not delete folder '%s': %s"
 msgstr "Ezin izan da '%s' karpeta ezabatu: %s"
 
-#: ../camel/providers/local/camel-maildir-store.c:236
+#: ../camel/providers/local/camel-maildir-store.c:295
 msgid "not a maildir directory"
 msgstr "ez da maildir direktorioa"
 
-#: ../camel/providers/local/camel-maildir-store.c:440
-#: ../camel/providers/local/camel-spool-store.c:328
-#: ../camel/providers/local/camel-spool-store.c:342
+#: ../camel/providers/local/camel-maildir-store.c:508
+#: ../camel/providers/local/camel-maildir-store.c:825
+#: ../camel/providers/local/camel-spool-store.c:143
+#: ../camel/providers/local/camel-spool-store.c:159
 #, c-format
 msgid "Could not scan folder '%s': %s"
 msgstr "Ezin izan da '%s' karpeta eskaneatu: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:432
-#: ../camel/providers/local/camel-maildir-summary.c:551
+#: ../camel/providers/local/camel-maildir-store.c:677
+#, c-format
+msgid "Cannot rename the folder: %s: Folder name cannot contain a dot"
+msgstr "Ezin da karpeta izenez aldatu:%s. Karpetaren izenak ezin du puntua karakterea eduki"
+
+#: ../camel/providers/local/camel-maildir-summary.c:436
+#: ../camel/providers/local/camel-maildir-summary.c:566
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ezin da maildir direktorioaren bide-izena ireki: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:544
+#: ../camel/providers/local/camel-maildir-summary.c:557
 msgid "Checking folder consistency"
 msgstr "Karpeta egiaztatzen"
 
-#: ../camel/providers/local/camel-maildir-summary.c:637
+#: ../camel/providers/local/camel-maildir-summary.c:650
 msgid "Checking for new messages"
 msgstr "Mezu berrien bila eskaneatzen"
 
-#: ../camel/providers/local/camel-maildir-summary.c:724
-#: ../camel/providers/local/camel-mbox-summary.c:526
-#: ../camel/providers/local/camel-mbox-summary.c:722
-#: ../camel/providers/local/camel-mbox-summary.c:842
-#: ../camel/providers/local/camel-spool-summary.c:150
+#: ../camel/providers/local/camel-maildir-summary.c:743
+#: ../camel/providers/local/camel-mbox-summary.c:468
+#: ../camel/providers/local/camel-mbox-summary.c:690
+#: ../camel/providers/local/camel-mbox-summary.c:826
+#: ../camel/providers/local/camel-spool-summary.c:131
 msgid "Storing folder"
 msgstr "Karpeta biltegiratzen"
 
-#: ../camel/providers/local/camel-mbox-folder.c:167
-#: ../camel/providers/local/camel-spool-folder.c:150
-#, 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:231
+#: ../camel/providers/local/camel-mbox-folder.c:183
 #, c-format
-msgid "Cannot open mailbox: %s: %s\n"
-msgstr "Ezin da postontzia ireki: %s: %s\n"
+msgid "Cannot open mailbox: %s: "
+msgstr "Ezin da postontzia ireki: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:297
-msgid "Mail append canceled"
-msgstr "Posta eranstea bertan behera utzi da"
-
-#: ../camel/providers/local/camel-mbox-folder.c:300
+#: ../camel/providers/local/camel-mbox-folder.c:249
 #, c-format
-msgid "Cannot append message to mbox file: %s: %s"
-msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: %s"
+msgid "Cannot append message to mbox file: %s: "
+msgstr "Ezin zaio mezua erantsi mbox fitxategiari: %s: "
 
-#: ../camel/providers/local/camel-mbox-folder.c:466
+#: ../camel/providers/local/camel-mbox-folder.c:378
 msgid "The folder appears to be irrecoverably corrupted."
 msgstr "Badirudi fitxategia hondatuta dagoela eta ezin dela berreskuratu."
 
-#: ../camel/providers/local/camel-mbox-folder.c:474
-#: ../camel/providers/local/camel-mh-folder.c:245
-msgid "Message construction failed."
-msgstr "Mezu-eraikuntzak huts egin du."
+#: ../camel/providers/local/camel-mbox-folder.c:436
+#: ../camel/providers/local/camel-spool-folder.c:70
+#, 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-store.c:164
 #: ../camel/providers/local/camel-mbox-store.c:363
+#: ../camel/providers/local/camel-mbox-store.c:534
+#, c-format
 msgid "Cannot create a folder by this name."
 msgstr "Ezin da izen horretako karpetarik sortu."
 
-#: ../camel/providers/local/camel-mbox-store.c:196
+#: ../camel/providers/local/camel-mbox-store.c:400
 #, c-format
 msgid "Cannot get folder '%s': not a regular file."
 msgstr "Ezin da %s karpeta atzitu: ez da fitxategi erregularra"
 
-#: ../camel/providers/local/camel-mbox-store.c:226
-#: ../camel/providers/local/camel-mbox-store.c:237
-#: ../camel/providers/local/camel-mbox-store.c:260
+#: ../camel/providers/local/camel-mbox-store.c:550
+#, c-format
+msgid "Cannot create directory '%s': %s."
+msgstr "Ezin izan da '%s' direktorioa sortu: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:566
+#, c-format
+msgid "Cannot create folder: %s: %s"
+msgstr "Ezin da karpeta sortu: %s: %s"
+
+#: ../camel/providers/local/camel-mbox-store.c:568
+msgid "Folder already exists"
+msgstr "Karpeta badago lehendik"
+
+#: ../camel/providers/local/camel-mbox-store.c:609
+#: ../camel/providers/local/camel-mbox-store.c:622
+#: ../camel/providers/local/camel-mbox-store.c:651
 #, c-format
 msgid ""
 "Could not delete folder '%s':\n"
@@ -3846,166 +3820,166 @@ msgstr ""
 "Ezin izan da '%s' karpeta ezabatu:\n"
 "%s"
 
-#: ../camel/providers/local/camel-mbox-store.c:245
+#: ../camel/providers/local/camel-mbox-store.c:632
 #, c-format
 msgid "'%s' is not a regular file."
 msgstr "'%s' ez da fitxategi erregularra."
 
-#: ../camel/providers/local/camel-mbox-store.c:252
+#: ../camel/providers/local/camel-mbox-store.c:641
 #, 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:274
-#: ../camel/providers/local/camel-mbox-store.c:286
+#: ../camel/providers/local/camel-mbox-store.c:667
+#: ../camel/providers/local/camel-mbox-store.c:681
 #, 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-mbox-store.c:376
+#: ../camel/providers/local/camel-mbox-store.c:761
 #, c-format
-msgid "Cannot create directory '%s': %s."
-msgstr "Ezin izan da '%s' direktorioa sortu: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:390
-#, c-format
-msgid "Cannot create folder: %s: %s"
-msgstr "Ezin da karpeta sortu: %s: %s"
-
-#: ../camel/providers/local/camel-mbox-store.c:392
-msgid "Folder already exists"
-msgstr "Karpeta badago lehendik"
-
-#: ../camel/providers/local/camel-mbox-store.c:483
 msgid "The new folder name is illegal."
 msgstr "Karpeta-izen berria ez da baliozkoa."
 
-#: ../camel/providers/local/camel-mbox-store.c:496
+#: ../camel/providers/local/camel-mbox-store.c:776
 #, c-format
 msgid "Could not rename '%s': '%s': %s"
 msgstr "Ezin izan zaio izena aldatu '%s'(r)i: '%s': %s"
 
-#: ../camel/providers/local/camel-mbox-store.c:577
+#: ../camel/providers/local/camel-mbox-store.c:859
 #, c-format
 msgid "Could not rename '%s' to %s: %s"
 msgstr "Ezin izan da '%s'(r)en izena %s(e)ra aldatu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:532
+#: ../camel/providers/local/camel-mbox-summary.c:476
 #, c-format
 msgid "Could not open folder: %s: %s"
 msgstr "Ezin izan da karpeta ireki: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:582
+#: ../camel/providers/local/camel-mbox-summary.c:537
 #, c-format
-msgid "Fatal mail parser error near position %ld in folder %s"
-msgstr ""
-"Posta-analizatzailearen ezinbesteko errorea %2$s karpetako %1$ld posiziotik "
-"gertu"
+msgid "Fatal mail parser error near position %s in folder %s"
+msgstr "Posta-analizatzailearen errore larria %2$s karpetako %1$s posiziotik gertu"
 
-#: ../camel/providers/local/camel-mbox-summary.c:659
+#: ../camel/providers/local/camel-mbox-summary.c:622
 #, c-format
 msgid "Cannot check folder: %s: %s"
 msgstr "Ezin da karpeta egiaztatu: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:727
-#: ../camel/providers/local/camel-mbox-summary.c:847
-#: ../camel/providers/local/camel-spool-summary.c:155
+#: ../camel/providers/local/camel-mbox-summary.c:697
+#: ../camel/providers/local/camel-mbox-summary.c:833
+#: ../camel/providers/local/camel-spool-summary.c:138
 #, c-format
 msgid "Could not open file: %s: %s"
 msgstr "Ezin izan da fitxategia ireki: %s: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:739
-#: ../camel/providers/local/camel-spool-summary.c:168
+#: ../camel/providers/local/camel-mbox-summary.c:711
+#: ../camel/providers/local/camel-spool-summary.c:153
 #, c-format
 msgid "Cannot open temporary mailbox: %s"
 msgstr "Ezin da aldi baterako postontzia ireki: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:752
-#: ../camel/providers/local/camel-mbox-summary.c:957
+#: ../camel/providers/local/camel-mbox-summary.c:728
+#: ../camel/providers/local/camel-mbox-summary.c:949
 #, c-format
 msgid "Could not close source folder %s: %s"
 msgstr "Ezin izan da itxi %s iturburu-karpeta: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:761
+#: ../camel/providers/local/camel-mbox-summary.c:739
 #, c-format
 msgid "Could not close temporary folder: %s"
 msgstr "Ezin izan da aldi baterako karpeta itxi: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:776
+#: ../camel/providers/local/camel-mbox-summary.c:756
 #, c-format
 msgid "Could not rename folder: %s"
 msgstr "Ezin izan da karpetaren izena aldatu: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:858
-#: ../camel/providers/local/camel-mbox-summary.c:1084
+#: ../camel/providers/local/camel-mbox-summary.c:846
+#: ../camel/providers/local/camel-mbox-summary.c:1099
 #, c-format
 msgid "Could not store folder: %s"
 msgstr "Ezin izan da karpeta gorde: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:897
-#: ../camel/providers/local/camel-mbox-summary.c:905
-#: ../camel/providers/local/camel-mbox-summary.c:1114
-#: ../camel/providers/local/camel-mbox-summary.c:1122
+#: ../camel/providers/local/camel-mbox-summary.c:886
+#: ../camel/providers/local/camel-mbox-summary.c:1131
+#, c-format
+msgid ""
+"MBOX file is corrupted, please fix it. (Expected a From line, but didn't get "
+"it.)"
+msgstr ""
+"MBOX fitxategia hondatuta dago, konpondu ezazu. 'From' lerroa espero zen, "
+"baina ez da hori lortu."
+
+#: ../camel/providers/local/camel-mbox-summary.c:895
+#: ../camel/providers/local/camel-mbox-summary.c:1140
+#, c-format
 msgid "Summary and folder mismatch, even after a sync"
 msgstr "Laburpena eta karpeta falta dira, sinkronizatu ostean ere"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1047
-#: ../camel/providers/local/camel-spool-summary.c:334
+#: ../camel/providers/local/camel-mbox-summary.c:1052
+#: ../camel/providers/local/camel-spool-summary.c:343
 #, c-format
 msgid "Unknown error: %s"
 msgstr "Errore ezezaguna: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1190
-#: ../camel/providers/local/camel-mbox-summary.c:1216
+#: ../camel/providers/local/camel-mbox-summary.c:1210
+#: ../camel/providers/local/camel-mbox-summary.c:1240
 #, c-format
 msgid "Writing to temporary mailbox failed: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s"
 
-#: ../camel/providers/local/camel-mbox-summary.c:1207
+#: ../camel/providers/local/camel-mbox-summary.c:1229
 #, c-format
 msgid "Writing to temporary mailbox failed: %s: %s"
 msgstr "Huts egin du aldi baterako postontzian idaztean: %s: %s"
 
-#: ../camel/providers/local/camel-mh-folder.c:180
-msgid "MH append message canceled"
-msgstr "MH mezua eranstea bertan behera utzi da"
-
-#: ../camel/providers/local/camel-mh-folder.c:183
+#: ../camel/providers/local/camel-mh-folder.c:115
 #, c-format
-msgid "Cannot append message to mh folder: %s: %s"
-msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
+msgid "Cannot append message to mh folder: %s: "
+msgstr "Ezin zaio mezua erantsi mh karpetari: %s: "
 
-#: ../camel/providers/local/camel-mh-store.c:232
+#: ../camel/providers/local/camel-mh-store.c:483
 #, c-format
 msgid "Could not create folder '%s': %s"
 msgstr "Ezin izan da '%s' karpeta sortu: %s"
 
-#: ../camel/providers/local/camel-mh-store.c:244
+#: ../camel/providers/local/camel-mh-store.c:497
 #, c-format
 msgid "Cannot get folder '%s': not a directory."
 msgstr "Ezin da '%s' karpeta atzitu: ez da direktorioa"
 
-#: ../camel/providers/local/camel-mh-summary.c:240
+#: ../camel/providers/local/camel-mh-summary.c:227
 #, c-format
 msgid "Cannot open MH directory path: %s: %s"
 msgstr "Ezin da MH direktorioaren bide-izena ireki: %s: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:132
+#: ../camel/providers/local/camel-spool-store.c:327
 #, c-format
 msgid "Spool '%s' cannot be opened: %s"
 msgstr "'%s' ilara ezin izan da ireki: %s"
 
-#: ../camel/providers/local/camel-spool-store.c:144
+#: ../camel/providers/local/camel-spool-store.c:341
 #, c-format
 msgid "Spool '%s' is not a regular file or directory"
 msgstr "'%s' ilara ez da fitxategi edo direktorio erregularra"
 
-#: ../camel/providers/local/camel-spool-store.c:163
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool mail file %s"
+msgstr "%s ilarako posta fitxategia"
+
+#: ../camel/providers/local/camel-spool-store.c:357
+#, c-format
+msgid "Spool folder tree %s"
+msgstr "%s ilara-karpetaren zuhaitza"
+
+#: ../camel/providers/local/camel-spool-store.c:391
 #, c-format
 msgid "Folder '%s/%s' does not exist."
 msgstr "'%s/%s' karpetarik ez dago."
 
-#: ../camel/providers/local/camel-spool-store.c:173
+#: ../camel/providers/local/camel-spool-store.c:403
 #, c-format
 msgid ""
 "Could not open folder '%s':\n"
@@ -4014,12 +3988,12 @@ msgstr ""
 "Ezin izan da '%s' karpeta ireki:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:177
+#: ../camel/providers/local/camel-spool-store.c:409
 #, c-format
 msgid "Folder '%s' does not exist."
 msgstr "'%s' karpeta ez dago."
 
-#: ../camel/providers/local/camel-spool-store.c:182
+#: ../camel/providers/local/camel-spool-store.c:416
 #, c-format
 msgid ""
 "Could not create folder '%s':\n"
@@ -4028,96 +4002,112 @@ msgstr ""
 "Ezin izan da '%s' karpeta sortu:\n"
 "%s"
 
-#: ../camel/providers/local/camel-spool-store.c:190
+#: ../camel/providers/local/camel-spool-store.c:426
 #, c-format
 msgid "'%s' is not a mailbox file."
 msgstr "'%s' ez da mailbox fitxategia."
 
-#: ../camel/providers/local/camel-spool-store.c:207
+#: ../camel/providers/local/camel-spool-store.c:462
+#, c-format
 msgid "Store does not support an INBOX"
 msgstr "Biltegiak ez du onartzen sarrera-ontzirik"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:476
 #, c-format
-msgid "Spool mail file %s"
-msgstr "%s ilarako posta fitxategia"
+msgid "Spool folders cannot be deleted"
+msgstr "Ilara-karpetak ezin dira ezabatu"
 
-#: ../camel/providers/local/camel-spool-store.c:219
+#: ../camel/providers/local/camel-spool-store.c:491
 #, c-format
-msgid "Spool folder tree %s"
-msgstr "%s ilara-karpetaren zuhaitza"
-
-#: ../camel/providers/local/camel-spool-store.c:227
 msgid "Spool folders cannot be renamed"
 msgstr "Ilara-karpetei ezin zaie izena aldatu"
 
-#: ../camel/providers/local/camel-spool-store.c:235
-msgid "Spool folders cannot be deleted"
-msgstr "Ilara-karpetak ezin dira ezabatu"
-
-#: ../camel/providers/local/camel-spool-summary.c:180
-#: ../camel/providers/local/camel-spool-summary.c:190
-#: ../camel/providers/local/camel-spool-summary.c:200
+#: ../camel/providers/local/camel-spool-summary.c:169
+#: ../camel/providers/local/camel-spool-summary.c:181
+#: ../camel/providers/local/camel-spool-summary.c:193
 #, c-format
-msgid "Could not sync temporary folder %s: %s"
+msgid "Could not synchronize temporary folder %s: %s"
 msgstr "Ezin izan da %s aldi baterako karpeta sinkronizatu: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:216
+#: ../camel/providers/local/camel-spool-summary.c:211
 #, c-format
-msgid "Could not sync spool folder %s: %s"
+msgid "Could not synchronize spool folder %s: %s"
 msgstr "Ezin izan da %s ilara-karpeta sinkronizatu: %s"
 
-#: ../camel/providers/local/camel-spool-summary.c:246
-#: ../camel/providers/local/camel-spool-summary.c:263
-#: ../camel/providers/local/camel-spool-summary.c:274
+#: ../camel/providers/local/camel-spool-summary.c:243
+#: ../camel/providers/local/camel-spool-summary.c:262
+#: ../camel/providers/local/camel-spool-summary.c:275
 #, c-format
 msgid ""
-"Could not sync spool folder %s: %s\n"
+"Could not synchronize spool folder %s: %s\n"
 "Folder may be corrupt, copy saved in '%s'"
 msgstr ""
 "Ezin izan da %s ilara-karpeta sinkronizatu: %s\n"
 "Karpeta hondatuta egon liteke, kopia '%s'(e)n gorde da"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:135
-#: ../camel/providers/nntp/camel-nntp-folder.c:192
-#: ../camel/providers/nntp/camel-nntp-folder.c:224
+#: ../camel/providers/nntp/camel-nntp-folder.c:195
+#: ../camel/providers/nntp/camel-nntp-folder.c:274
+#: ../camel/providers/nntp/camel-nntp-folder.c:388
 #, c-format
 msgid "Internal error: UID in invalid format: %s"
 msgstr "Barneko errorea: UID formatu baliogabean: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:365
-#: ../camel/providers/nntp/camel-nntp-folder.c:368
-#: ../camel/providers/nntp/camel-nntp-folder.c:410
-#: ../camel/providers/nntp/camel-nntp-folder.c:412
+#: ../camel/providers/nntp/camel-nntp-folder.c:236
+#: ../camel/providers/nntp/camel-nntp-folder.c:240
+#: ../camel/providers/pop3/camel-pop3-folder.c:371
+#: ../camel/providers/pop3/camel-pop3-folder.c:436
+#: ../camel/providers/pop3/camel-pop3-folder.c:448
+#: ../camel/providers/pop3/camel-pop3-folder.c:697
+#, c-format
+msgid "Cannot get message %s: %s"
+msgstr "Ezin da %s mezua hartu: %s"
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:472
+#: ../camel/providers/nntp/camel-nntp-folder.c:478
+#: ../camel/providers/nntp/camel-nntp-folder.c:525
 #, c-format
 msgid "Posting failed: %s"
 msgstr "Bidalketak huts egin du: %s"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:430
+#: ../camel/providers/nntp/camel-nntp-folder.c:520
+msgid "Posting failed: "
+msgstr "Bidalketak huts egin du: "
+
+#: ../camel/providers/nntp/camel-nntp-folder.c:549
+#, c-format
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Ezin duzu NNTP mezuak bidali lineaz kanpo lan egitean"
 
-#: ../camel/providers/nntp/camel-nntp-folder.c:441
+#: ../camel/providers/nntp/camel-nntp-folder.c:569
+#, c-format
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ezin duzu mezuak NNTP karpeta batean kopiatu"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:46
+#: ../camel/providers/nntp/camel-nntp-provider.c:44
 msgid "_Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"
 msgstr "_Erakutsi karpetak idazkera laburrean (adib. c.o.linux comp.os.linux ordez)"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:48
+#: ../camel/providers/nntp/camel-nntp-provider.c:46
 msgid "In the subscription _dialog, show relative folder names"
 msgstr "Harpidetzaren _elkarrizketa-koadroan erakutsi karpeta erlatiboen izenak"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:55
+#: ../camel/providers/nntp/camel-nntp-provider.c:52
+msgid "Default NNTP port"
+msgstr "NNTP-ren ataka lehenetsia"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:53
+msgid "NNTP over SSL"
+msgstr "NNTP SSLren gainean"
+
+#: ../camel/providers/nntp/camel-nntp-provider.c:59
 msgid "USENET news"
 msgstr "USENET berriak"
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:57
+#: ../camel/providers/nntp/camel-nntp-provider.c:61
 msgid "This is a provider for reading from and posting to USENET newsgroups."
 msgstr "Hau USENET berri-taldeetako mezuak irakurri eta bidaltzeko hornitzailea da."
 
-#: ../camel/providers/nntp/camel-nntp-provider.c:76
+#: ../camel/providers/nntp/camel-nntp-provider.c:82
 msgid ""
 "This option will authenticate with the NNTP server using a plaintext "
 "password."
@@ -4125,22 +4115,32 @@ msgstr ""
 "Aukera honek NNTP zerbitzariarekin autentifikatuko du testu arrunteko "
 "pasahitzaren bidez."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:216
+#: ../camel/providers/nntp/camel-nntp-store.c:73
 #, c-format
-msgid "Could not read greeting from %s: %s"
-msgstr "Ezin izan da %s(e)tik agurra irakurri: %s"
+msgid "Authentication requested but no username provided"
+msgstr "Autentifikazioa behar da baina ez da erabiltzaile-izenik eman"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:228
+#: ../camel/providers/nntp/camel-nntp-store.c:85
 #, c-format
-msgid "NNTP server %s returned error code %d: %s"
-msgstr "%s NNTP zerbitzariak %d errore-kodea bidali du: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:410
+msgid "Cannot authenticate to server: %s"
+msgstr "Ezin da zerbitzarian autentifikatu: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:375
+#, c-format
+msgid "Could not read greeting from %s: "
+msgstr "Ezin izan da %s(e)tik agurra irakurri: "
+
+#: ../camel/providers/nntp/camel-nntp-store.c:388
+#, c-format
+msgid "NNTP server %s returned error code %d: %s"
+msgstr "%s NNTP zerbitzariak %d errore-kodea bidali du: %s"
+
+#: ../camel/providers/nntp/camel-nntp-store.c:582
 #, c-format
 msgid "USENET News via %s"
 msgstr "USENET berriak %s bidez"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:819
+#: ../camel/providers/nntp/camel-nntp-store.c:1100
 #, c-format
 msgid ""
 "Error retrieving newsgroups:\n"
@@ -4151,7 +4151,8 @@ msgstr ""
 "\n"
 " %s"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:913
+#: ../camel/providers/nntp/camel-nntp-store.c:1215
+#, c-format
 msgid ""
 "You cannot subscribe to this newsgroup:\n"
 "\n"
@@ -4162,7 +4163,8 @@ msgstr ""
 "Ez dago halako berri-talderik. Hautatutako elementua karpeta gurasoa izan "
 "daiteke."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:945
+#: ../camel/providers/nntp/camel-nntp-store.c:1257
+#, c-format
 msgid ""
 "You cannot unsubscribe to this newsgroup:\n"
 "\n"
@@ -4172,126 +4174,122 @@ msgstr ""
 "\n"
 "Berri-taldea ez dago"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:970
+#: ../camel/providers/nntp/camel-nntp-store.c:1290
+#, c-format
 msgid "You cannot create a folder in a News store: subscribe instead."
 msgstr "Ezin duzu Berria biltegian karpeta sortu: harpidetu zaitez."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:978
+#: ../camel/providers/nntp/camel-nntp-store.c:1306
+#, c-format
 msgid "You cannot rename a folder in a News store."
 msgstr "Ezin duzu Berria biltegiko karpeta baten izena aldatu."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:986
+#: ../camel/providers/nntp/camel-nntp-store.c:1323
+#, c-format
 msgid "You cannot remove a folder in a News store: unsubscribe instead."
 msgstr "Ezin duzu Berria biltegiko karpeta bat lekuz aldatu: kendu harpidetza."
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1180
-msgid "Authentication requested but no username provided"
-msgstr "Autentifikazioa behar da baina ez da erabiltzaile-izenik eman"
+#: ../camel/providers/nntp/camel-nntp-store.c:1535
+msgid "NNTP Command failed: "
+msgstr "NNTP komandoak huts egin du: "
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1192
+#: ../camel/providers/nntp/camel-nntp-store.c:1609
 #, c-format
-msgid "Cannot authenticate to server: %s"
-msgstr "Ezin da zerbitzarian autentifikatu: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1315
-#, c-format
-msgid "NNTP Command failed: %s"
-msgstr "NNTP komandoak huts egin du: %s"
-
-#: ../camel/providers/nntp/camel-nntp-store.c:1369
 msgid "Not connected."
 msgstr "Ez dago konektatuta"
 
-#: ../camel/providers/nntp/camel-nntp-store.c:1422
-#, c-format
-msgid "No such folder: %s"
-msgstr "Karpeta ez dago: %s"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:272
-#: ../camel/providers/nntp/camel-nntp-summary.c:370
+#: ../camel/providers/nntp/camel-nntp-summary.c:232
+#: ../camel/providers/nntp/camel-nntp-summary.c:348
 #, c-format
 msgid "%s: Scanning new messages"
 msgstr "%s: Mezu berrien bila eskaneatzen"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:279
+#: ../camel/providers/nntp/camel-nntp-summary.c:249
 #, c-format
 msgid "Unexpected server response from xover: %s"
 msgstr "Ustekabeko zerbitzari-erantzuna xover-etik: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:384
+#: ../camel/providers/nntp/camel-nntp-summary.c:365
 #, c-format
 msgid "Unexpected server response from head: %s"
 msgstr "Ustekabeko zerbitzari-erantzuna goiburutik: %s"
 
-#: ../camel/providers/nntp/camel-nntp-summary.c:420
-msgid "Use cancel"
-msgstr "Utzi bertan behera"
-
-#: ../camel/providers/nntp/camel-nntp-summary.c:422
+#: ../camel/providers/nntp/camel-nntp-summary.c:410
 #, c-format
 msgid "Operation failed: %s"
 msgstr "Eragiketak huts egin du: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:253
+#: ../camel/providers/pop3/camel-pop3-folder.c:277
+#: ../camel/providers/pop3/camel-pop3-folder.c:336
+#, c-format
+msgid "No message with UID %s"
+msgstr "Ez dago %s UIDa duen mezurik"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:344
+#, c-format
+msgid "Retrieving POP message %d"
+msgstr "%d POP mezua berreskuratzen"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:449
+msgid "Unknown reason"
+msgstr "Arrazoi ezezaguna"
+
+#: ../camel/providers/pop3/camel-pop3-folder.c:488
 msgid "Retrieving POP summary"
 msgstr "POP laburpena berreskuratzen"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:271
+#: ../camel/providers/pop3/camel-pop3-folder.c:511
 #, c-format
 msgid "Cannot get POP summary: %s"
 msgstr "Ezin da POP laburpena hartu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:314
+#: ../camel/providers/pop3/camel-pop3-folder.c:563
 msgid "Expunging old messages"
 msgstr "Mezu zaharrak betiko borratzen"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:322
+#: ../camel/providers/pop3/camel-pop3-folder.c:577
 msgid "Expunging deleted messages"
 msgstr "Ezabatutako mezuak betiko borratzen"
 
-#: ../camel/providers/pop3/camel-pop3-folder.c:530
-#: ../camel/providers/pop3/camel-pop3-folder.c:552
-#, c-format
-msgid "No message with UID %s"
-msgstr "Ez dago %s UIDa 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:559
-#, c-format
-msgid "Retrieving POP message %d"
-msgstr "%d POP mezua berreskuratzen"
-
-#: ../camel/providers/pop3/camel-pop3-folder.c:649
-msgid "Unknown reason"
-msgstr "Arrazoi ezezaguna"
-
-#: ../camel/providers/pop3/camel-pop3-provider.c:43
+#: ../camel/providers/pop3/camel-pop3-provider.c:39
 msgid "Message storage"
 msgstr "Mezu-biltegiratzea"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:45
+#: ../camel/providers/pop3/camel-pop3-provider.c:41
 msgid "_Leave messages on server"
 msgstr "_Utzi mezuak zerbitzarian"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:47
+#. Translators: '%s' is replaced with a widget, where user can select how many days can be message left on the server
+#: ../camel/providers/pop3/camel-pop3-provider.c:44
 #, c-format
 msgid "_Delete after %s day(s)"
 msgstr "_Ezabatu %s egunen ondoren"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:49
+#: ../camel/providers/pop3/camel-pop3-provider.c:46
+msgid "Delete _expunged from local Inbox"
+msgstr "Ezabatu _garbitutakoa lokaleko Sarrerako ontzitik"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:48
 msgid "Disable _support for all POP3 extensions"
 msgstr "Desgaitu POP3 hedapen guztien _euskarria"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:57
+#: ../camel/providers/pop3/camel-pop3-provider.c:54
+msgid "Default POP3 port"
+msgstr "POP3ren ataka lehenetsia"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:55
+msgid "POP3 over SSL"
+msgstr "POP3 SSLren gainean"
+
+#: ../camel/providers/pop3/camel-pop3-provider.c:62
 msgid "POP"
 msgstr "POP"
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:59
+#: ../camel/providers/pop3/camel-pop3-provider.c:64
 msgid "For connecting to and downloading mail from POP servers."
 msgstr "POP zerbitzariekin konektatu eta bertako mezuak deskargatzeko."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:76
+#: ../camel/providers/pop3/camel-pop3-provider.c:83
 msgid ""
 "This option will connect to the POP server using a plaintext password. This "
 "is the only option supported by many POP servers."
@@ -4300,7 +4298,7 @@ msgstr ""
 "pasahitzaren bidez. Hau da POP zerbitzari askok onartzen duten aukera "
 "bakarra."
 
-#: ../camel/providers/pop3/camel-pop3-provider.c:86
+#: ../camel/providers/pop3/camel-pop3-provider.c:93
 msgid ""
 "This option will connect to the POP server using an encrypted password via "
 "the APOP protocol. This may not work for all users even on servers that "
@@ -4310,39 +4308,43 @@ msgstr ""
 "erabiliz APOP protokoloaren bidez. Beharbada honek ez du erabiltzaile "
 "guztiekin funtzionatuko zerbitzariak onartzen duela adierazten badu ere."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:229
+#. Translators: This is the separator between an error and an explanation
+#: ../camel/providers/pop3/camel-pop3-store.c:98
+msgid ": "
+msgstr ": "
+
+#: ../camel/providers/pop3/camel-pop3-store.c:181
 #, c-format
 msgid "Failed to read a valid greeting from POP server %s"
 msgstr "Huts egin du %s POP zerbitzariko baliozko agurra irakurtzean"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:246
-#: ../camel/providers/pop3/camel-pop3-store.c:274
-#: ../camel/providers/pop3/camel-pop3-store.c:280
+#: ../camel/providers/pop3/camel-pop3-store.c:199
+#: ../camel/providers/pop3/camel-pop3-store.c:230
+#: ../camel/providers/pop3/camel-pop3-store.c:237
 #, c-format
 msgid "Failed to connect to POP server %s in secure mode: %s"
 msgstr "Ezin da %s POP zerbitzariarekin modu seguruan konektatu: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:247
+#: ../camel/providers/pop3/camel-pop3-store.c:200
 msgid "STLS not supported by server"
 msgstr "Zerbitzariak ez du STLS onartzen"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:262
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:218
 #, c-format
-#| msgid "Failed to connect to POP server %s in secure mode: %s"
 msgid "Failed to connect to POP server %s in secure mode%s"
 msgstr "Huts egin du %s POP zerbitzariarekin modu seguruan konektatu%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:281
+#: ../camel/providers/pop3/camel-pop3-store.c:231
+msgid "TLS negotiations failed"
+msgstr "TSL negoziazioak huts egin du."
+
+#: ../camel/providers/pop3/camel-pop3-store.c:238
 msgid "TLS is not available in this build"
 msgstr "TSL ez da onartzen bertsio honetan"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:387
-#, c-format
-msgid "Could not connect to POP server %s"
-msgstr "Ezin izan da %s POP zerbitzariarekin konektatu"
-
-#: ../camel/providers/pop3/camel-pop3-store.c:428
-#: ../camel/providers/pop3/camel-pop3-store.c:565
+#: ../camel/providers/pop3/camel-pop3-store.c:317
+#: ../camel/providers/pop3/camel-pop3-store.c:472
 #, c-format
 msgid ""
 "Unable to connect to POP server %s: No support for requested authentication "
@@ -4351,23 +4353,23 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu: ez du eskatutako autentifikazio-"
 "mekanismoa onartzen."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:446
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:340
 #, c-format
-#| msgid "SASL '%s' Login failed for POP server %s: %s"
 msgid "SASL '%s' Login failed for POP server %s%s"
 msgstr "Huts egin du %2$s POP zerbitzariko SASL '%1$s' saio-hasierak%3$s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:460
+#: ../camel/providers/pop3/camel-pop3-store.c:357
 #, c-format
 msgid "Cannot login to POP server %s: SASL Protocol error"
 msgstr "Ezin da %s POP zerbitzarian saioa hasi: SASL protokolo-errorea"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:479
+#: ../camel/providers/pop3/camel-pop3-store.c:374
 #, c-format
-msgid "Failed to authenticate on POP server %s: %s"
-msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+msgid "Failed to authenticate on POP server %s: "
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: "
 
-#: ../camel/providers/pop3/camel-pop3-store.c:538
+#: ../camel/providers/pop3/camel-pop3-store.c:439
 #, c-format
 msgid ""
 "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation "
@@ -4377,7 +4379,7 @@ msgstr ""
 "Nortasuna bidegabe jabetzeko erasoa dirudi. Jar zaitez "
 "administratzailearekin harremanetan."
 
-#: ../camel/providers/pop3/camel-pop3-store.c:579
+#: ../camel/providers/pop3/camel-pop3-store.c:492
 #, c-format
 msgid ""
 "Unable to connect to POP server %s.\n"
@@ -4386,11 +4388,9 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean: %s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:588
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:505
 #, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending username: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending username%s"
@@ -4398,11 +4398,9 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu.\n"
 "Errorea erabiltzaile-izena bidaltzean%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:597
+#. Translators: Last %s is an optional explanation beginning with ": " separator
+#: ../camel/providers/pop3/camel-pop3-store.c:518
 #, c-format
-#| msgid ""
-#| "Unable to connect to POP server %s.\n"
-#| "Error sending password: %s"
 msgid ""
 "Unable to connect to POP server %s.\n"
 "Error sending password%s"
@@ -4410,402 +4408,335 @@ msgstr ""
 "Ezin da %s POP zerbitzariarekin konektatu.\n"
 "Errorea pasahitza bidaltzean%s"
 
-#: ../camel/providers/pop3/camel-pop3-store.c:703
+#: ../camel/providers/pop3/camel-pop3-store.c:558
+#, c-format
+msgid "POP3 server %s"
+msgstr "%s POP3 zerbitzaria"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:562
+#, c-format
+msgid "POP3 server for %s on %s"
+msgstr "POP3 zerbitzaria %s(e)rako %s(e)n"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:693
+#, c-format
+msgid "Could not connect to POP server %s"
+msgstr "Ezin izan da %s POP zerbitzariarekin konektatu"
+
+#: ../camel/providers/pop3/camel-pop3-store.c:720
 #, c-format
 msgid "No such folder '%s'."
 msgstr "Ez dago '%s' bezalako karpetarik."
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
+#: ../camel/providers/pop3/camel-pop3-store.c:737
+#, c-format
+msgid "POP3 stores have no folder hierarchy"
+msgstr "POP3 biltegiek ez daukate karpeten hierarkiarik"
+
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:36
 msgid "Sendmail"
 msgstr "Sendmail"
 
-#: ../camel/providers/sendmail/camel-sendmail-provider.c:40
+#: ../camel/providers/sendmail/camel-sendmail-provider.c:38
 msgid ""
 "For delivering mail by passing it to the \"sendmail\" program on the local "
 "system."
 msgstr "Sistema lokalean \"sendmail\" programara pasatuz posta banatzeko."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:113
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:49
+msgid "sendmail"
+msgstr "sendmail"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:51
+msgid "Mail delivery via the sendmail program"
+msgstr "Posta-banaketa sendmail programaren bidez"
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:86
+#, c-format
 msgid "Could not parse recipient list"
 msgstr "Ezin izan da hartzaileen zerrenda analizatu"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:144
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:119
 #, c-format
 msgid "Could not create pipe to sendmail: %s: mail not sent"
 msgstr "Ezin izan da sendmail-erako kanalizaziorik sortu: %s: posta ez da bidali"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:165
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:141
 #, c-format
 msgid "Could not fork sendmail: %s: mail not sent"
 msgstr "Ezin izan da sendmail sardetu: %s: posta ez da bidali"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:235
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:182
+msgid "Could not send message: "
+msgstr "Ezin izan da mezua bidali: "
+
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:210
 #, c-format
 msgid "sendmail exited with signal %s: mail not sent."
 msgstr "sendmail %s seinalearekin irten da: posta ez da bidali."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:242
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:217
 #, c-format
 msgid "Could not execute %s: mail not sent."
 msgstr "Ezin izan da %s exekutatu: posta ez da bidali."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:247
+#: ../camel/providers/sendmail/camel-sendmail-transport.c:222
 #, c-format
 msgid "sendmail exited with status %d: mail not sent."
 msgstr "sendmail %d egoerarekin irten da: posta ez da bidali."
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:261
-msgid "sendmail"
-msgstr "sendmail"
+#: ../camel/providers/smtp/camel-smtp-provider.c:42
+msgid "Default SMTP port"
+msgstr "SMTPren ataka lehenetsia"
 
-#: ../camel/providers/sendmail/camel-sendmail-transport.c:263
-msgid "Mail delivery via the sendmail program"
-msgstr "Posta-banaketa sendmail programaren bidez"
+#: ../camel/providers/smtp/camel-smtp-provider.c:43
+msgid "SMTP over SSL"
+msgstr "SMTP SSLren gainean"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:41
+#: ../camel/providers/smtp/camel-smtp-provider.c:44
+msgid "Message submission port"
+msgstr "Mezua bidaltzeko ataka"
+
+#: ../camel/providers/smtp/camel-smtp-provider.c:50
 msgid "SMTP"
 msgstr "SMTP"
 
-#: ../camel/providers/smtp/camel-smtp-provider.c:43
+#: ../camel/providers/smtp/camel-smtp-provider.c:52
 msgid "For delivering mail by connecting to a remote mailhub using SMTP."
 msgstr "SMTP erabiliz urruneko mailhub batekin konektatuta posta banatzeko."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:167
+#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:200
+msgid "Welcome response error: "
+msgstr "Ongi etorriko erantzunaren errorea: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:237
+#: ../camel/providers/smtp/camel-smtp-transport.c:277
+#: ../camel/providers/smtp/camel-smtp-transport.c:284
+#, c-format
+msgid "Failed to connect to SMTP server %s in secure mode: %s"
+msgstr "Huts egin du %s SMTP zerbitzariarekin modu seguruan konektatzean: %s"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:246
+#: ../camel/providers/smtp/camel-smtp-transport.c:259
+#: ../camel/providers/smtp/camel-smtp-transport.c:266
+msgid "STARTTLS command failed: "
+msgstr "STARTTLS komandoak huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:357
+#, c-format
+msgid "SMTP server %s"
+msgstr "%s SMTP zerbitzaria"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:361
+#, c-format
+msgid "SMTP mail delivery via %s"
+msgstr "SMTP posta-banaketa %s bidez"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:408
+#, 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:495
+#, c-format
+msgid ""
+"Unable to authenticate to SMTP server.\n"
+"%s\n"
+"\n"
+msgstr ""
+"Ezin da SMTP zerbitzarian autentifikatu.\n"
+"%s\n"
+"\n"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:613
+#, c-format
+msgid "Cannot send message: service not connected."
+msgstr "Ezin da mezua bidali: ez da zerbitzurik konektatu."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:620
+#, c-format
+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:624
+msgid "Sending message"
+msgstr "Mezua bidaltzen"
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:649
+#, c-format
+msgid "Cannot send message: no recipients defined."
+msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:662
+#, c-format
+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:725
 msgid "Syntax error, command unrecognized"
 msgstr "Sintaxi-errorea; komandoa ezezaguna"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:169
+#: ../camel/providers/smtp/camel-smtp-transport.c:727
 msgid "Syntax error in parameters or arguments"
 msgstr "Sintaxi-errorea parametroetan edo argumentuetan"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:171
+#: ../camel/providers/smtp/camel-smtp-transport.c:729
 msgid "Command not implemented"
 msgstr "Komandoa inplementatu gabe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:173
+#: ../camel/providers/smtp/camel-smtp-transport.c:731
 msgid "Command parameter not implemented"
 msgstr "Komando-parametroa inplementatu gabe"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:175
+#: ../camel/providers/smtp/camel-smtp-transport.c:733
 msgid "System status, or system help reply"
 msgstr "Sistema-egoera, edo sistema-laguntzaren erantzuna"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:177
+#: ../camel/providers/smtp/camel-smtp-transport.c:735
 msgid "Help message"
 msgstr "Laguntza-mezua"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:179
+#: ../camel/providers/smtp/camel-smtp-transport.c:737
 msgid "Service ready"
 msgstr "Zerbitzua prest"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:181
+#: ../camel/providers/smtp/camel-smtp-transport.c:739
 msgid "Service closing transmission channel"
 msgstr "Zerbitzua transmisio-kanala ixten"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:183
+#: ../camel/providers/smtp/camel-smtp-transport.c:741
 msgid "Service not available, closing transmission channel"
 msgstr "Zerbitzua ez dago erabilgarri; transmisio kanala ixten"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:185
+#: ../camel/providers/smtp/camel-smtp-transport.c:743
 msgid "Requested mail action okay, completed"
 msgstr "Eskatutako posta-ekintza ondo; eginda"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:187
+#: ../camel/providers/smtp/camel-smtp-transport.c:745
 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:189
+#: ../camel/providers/smtp/camel-smtp-transport.c:747
 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:191
+#: ../camel/providers/smtp/camel-smtp-transport.c:749
 msgid "Requested action not taken: mailbox unavailable"
 msgstr "Ez da egin eskatutako ekintza: postontzia ez dago erabilgarri"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:193
+#: ../camel/providers/smtp/camel-smtp-transport.c:751
 msgid "Requested action aborted: error in processing"
 msgstr "Eskatutako ekintza abortatu egin da: errorea prozesatzean"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:195
+#: ../camel/providers/smtp/camel-smtp-transport.c:753
 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:197
+#: ../camel/providers/smtp/camel-smtp-transport.c:755
 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:199
+#: ../camel/providers/smtp/camel-smtp-transport.c:757
 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:201
+#: ../camel/providers/smtp/camel-smtp-transport.c:759
 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:203
+#: ../camel/providers/smtp/camel-smtp-transport.c:761
 msgid "Start mail input; end with <CRLF>.<CRLF>"
 msgstr "Hasi posta-sarrera; bukatu <CRLF>.<CRLF>-rekin"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:205
+#: ../camel/providers/smtp/camel-smtp-transport.c:763
 msgid "Transaction failed"
 msgstr "Transakzioak huts egin du"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:209
+#: ../camel/providers/smtp/camel-smtp-transport.c:767
 msgid "A password transition is needed"
 msgstr "Pasahitz-trantsizioa behar da"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:211
+#: ../camel/providers/smtp/camel-smtp-transport.c:769
 msgid "Authentication mechanism is too weak"
 msgstr "Autentifikazio-mekanismoa ahulegia da"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:213
+#: ../camel/providers/smtp/camel-smtp-transport.c:771
 msgid "Encryption required for requested authentication mechanism"
 msgstr "Eskatutako autentifikazio-mekanismoak beharrezkoa du enkriptatzea"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:215
+#: ../camel/providers/smtp/camel-smtp-transport.c:773
 msgid "Temporary authentication failure"
 msgstr "Aldi baterako autentifikazioak huts egin du"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:296
-msgid "Welcome response error"
-msgstr "Ongi etorriko erantzunaren errorea"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:331
-#: ../camel/providers/smtp/camel-smtp-transport.c:364
-#: ../camel/providers/smtp/camel-smtp-transport.c:370
-#, c-format
-msgid "Failed to connect to SMTP server %s in secure mode: %s"
-msgstr "Huts egin du %s SMTP zerbitzariarekin modu seguruan konektatzean: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:340
-#, c-format
-msgid "STARTTLS command failed: %s"
-msgstr "STARTTLS komandoak huts egin du: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:355
-msgid "STARTTLS command failed"
-msgstr "STARTTLS komandoak huts egin du: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:496
-#, 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:567
-#, c-format
-msgid ""
-"Unable to authenticate to SMTP server.\n"
-"%s\n"
-"\n"
-msgstr ""
-"Ezin da SMTP zerbitzarian autentifikatu.\n"
-"%s\n"
-"\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:700
-#, c-format
-msgid "SMTP server %s"
-msgstr "%s SMTP zerbitzaria"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:702
-#, c-format
-msgid "SMTP mail delivery via %s"
-msgstr "SMTP posta-banaketa %s bidez"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:720
-msgid "Cannot send message: service not connected."
-msgstr "Ezin da mezua bidali: ez da zerbitzurik konektatu."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:726
-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:730
-msgid "Sending message"
-msgstr "Mezua bidaltzen"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:745
-msgid "Cannot send message: no recipients defined."
-msgstr "Ezin da mezua bidali: ez da hartzailerik definitu."
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:756
-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:985
+#: ../camel/providers/smtp/camel-smtp-transport.c:1030
 msgid "SMTP Greeting"
 msgstr "SMTP Agurra"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1010
-#, c-format
-msgid "HELO command failed: %s"
-msgstr "HELO komandoak huts egin du: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1027
-msgid "HELO command failed"
-msgstr "HELO komandoak huts egin du"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1057
+#: ../camel/providers/smtp/camel-smtp-transport.c:1074
+#: ../camel/providers/smtp/camel-smtp-transport.c:1082
+msgid "HELO command failed: "
+msgstr "HELO komandoak huts egin du: "
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1093
+#: ../camel/providers/smtp/camel-smtp-transport.c:1150
 msgid "SMTP Authentication"
 msgstr "SMTP Autentifikazioa"
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1099
+#: ../camel/providers/smtp/camel-smtp-transport.c:1157
+#, c-format
 msgid "Error creating SASL authentication object."
 msgstr "Errorea SASL autentifikazio-objektua sortzean."
 
-#: ../camel/providers/smtp/camel-smtp-transport.c:1116
-#: ../camel/providers/smtp/camel-smtp-transport.c:1127
-#, c-format
-msgid "AUTH command failed: %s"
-msgstr "AUTH komandoak huts egin du: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1133
-msgid "AUTH command failed"
-msgstr "AUTH komandoak huts egin du"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1203
-msgid "Bad authentication response from server.\n"
-msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du.\n"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1230
-#, c-format
-msgid "MAIL FROM command failed: %s: mail not sent"
-msgstr "MAIL FROM komandoak huts egin du: %s: posta ez da bidali"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1247
-msgid "MAIL FROM command failed"
-msgstr "MAIL FROM komandoak huts egin du"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1271
-#, c-format
-msgid "RCPT TO command failed: %s: mail not sent"
-msgstr "RCTP TO komandoak huts egin du: %s: posta ez da bidali"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1290
-#, c-format
-msgid "RCPT TO <%s> failed"
-msgstr "RCPT TO <%s> huts egin du"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1330
-#: ../camel/providers/smtp/camel-smtp-transport.c:1399
-#: ../camel/providers/smtp/camel-smtp-transport.c:1418
-#, c-format
-msgid "DATA command failed: %s: mail not sent"
-msgstr "DATA komandoak huts egin du: %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:1347
-#: ../camel/providers/smtp/camel-smtp-transport.c:1434
-msgid "DATA command failed"
-msgstr "DATA komandoak huts egin du"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1457
-#, c-format
-msgid "RSET command failed: %s"
-msgstr "RSET komandoak huts egin du: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1473
-msgid "RSET command failed"
-msgstr "RSET komandoak huts egin du"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1496
-#, c-format
-msgid "QUIT command failed: %s"
-msgstr "QUIT komandoak huts egin du: %s"
-
-#: ../camel/providers/smtp/camel-smtp-transport.c:1510
-msgid "QUIT command failed"
-msgstr "QUIT komandoak huts egin du"
-
-#: ../libedataserver/e-categories.c:47
-msgid "Business"
-msgstr "Lanekoa"
-
-#: ../libedataserver/e-categories.c:48
-msgid "Competition"
-msgstr "Lehia"
-
-#: ../libedataserver/e-categories.c:49
-msgid "Favorites"
-msgstr "Gogokoak"
-
-#: ../libedataserver/e-categories.c:50
-msgid "Gifts"
-msgstr "Opariak"
-
-#: ../libedataserver/e-categories.c:51
-msgid "Goals/Objectives"
-msgstr "Xedeak/Helburuak"
-
-#: ../libedataserver/e-categories.c:52
-msgid "Holiday"
-msgstr "Oporrak"
-
-#: ../libedataserver/e-categories.c:53
-msgid "Holiday Cards"
-msgstr "Oporretako txartelak"
-
-#. important people (e.g. new business partners)
-#: ../libedataserver/e-categories.c:55
-msgid "Hot Contacts"
-msgstr "Kontaktu garrantzitsuak"
-
-#: ../libedataserver/e-categories.c:56
-msgid "Ideas"
-msgstr "Burutazioak"
-
-#: ../libedataserver/e-categories.c:57
-msgid "International"
-msgstr "Internazionala"
-
-#: ../libedataserver/e-categories.c:58
-msgid "Key Customer"
-msgstr "Gako pertsonalizatua"
-
-#: ../libedataserver/e-categories.c:59
-msgid "Miscellaneous"
-msgstr "Hainbat"
-
-#: ../libedataserver/e-categories.c:60
-msgid "Personal"
-msgstr "Pertsonala"
-
-#: ../libedataserver/e-categories.c:61
-msgid "Phone Calls"
-msgstr "Telefono deiak"
-
-#. Translators: "Status" is a category name; it can mean anything user wants to
-#: ../libedataserver/e-categories.c:63
-msgid "Status"
-msgstr "Egoera"
-
-#: ../libedataserver/e-categories.c:64
-msgid "Strategies"
-msgstr "Estrategiak"
-
-#: ../libedataserver/e-categories.c:65
-msgid "Suppliers"
-msgstr "Hornitzaileak"
-
-#: ../libedataserver/e-categories.c:66
-msgid "Time & Expenses"
-msgstr "Denbora eta gastuak"
-
-#: ../libedataserver/e-categories.c:67
-msgid "VIP"
-msgstr "VIP"
-
-#: ../libedataserver/e-categories.c:68
-msgid "Waiting"
-msgstr "Zain"
+#: ../camel/providers/smtp/camel-smtp-transport.c:1176
+#: ../camel/providers/smtp/camel-smtp-transport.c:1187
+#: ../camel/providers/smtp/camel-smtp-transport.c:1196
+msgid "AUTH command failed: "
+msgstr "AUTH komandoak huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1304
+#: ../camel/providers/smtp/camel-smtp-transport.c:1318
+#: ../camel/providers/smtp/camel-smtp-transport.c:1327
+msgid "MAIL FROM command failed: "
+msgstr "MAIL FROM komandoak huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1354
+msgid "RCPT TO command failed: "
+msgstr "RCPT TO komandoak huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1370
+#: ../camel/providers/smtp/camel-smtp-transport.c:1379
+#, c-format
+msgid "RCPT TO <%s> failed: "
+msgstr "RCPT TO <%s> huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1421
+#: ../camel/providers/smtp/camel-smtp-transport.c:1431
+#: ../camel/providers/smtp/camel-smtp-transport.c:1441
+#: ../camel/providers/smtp/camel-smtp-transport.c:1500
+#: ../camel/providers/smtp/camel-smtp-transport.c:1519
+#: ../camel/providers/smtp/camel-smtp-transport.c:1532
+#: ../camel/providers/smtp/camel-smtp-transport.c:1540
+msgid "DATA command failed: "
+msgstr "DATA komandoak huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1565
+#: ../camel/providers/smtp/camel-smtp-transport.c:1579
+#: ../camel/providers/smtp/camel-smtp-transport.c:1587
+msgid "RSET command failed: "
+msgstr "RSET komandoak huts egin du: "
+
+#: ../camel/providers/smtp/camel-smtp-transport.c:1612
+#: ../camel/providers/smtp/camel-smtp-transport.c:1626
+#: ../camel/providers/smtp/camel-smtp-transport.c:1633
+msgid "QUIT command failed: "
+msgstr "QUIT komandoak huts egin du: "
 
 #. strptime format of a weekday, a date and a time,
 #. in 12-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1633 ../libedataserver/e-time-utils.c:1898
+#: ../libedataserver/e-time-utils.c:1635 ../libedataserver/e-time-utils.c:1931
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %Y/%m/%d %I:%M:%S %p"
 
@@ -4813,7 +4744,7 @@ msgstr "%a %Y/%m/%d %I:%M:%S %p"
 #. in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1638 ../libedataserver/e-time-utils.c:1889
+#: ../libedataserver/e-time-utils.c:1640 ../libedataserver/e-time-utils.c:1922
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %Y/%m/%d %H:%M:%S"
 
@@ -4821,7 +4752,7 @@ msgstr "%a %Y/%m/%d %H:%M:%S"
 #. in 12-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 12-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1643 ../libedataserver/e-time-utils.c:1894
+#: ../libedataserver/e-time-utils.c:1645 ../libedataserver/e-time-utils.c:1927
 msgid "%a %m/%d/%Y %I:%M %p"
 msgstr "%a, %Y/%m/%d %I:%M %p"
 
@@ -4829,78 +4760,78 @@ msgstr "%a, %Y/%m/%d %I:%M %p"
 #. in 24-hour format, without seconds.
 #. strftime format of a weekday, a date and a
 #. time, in 24-hour format, without seconds.
-#: ../libedataserver/e-time-utils.c:1648 ../libedataserver/e-time-utils.c:1885
+#: ../libedataserver/e-time-utils.c:1650 ../libedataserver/e-time-utils.c:1918
 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.
-#: ../libedataserver/e-time-utils.c:1653
+#: ../libedataserver/e-time-utils.c:1655
 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.
-#: ../libedataserver/e-time-utils.c:1658
+#: ../libedataserver/e-time-utils.c:1660
 msgid "%a %m/%d/%Y %H"
 msgstr "%a, %Y/%m/%d %H"
 
 #. strptime format of a weekday and a date.
 #. strftime format of a weekday and a date.
-#: ../libedataserver/e-time-utils.c:1661 ../libedataserver/e-time-utils.c:1761
-#: ../libedataserver/e-time-utils.c:1880
+#: ../libedataserver/e-time-utils.c:1663 ../libedataserver/e-time-utils.c:1783
+#: ../libedataserver/e-time-utils.c:1913
 msgid "%a %m/%d/%Y"
 msgstr "%a, %Y/%m/%d"
 
 #. strptime format of a date and a time, in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1668
+#: ../libedataserver/e-time-utils.c:1670
 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.
-#: ../libedataserver/e-time-utils.c:1672
+#: ../libedataserver/e-time-utils.c:1674
 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.
-#: ../libedataserver/e-time-utils.c:1677
+#: ../libedataserver/e-time-utils.c:1679
 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.
-#: ../libedataserver/e-time-utils.c:1682
+#: ../libedataserver/e-time-utils.c:1684
 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.
-#: ../libedataserver/e-time-utils.c:1687
+#: ../libedataserver/e-time-utils.c:1689
 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.
-#: ../libedataserver/e-time-utils.c:1692
+#: ../libedataserver/e-time-utils.c:1694
 msgid "%m/%d/%Y %H"
 msgstr "%Y/%m/%d %H"
 
 #. strptime format of a weekday and a date.
 #. This is the preferred date format for the locale.
-#: ../libedataserver/e-time-utils.c:1695 ../libedataserver/e-time-utils.c:1764
+#: ../libedataserver/e-time-utils.c:1697 ../libedataserver/e-time-utils.c:1786
 msgid "%m/%d/%Y"
 msgstr "%Y/%m/%d"
 
 #. strptime format for a time of day, in 12-hour format.
 #. strftime format of a time in 12-hour format.
-#: ../libedataserver/e-time-utils.c:1822 ../libedataserver/e-time-utils.c:1942
+#: ../libedataserver/e-time-utils.c:1855 ../libedataserver/e-time-utils.c:1975
 msgid "%I:%M:%S %p"
 msgstr "%I:%M:%S %p"
 
 #. strptime format for a time of day, in 24-hour format.
 #. strftime format of a time in 24-hour format.
-#: ../libedataserver/e-time-utils.c:1826 ../libedataserver/e-time-utils.c:1934
+#: ../libedataserver/e-time-utils.c:1859 ../libedataserver/e-time-utils.c:1967
 msgid "%H:%M:%S"
 msgstr "%H:%M:%S"
 
@@ -4908,204 +4839,199 @@ msgstr "%H:%M:%S"
 #. in 12-hour format.
 #. strftime format of a time in 12-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1831 ../libedataserver/e-time-utils.c:1939
+#: ../libedataserver/e-time-utils.c:1864 ../libedataserver/e-time-utils.c:1972
 msgid "%I:%M %p"
 msgstr "%I:%M %p"
 
 #. strptime format for time of day, without seconds 24-hour format.
 #. strftime format of a time in 24-hour format,
 #. without seconds.
-#: ../libedataserver/e-time-utils.c:1835 ../libedataserver/e-time-utils.c:1931
+#: ../libedataserver/e-time-utils.c:1868 ../libedataserver/e-time-utils.c:1964
 msgid "%H:%M"
 msgstr "%H:%M"
 
 #. strptime format for time of day, without seconds 24-hour format, and no colon.
-#: ../libedataserver/e-time-utils.c:1838
+#: ../libedataserver/e-time-utils.c:1871
 msgid "%H%M"
 msgstr "%H:%M"
 
 #. strptime format for hour and AM/PM, 12-hour format.
-#: ../libedataserver/e-time-utils.c:1842
+#: ../libedataserver/e-time-utils.c:1875
 msgid "%I %p"
 msgstr "%I %p"
 
-#: ../libedataserverui/e-book-auth-util.c:90
+#: ../libedataserverui/e-book-auth-util.c:93
+#: ../libedataserverui/e-book-auth-util.c:673
 msgid "Accessing LDAP Server anonymously"
 msgstr "LDAP zerbitzarira anonimoki konektatzen"
 
-#: ../libedataserverui/e-book-auth-util.c:192
+#: ../libedataserverui/e-book-auth-util.c:199
+#: ../libedataserverui/e-book-auth-util.c:435
 msgid "Failed to authenticate.\n"
 msgstr "Huts egin du autentifikatzean.\n"
 
-#: ../libedataserverui/e-categories-dialog.c:145
+#: ../libedataserverui/e-categories-dialog.c:127
+msgid "Category Properties"
+msgstr "Kategoriaren propietateak"
+
+#: ../libedataserverui/e-categories-dialog.c:138
+msgid "Category _Name"
+msgstr "Kategoriaren _izena"
+
+#: ../libedataserverui/e-categories-dialog.c:144
+msgid "Category _Icon"
+msgstr "Kategoriaren _ikonoa"
+
+#: ../libedataserverui/e-categories-dialog.c:185
 msgid "Category Icon"
 msgstr "Kategoriaren ikonoa"
 
-#: ../libedataserverui/e-categories-dialog.c:151
+#: ../libedataserverui/e-categories-dialog.c:191
 msgid "_No Image"
 msgstr "Irudirik _ez"
 
-#: ../libedataserverui/e-categories-dialog.c:372
+#: ../libedataserverui/e-categories-dialog.c:406
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
 "name"
 msgstr "'%s' kategoria badago lehendik konfigurazioan. Erabili beste izen bat"
 
-#: ../libedataserverui/e-categories-dialog.c:680
-msgid "Icon"
-msgstr "Ikonoa"
+#: ../libedataserverui/e-categories-dialog.c:661
+msgid "Currently _used categories:"
+msgstr "Unean _erabilitako kategoriak:"
 
-#: ../libedataserverui/e-categories-dialog.c:685
-msgid "Category"
-msgstr "Kategoria"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:1
-msgid "Category Properties"
-msgstr "Kategoriaren propietateak"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:2
-msgid "Category _Icon"
-msgstr "Kategoriaren _ikonoa"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:3
-msgid "Category _Name"
-msgstr "Kategoriaren _izena"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:4
-#| msgid "Item(s) belong to these _categories:"
-msgid "Item(s) _belong to these categories:"
-msgstr "Elementua(k) _kategoria hauetakoa d(ir)a:"
-
-#: ../libedataserverui/e-categories-dialog.ui.h:5
+#: ../libedataserverui/e-categories-dialog.c:668
 msgid "_Available Categories:"
 msgstr "_Dauden kategoriak:"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:6
+#: ../libedataserverui/e-categories-dialog.c:711
 msgid "_Edit"
 msgstr "_Edizioa"
 
-#: ../libedataserverui/e-categories-dialog.ui.h:7
-msgid "categories"
-msgstr "kategoriak"
+#: ../libedataserverui/e-categories-dialog.c:768
+msgid "Icon"
+msgstr "Ikonoa"
 
-#: ../libedataserverui/e-category-completion.c:292
+#: ../libedataserverui/e-categories-dialog.c:773
+msgid "Category"
+msgstr "Kategoria"
+
+#: ../libedataserverui/e-category-completion.c:294
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Sortu \"%s\" kategoria"
 
-#: ../libedataserverui/e-cell-renderer-color.c:222
-msgid "Color Info"
-msgstr "Kolorearen informazioa"
-
-#: ../libedataserverui/e-cell-renderer-color.c:223
-msgid "The color to render"
-msgstr "Kolorea errendatzeko"
+#: ../libedataserverui/e-name-selector-dialog.c:176
+msgid "Show Contacts"
+msgstr "Erakutsi kontaktuak"
 
-#: ../libedataserverui/e-name-selector-dialog.c:292
-msgid "Select Contacts from Address Book"
-msgstr "Hautatu kontaktuak helbide-liburutik"
+#: ../libedataserverui/e-name-selector-dialog.c:198
+msgid "Address B_ook:"
+msgstr "Helbide-_liburua:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:587
-msgid "_Add"
-msgstr "_Gehitu"
+#: ../libedataserverui/e-name-selector-dialog.c:206
+msgid "Cate_gory:"
+msgstr "_Kategoria:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:612
-msgid "_Remove"
-msgstr "_Kendu"
+#: ../libedataserverui/e-name-selector-dialog.c:224
+msgid "_Search:"
+msgstr "_Bilatu:"
 
-#: ../libedataserverui/e-name-selector-dialog.c:789
-#: ../libedataserverui/e-name-selector-dialog.ui.h:6
+#: ../libedataserverui/e-name-selector-dialog.c:242
+#: ../libedataserverui/e-name-selector-dialog.c:977
 msgid "Any Category"
 msgstr "Edozein kategoria"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:1
-msgid "*"
-msgstr "*"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:2
-msgid "<b>Co_ntacts</b>"
-msgstr "<b>_Kontaktuak</b>"
+#: ../libedataserverui/e-name-selector-dialog.c:244
+msgid "Co_ntacts"
+msgstr "_Kontaktuak"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:3
-msgid "<b>Show Contacts</b>"
-msgstr "<b>Erakutsi kontaktuak</b>"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:4
-msgid "Address B_ook:"
-msgstr "Helbide-_liburua:"
+#: ../libedataserverui/e-name-selector-dialog.c:289
+msgid "Search"
+msgstr "Bilatu"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:5
+#: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Address Book"
 msgstr "Helbide-liburua"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:7
-msgid "Cate_gory:"
-msgstr "_Kategoria:"
-
-#: ../libedataserverui/e-name-selector-dialog.ui.h:8
+#: ../libedataserverui/e-name-selector-dialog.c:295
 msgid "Contacts"
 msgstr "Kontaktuak"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:9
-msgid "Search"
-msgstr "Bilatu"
+#: ../libedataserverui/e-name-selector-dialog.c:412
+msgid "Select Contacts from Address Book"
+msgstr "Hautatu kontaktuak helbide-liburutik"
 
-#: ../libedataserverui/e-name-selector-dialog.ui.h:10
-msgid "_Search:"
-msgstr "_Bilatu:"
+#: ../libedataserverui/e-name-selector-dialog.c:747
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: ../libedataserverui/e-name-selector-dialog.c:751
+msgid "_Remove"
+msgstr "_Kendu"
+
+#: ../libedataserverui/e-name-selector-dialog.c:891
+#, c-format
+msgid "Error loading address book: %s"
+msgstr "Errorea helbide-liburua kargatzean: %s"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2508
+#: ../libedataserverui/e-name-selector-entry.c:2661
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Zabaldu %s linean"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2523
+#: ../libedataserverui/e-name-selector-entry.c:2676
 #, c-format
 msgid "Cop_y %s"
 msgstr "K_opiatu %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2533
+#: ../libedataserverui/e-name-selector-entry.c:2686
 #, c-format
 msgid "C_ut %s"
 msgstr "E_baki %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2550
+#: ../libedataserverui/e-name-selector-entry.c:2703
 #, c-format
 msgid "_Edit %s"
 msgstr "_Editatu %s"
 
-#: ../libedataserverui/e-name-selector-list.c:469
+#: ../libedataserverui/e-name-selector-list.c:509
 #, c-format
 msgid "_Delete %s"
 msgstr "E_zabatu %s"
 
-#: ../libedataserverui/e-passwords.c:234
+#: ../libedataserverui/e-passwords.c:127
 #, c-format
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Gako-sortako gakoa ez da erabilgarri: ez du erabiltzaile- edo ostalari-izenik"
 
-#: ../libedataserverui/e-passwords.c:1093
+#: ../libedataserverui/e-passwords.c:701
+#: ../libedataserverui/e-passwords-win32.c:612
 msgid "You have the Caps Lock key on."
 msgstr "Blok. Maius. tekla aktibatuta dago."
 
-#: ../libedataserverui/e-passwords.c:1215
+#: ../libedataserverui/e-passwords.c:821
+#: ../libedataserverui/e-passwords-win32.c:735
 msgid "_Remember this passphrase"
 msgstr "_Gogoratu pasaesaldia"
 
-#: ../libedataserverui/e-passwords.c:1216
+#: ../libedataserverui/e-passwords.c:822
+#: ../libedataserverui/e-passwords-win32.c:736
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Gogoratu pasaesaldia saio hau amaitu arte"
 
-#: ../libedataserverui/e-passwords.c:1221
+#: ../libedataserverui/e-passwords.c:827
+#: ../libedataserverui/e-passwords-win32.c:741
 msgid "_Remember this password"
 msgstr "_Gogoratu pasahitz hau"
 
-#: ../libedataserverui/e-passwords.c:1222
+#: ../libedataserverui/e-passwords.c:828
+#: ../libedataserverui/e-passwords-win32.c:742
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -5114,7 +5040,7 @@ msgstr "_Gogoratu pasahitz hau saio hau amaitu arte"
 msgid "Select destination"
 msgstr "Hautatu helburua"
 
-#: ../libedataserverui/e-source-selector-dialog.c:172
+#: ../libedataserverui/e-source-selector-dialog.c:170
 msgid "_Destination"
 msgstr "_Helburua"
 



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