X-Git-Url: https://git.llucax.com/software/mutt-debian.git/blobdiff_plain/14c29200cb58d3c4a0830265f2433849781858d0..c5b192a33a305c26dfc056daa813c9a5d435da43:/po/eu.po?ds=sidebyside

diff --git a/po/eu.po b/po/eu.po
index bb6b35e..554138c 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1,52 +1,51 @@
-# translation of mutt eu.po to librezale
-# Piarres Beobide  <pi@beobide.net>, 2004, 2005, 2007.
+# translation of eu.po to Euskara
+# Piarres Beobide  <pi@beobide.net>, 2004, 2005, 2008.
 # Spanish translation of mutt
 # Copyright (C) 1999-2001 Boris Wesslowski <Boris@Wesslowski.com>
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-17 12:35-0700\n"
-"PO-Revision-Date: 2007-04-20 12:49+0200\n"
+"POT-Creation-Date: 2010-09-15 10:09-0700\n"
+"PO-Revision-Date: 2008-05-20 22:39+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
-"Language-Team: librezale <librezale@librezale.org>\n"
+"Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 0.11\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: KBabel 1.11.4\n"
 
-#: account.c:164
+#: account.c:163
 #, c-format
 msgid "Username at %s: "
-msgstr " %s -n erabiltzaile izena: "
+msgstr "%s -n erabiltzaile izena: "
 
-#: account.c:223
+#: account.c:224
 #, c-format
 msgid "Password for %s@%s: "
 msgstr "%s@%s-ren pasahitza: "
 
-#: addrbook.c:37 browser.c:45 pager.c:1480 postpone.c:43 query.c:49
-#: recvattach.c:54
+#: addrbook.c:37 browser.c:46 pager.c:1530 postpone.c:41 query.c:48
+#: recvattach.c:53
 msgid "Exit"
 msgstr "Irten"
 
-#: addrbook.c:38 curs_main.c:408 pager.c:1487 postpone.c:44
+#: addrbook.c:38 curs_main.c:406 pager.c:1537 postpone.c:42
 msgid "Del"
 msgstr "Ezab"
 
-#: addrbook.c:39 curs_main.c:409 postpone.c:45
+#: addrbook.c:39 curs_main.c:407 postpone.c:43
 msgid "Undel"
-msgstr "Berreskuratu"
+msgstr "Desezabatu"
 
 #: addrbook.c:40
 msgid "Select"
 msgstr "Hautatu"
 
 #. __STRCAT_CHECKED__
-#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3647 curs_main.c:414
-#: mutt_ssl.c:679 mutt_ssl_gnutls.c:783 pager.c:1579 pgpkey.c:522
-#: postpone.c:46 query.c:54 recvattach.c:58 smime.c:437
+#: addrbook.c:41 browser.c:49 compose.c:96 crypt-gpgme.c:3827 curs_main.c:412
+#: mutt_ssl.c:988 mutt_ssl_gnutls.c:875 pager.c:1629 pgpkey.c:522
+#: postpone.c:44 query.c:53 recvattach.c:57 smime.c:425
 msgid "Help"
 msgstr "Laguntza"
 
@@ -54,61 +53,59 @@ msgstr "Laguntza"
 msgid "You have no aliases!"
 msgstr "Ez duzu aliasik!"
 
-#: addrbook.c:156
+#: addrbook.c:155
 msgid "Aliases"
 msgstr "Aliasak"
 
 #. add a new alias
-#: alias.c:246
+#: alias.c:260
 msgid "Alias as: "
 msgstr "Aliasa sortu: "
 
-#: alias.c:252
+#: alias.c:266
 msgid "You already have an alias defined with that name!"
-msgstr "Izen honekin baduzu ezarritako alias bat!"
+msgstr "Izen honekin baduzu ezarritako ezizena bat!"
 
-#: alias.c:258
+#: alias.c:272
 msgid "Warning: This alias name may not work.  Fix it?"
-msgstr "Kontuz: Alias izen honek ez du funtzionatuko.  Konpondu?"
+msgstr "Kontuz: ezizena izen honek ez du funtzionatuko.  Konpondu?"
 
-#: alias.c:283
+#: alias.c:297
 msgid "Address: "
-msgstr "Helbidea:"
+msgstr "Helbidea: "
 
-#: alias.c:293 send.c:207
+#: alias.c:307 send.c:206
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "Errorea: '%s' IDN okerra da."
 
-#: alias.c:305
+#: alias.c:319
 msgid "Personal name: "
 msgstr "Pertsona izena: "
 
-#: alias.c:314
+#: alias.c:328
 #, c-format
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] Onartu?"
 
-#: alias.c:331 recvattach.c:432 recvattach.c:455 recvattach.c:468
-#: recvattach.c:481 recvattach.c:511
+#: alias.c:347 recvattach.c:440 recvattach.c:466 recvattach.c:479
+#: recvattach.c:492 recvattach.c:522
 msgid "Save to file: "
-msgstr "Gorde fitxategian:"
+msgstr "Gorde fitxategian: "
 
-#: alias.c:345
-#, fuzzy
+#: alias.c:361
 msgid "Error reading alias file"
-msgstr "Errorea fitxategia ikusten saiatzerakoan"
+msgstr "Errorea ezizen fitxategia irakurtzean"
 
-#: alias.c:364
+#: alias.c:383
 msgid "Alias added."
-msgstr "Aliasa gehiturik."
+msgstr "Ezizena gehiturik."
 
-#: alias.c:372
-#, fuzzy
+#: alias.c:391
 msgid "Error seeking in alias file"
-msgstr "Errorea fitxategia ikusten saiatzerakoan"
+msgstr "Errorea ezizen fitxategian bilatzean"
 
-#: attach.c:113 attach.c:245 attach.c:477 attach.c:968
+#: attach.c:113 attach.c:245 attach.c:477 attach.c:973
 msgid "Can't match nametemplate, continue?"
 msgstr "Ezin da txantiloi izena aurkitu, jarraitu?"
 
@@ -118,8 +115,8 @@ msgstr "Ezin da txantiloi izena aurkitu, jarraitu?"
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap konposaketa sarrerak hau behar du %%s"
 
-#: attach.c:134 attach.c:266 commands.c:223 compose.c:1183 curs_lib.c:179
-#: curs_lib.c:533
+#: attach.c:134 attach.c:266 commands.c:223 compose.c:1179 curs_lib.c:180
+#: curs_lib.c:548
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "Errorea \"%s\" abiarazten!"
@@ -139,19 +136,18 @@ msgstr "Huts fitxategia berrizendatzerakoan."
 #: attach.c:197
 #, c-format
 msgid "No mailcap compose entry for %s, creating empty file."
-msgstr ""
-"%s-rentza ez dago mailcap sorrera sarrerarik, fitxategi hutsa sortzen. "
+msgstr "%s-rentza ez dago mailcap sorrera sarrerarik, fitxategi hutsa sortzen."
 
 #. For now, editing requires a file, no piping
 #: attach.c:258
 #, c-format
 msgid "Mailcap Edit entry requires %%s"
-msgstr "Mailcap Editatze sarrerak %%s behar du"
+msgstr "Mailcap edizio sarrerak %%s behar du"
 
 #: attach.c:280
 #, c-format
 msgid "No mailcap edit entry for %s"
-msgstr "ez dago mailcap editatze sarrerarik %s-rentzat"
+msgstr "Ez dago mailcap edizio sarrerarik %s-rentzat"
 
 #: attach.c:443
 msgid "No matching mailcap entry found.  Viewing as text."
@@ -165,175 +161,195 @@ msgstr "MIME mota ezarri gabe.  Ezin da gehigarria erakutsi."
 msgid "Cannot create filter"
 msgstr "Ezin da iragazkia sortu"
 
-#: attach.c:676 attach.c:708 attach.c:1001 attach.c:1059 handler.c:1279
-#: pgpkey.c:571 pgpkey.c:760
+#: attach.c:554
+#, c-format
+msgid "---Command: %-20.20s Description: %s"
+msgstr ""
+
+#: attach.c:558
+#, c-format
+msgid "---Command: %-30.30s Attachment: %s"
+msgstr ""
+
+#: attach.c:604
+#, fuzzy, c-format
+msgid "---Attachment: %s: %s"
+msgstr "-- Gehigarriak"
+
+#: attach.c:607
+#, fuzzy, c-format
+msgid "---Attachment: %s"
+msgstr "-- Gehigarriak"
+
+#: attach.c:677 attach.c:709 attach.c:1006 attach.c:1064 handler.c:1285
+#: pgpkey.c:570 pgpkey.c:759
 msgid "Can't create filter"
 msgstr "Ezin da iragazkia sortu"
 
-#: attach.c:840
+#: attach.c:845
 msgid "Write fault!"
 msgstr "Idaztean huts!"
 
-#: attach.c:1082
+#: attach.c:1087
 msgid "I don't know how to print that!"
 msgstr "Ez dakit non inprimatu hau!"
 
-#: browser.c:46
+#: browser.c:47
 msgid "Chdir"
 msgstr "Karpetara joan: "
 
-#: browser.c:47
+#: browser.c:48
 msgid "Mask"
 msgstr "Maskara"
 
-#: browser.c:383 browser.c:1022
+#: browser.c:400 browser.c:1055
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s ez da karpeta bat."
 
-#: browser.c:507
+#: browser.c:539
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "Postakutxak [%d]"
 
-#: browser.c:514
+#: browser.c:546
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "Harpidedun [%s], Fitxategi maskara: %s"
 
-#: browser.c:518
+#: browser.c:550
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "Karpeta [%s], Fitxategi maskara: %s"
 
-#: browser.c:530
+#: browser.c:562
 msgid "Can't attach a directory!"
 msgstr "Ezin da karpeta bat gehitu!"
 
-#: browser.c:670 browser.c:1091 browser.c:1189
+#: browser.c:701 browser.c:1123 browser.c:1221
 msgid "No files match the file mask"
 msgstr "Ez da fitxategi maskara araberako fitxategirik aurkitu"
 
-#: browser.c:876
+#: browser.c:905
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "\"Create\" IMAP posta kutxek bakarrik onartzen dute"
 
-#: browser.c:897
+#: browser.c:929
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "Berrizendaketa IMAP postakutxentzat bakarrik onartzen da"
 
-#: browser.c:919
+#: browser.c:952
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "\"Delete\" IMAP posta kutxek bakarrik onartzen dute"
 
-#: browser.c:929
+#: browser.c:962
 msgid "Cannot delete root folder"
 msgstr "Ezin da erro karpeta ezabatu"
 
-#: browser.c:932
+#: browser.c:965
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "Benetan \"%s\" postakutxa ezabatu?"
 
-#: browser.c:946
+#: browser.c:979
 msgid "Mailbox deleted."
 msgstr "Postakutxa ezabatua."
 
-#: browser.c:952
+#: browser.c:985
 msgid "Mailbox not deleted."
 msgstr "Postakutxa ez da ezabatu."
 
-#: browser.c:971
+#: browser.c:1004
 msgid "Chdir to: "
 msgstr "Karpetara joan: "
 
-#: browser.c:1010 browser.c:1084
+#: browser.c:1043 browser.c:1116
 msgid "Error scanning directory."
 msgstr "Errorea karpeta arakatzerakoan."
 
-#: browser.c:1034
+#: browser.c:1067
 msgid "File Mask: "
-msgstr "Fitxategi maskara:"
+msgstr "Fitxategi maskara: "
 
-#: browser.c:1107
+#: browser.c:1139
 msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "Atzekoz aurrera (d)ataz, (a)lphaz, tamaina(z) edo ez orde(n)atu?"
+msgstr "Atzekoz aurrera (d)ataz, (a)lphaz, tamaina(z) edo ez orde(n)atu? "
 
-#: browser.c:1108
+#: browser.c:1140
 msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
-msgstr "(d)ataz, (a)lpha, tamaina(z) edo ez orde(n)atu?"
+msgstr "(d)ataz, (a)lpha, tamaina(z) edo ez orde(n)atu? "
 
-#: browser.c:1109
+#: browser.c:1141
 msgid "dazn"
 msgstr "fats"
 
-#: browser.c:1176
+#: browser.c:1208
 msgid "New file name: "
 msgstr "Fitxategi izen berria: "
 
-#: browser.c:1207
+#: browser.c:1239
 msgid "Can't view a directory"
 msgstr "Ezin da karpeta ikusi"
 
-#: browser.c:1224
+#: browser.c:1256
 msgid "Error trying to view file"
 msgstr "Errorea fitxategia ikusten saiatzerakoan"
 
-#: buffy.c:424
+#: buffy.c:486
 msgid "New mail in "
 msgstr "Posta berria "
 
 #: color.c:326
 #, c-format
 msgid "%s: color not supported by term"
-msgstr "%s: kolorea ez du terminalak onartzen."
+msgstr "%s: kolorea ez du terminalak onartzen"
 
 #: color.c:332
 #, c-format
 msgid "%s: no such color"
-msgstr "%s:ez da kolorea aurkitu"
+msgstr "%s: ez da kolorea aurkitu"
 
-#: color.c:378 color.c:579 color.c:590
+#: color.c:378 color.c:584 color.c:595
 #, c-format
 msgid "%s: no such object"
-msgstr "%s:ez da objektua aurkitu"
+msgstr "%s: ez da objektua aurkitu"
 
-#: color.c:385
-#, c-format
-msgid "%s: command valid only for index object"
-msgstr "%s:komandoa sarrera objektutan bakarrik erabili daiteke"
+#: color.c:391
+#, fuzzy, c-format
+msgid "%s: command valid only for index, body, header objects"
+msgstr "%s: komandoa sarrera objektutan bakarrik erabili daiteke"
 
-#: color.c:393
+#: color.c:399
 #, c-format
 msgid "%s: too few arguments"
 msgstr "%s: argumentu gutxiegi"
 
-#: color.c:567
+#: color.c:572
 msgid "Missing arguments."
 msgstr "Ez dira argumentuak aurkitzen."
 
-#: color.c:606 color.c:617
+#: color.c:611 color.c:622
 msgid "color: too few arguments"
 msgstr "kolorea:argumentu gutxiegi"
 
-#: color.c:640
+#: color.c:645
 msgid "mono: too few arguments"
 msgstr "mono: argumentu gutxiegi"
 
-#: color.c:660
+#: color.c:665
 #, c-format
 msgid "%s: no such attribute"
-msgstr "%s: Ez da atributua aurkitu"
+msgstr "%s: ez da atributua aurkitu"
 
-#: color.c:700 hook.c:69 hook.c:77 keymap.c:751
+#: color.c:705 hook.c:69 hook.c:77 keymap.c:902
 msgid "too few arguments"
 msgstr "argumentu gutxiegi"
 
-#: color.c:709 hook.c:83
+#: color.c:714 hook.c:83
 msgid "too many arguments"
 msgstr "argumentu gehiegi"
 
-#: color.c:725
+#: color.c:730
 msgid "default colors not supported"
 msgstr "lehenetsitako kolorea ez da onartzen"
 
@@ -342,9 +358,9 @@ msgstr "lehenetsitako kolorea ez da onartzen"
 msgid "Verify PGP signature?"
 msgstr "PGP sinadura egiaztatu?"
 
-#: commands.c:115 mbox.c:754
+#: commands.c:115 mbox.c:787
 msgid "Could not create temporary file!"
-msgstr "Ezin da aldiroko fitxategi sortu!"
+msgstr "Ezin da behin-behineko fitxategia sortu!"
 
 #: commands.c:128
 msgid "Cannot create display filter"
@@ -360,7 +376,7 @@ msgstr "S/MIME sinadura arrakastatsuki egiaztaturik."
 
 #: commands.c:191
 msgid "S/MIME certificate owner does not match sender."
-msgstr "S/MIME ziurtagiriaren jabea ez da mezua bidali duena"
+msgstr "S/MIME ziurtagiriaren jabea ez da mezua bidali duena."
 
 #: commands.c:194 commands.c:205
 msgid "Warning: Part of this message has not been signed."
@@ -372,180 +388,185 @@ msgstr "S/MIME sinadura EZIN da egiaztatu."
 
 #: commands.c:203
 msgid "PGP signature successfully verified."
-msgstr "PGP sinadura arrakastatsuki egiaztaturik.."
+msgstr "PGP sinadura arrakastatsuki egiaztaturik."
 
 #: commands.c:207
 msgid "PGP signature could NOT be verified."
 msgstr "PGP sinadura EZIN da egiaztatu."
 
-#: commands.c:230
+#: commands.c:231
 msgid "Command: "
 msgstr "Komandoa: "
 
-#: commands.c:250 recvcmd.c:147
+#: commands.c:256
+#, fuzzy
+msgid "Warning: message has no From: header"
+msgstr "Abisua -.Mezu honen zati bat ezin izan da sinatu."
+
+#: commands.c:274 recvcmd.c:171
 msgid "Bounce message to: "
 msgstr "Mezuak hona errebotatu: "
 
-#: commands.c:252 recvcmd.c:149
+#: commands.c:276 recvcmd.c:173
 msgid "Bounce tagged messages to: "
 msgstr "Markatutako mezuak hona errebotatu: "
 
-#: commands.c:267 recvcmd.c:158
+#: commands.c:291 recvcmd.c:182
 msgid "Error parsing address!"
 msgstr "Errorea helbidea analizatzean!"
 
-#: commands.c:275 recvcmd.c:166
+#: commands.c:299 recvcmd.c:190
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "IDN Okerra: '%s'"
 
-#: commands.c:286 recvcmd.c:180
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce message to %s"
 msgstr "Mezua %s-ra errebotatu"
 
-#: commands.c:286 recvcmd.c:180
+#: commands.c:310 recvcmd.c:204
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "Mezuak %s-ra errebotatu"
 
-#: commands.c:302 recvcmd.c:196
+#: commands.c:326 recvcmd.c:220
 msgid "Message not bounced."
 msgstr "Mezua ez da errebotatu."
 
-#: commands.c:302 recvcmd.c:196
+#: commands.c:326 recvcmd.c:220
 msgid "Messages not bounced."
 msgstr "Mezuak ez dira errebotatu."
 
-#: commands.c:312 recvcmd.c:215
+#: commands.c:336 recvcmd.c:239
 msgid "Message bounced."
 msgstr "Mezua errebotaturik."
 
-#: commands.c:312 recvcmd.c:215
+#: commands.c:336 recvcmd.c:239
 msgid "Messages bounced."
 msgstr "Mezuak errebotaturik."
 
-#: commands.c:389 commands.c:423 commands.c:440
+#: commands.c:413 commands.c:447 commands.c:464
 msgid "Can't create filter process"
 msgstr "Ezin da iragazki prozesua sortu"
 
-#: commands.c:469
+#: commands.c:493
 msgid "Pipe to command: "
-msgstr "komandora hodia egin:"
+msgstr "Komandora hodia egin: "
 
-#: commands.c:486
+#: commands.c:510
 msgid "No printing command has been defined."
 msgstr "Ez da inprimatze komandorik ezarri."
 
-#: commands.c:491
+#: commands.c:515
 msgid "Print message?"
 msgstr "Mezua inprimatu?"
 
-#: commands.c:491
+#: commands.c:515
 msgid "Print tagged messages?"
 msgstr "Markatutako mezuak inprimatu?"
 
-#: commands.c:500
+#: commands.c:524
 msgid "Message printed"
 msgstr "Mezua inprimaturik"
 
-#: commands.c:500
+#: commands.c:524
 msgid "Messages printed"
 msgstr "Mezuak inprimaturik"
 
-#: commands.c:502
+#: commands.c:526
 msgid "Message could not be printed"
 msgstr "Ezin da mezua inprimatu"
 
-#: commands.c:503
+#: commands.c:527
 msgid "Messages could not be printed"
 msgstr "Ezin dira mezuak inprimatu"
 
-#: commands.c:512
+#: commands.c:536
 msgid ""
 "Rev-Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s"
 "(p)am?: "
 msgstr ""
 "Alderantziz-Ordenatu (d)ata/(j)at/ja(s)/(g)aia/(n)ori/(h)aria/(e)z-ordenatu/"
-"(t)amaina/(p)untuak/(z)abor-posta?:"
+"(t)amaina/(p)untuak/(z)abor-posta?: "
 
-#: commands.c:513
+#: commands.c:537
 msgid ""
 "Sort (d)ate/(f)rm/(r)ecv/(s)ubj/t(o)/(t)hread/(u)nsort/si(z)e/s(c)ore/s(p)"
 "am?: "
 msgstr ""
 "Ordenatu (d)ata/(j)at/ja(s)/(g)aia/(n)ori/(h)aria/(e)z-ordenatu/(t)amaina/(p)"
-"untuak/(z)abor-posta?:"
+"untuak/(z)abor-posta?  "
 
-#: commands.c:514
+#: commands.c:538
 msgid "dfrsotuzcp"
 msgstr "djsgnhetpz"
 
-#: commands.c:571
+#: commands.c:595
 msgid "Shell command: "
 msgstr "Shell komandoa: "
 
-#: commands.c:716
+#: commands.c:738
 #, c-format
 msgid "Decode-save%s to mailbox"
-msgstr "deskodifikatu-gorde%s postakutxan"
+msgstr "Deskodifikatu-gorde%s postakutxan"
 
-#: commands.c:717
+#: commands.c:739
 #, c-format
 msgid "Decode-copy%s to mailbox"
-msgstr "deskodifikatu-kopiatu%s postakutxan"
+msgstr "Deskodifikatu-kopiatu%s postakutxan"
 
-#: commands.c:718
+#: commands.c:740
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "Desenkriptatu-gorde%s postakutxan"
 
-#: commands.c:719
+#: commands.c:741
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "Desenkriptatu-kopiatu%s postakutxan"
 
-#: commands.c:720
+#: commands.c:742
 #, c-format
 msgid "Save%s to mailbox"
-msgstr "%s postakutxan gorde"
+msgstr "%s posta-kutxan gorde"
 
-#: commands.c:720
+#: commands.c:742
 #, c-format
 msgid "Copy%s to mailbox"
-msgstr "%s postakutxan kopiatu"
+msgstr "%s posta-kutxan kopiatu"
 
-#: commands.c:721
+#: commands.c:743
 msgid " tagged"
 msgstr " markatua"
 
-#: commands.c:794
+#: commands.c:816
 #, c-format
 msgid "Copying to %s..."
 msgstr "Hona kopiatzen %s..."
 
-#: commands.c:929
+#: commands.c:932
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "Bidali aurretik %s-ra bihurtu?"
 
-#: commands.c:939
+#: commands.c:942
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "Eduki mota %s-ra aldatzen."
 
-#: commands.c:944
+#: commands.c:947
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "Karaktere ezarpena %s-ra aldaturik: %s."
 
-#: commands.c:946
+#: commands.c:949
 msgid "not converting"
-msgstr "Ez da bihurtzen"
+msgstr "ez da bihurtzen"
 
-#: commands.c:946
+#: commands.c:949
 msgid "converting"
-msgstr "Bihurtzen"
+msgstr "bihurtzen"
 
 #: compose.c:47
 msgid "There are no attachments."
@@ -559,7 +580,7 @@ msgstr "Bidali"
 msgid "Abort"
 msgstr "Ezeztatu"
 
-#: compose.c:94 compose.c:668
+#: compose.c:94 compose.c:664
 msgid "Attach file"
 msgstr "Fitxategia gehitu"
 
@@ -567,297 +588,308 @@ msgstr "Fitxategia gehitu"
 msgid "Descrip"
 msgstr "Deskrib"
 
-#: compose.c:132
+#: compose.c:119
+#, fuzzy
+msgid "Not supported"
+msgstr "Markatzea ez da onartzen."
+
+#: compose.c:124
 msgid "Sign, Encrypt"
 msgstr "Sinatu, Enkriptatu"
 
-#: compose.c:134
+#: compose.c:126
 msgid "Encrypt"
 msgstr "Enkriptatu"
 
-#: compose.c:136
+#: compose.c:128
 msgid "Sign"
 msgstr "Sinatu"
 
-#: compose.c:138
-msgid "Clear"
-msgstr "Garbitu"
+#: compose.c:130
+msgid "None"
+msgstr ""
 
-#: compose.c:145
-msgid " (inline)"
+#: compose.c:137
+#, fuzzy
+msgid " (inline PGP)"
 msgstr " (barruan)"
 
-#: compose.c:147
+#: compose.c:139
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:155 compose.c:159
+#: compose.c:143
+#, fuzzy
+msgid " (S/MIME)"
+msgstr " (PGP/MIME)"
+
+#: compose.c:152 compose.c:156
 msgid " sign as: "
 msgstr " horrela sinatu: "
 
-#: compose.c:155 compose.c:159
+#: compose.c:152 compose.c:156
 msgid "<default>"
 msgstr "<lehenetsia>"
 
-#: compose.c:167
+#: compose.c:164
 msgid "Encrypt with: "
-msgstr "honekin enkriptatu: "
+msgstr "Honekin enkriptatu: "
 
-#: compose.c:221
+#: compose.c:218
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] ez da gehiago existitzen!"
 
-#: compose.c:229
+#: compose.c:226
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
-msgstr "%s [#%d] aldaturik. kodeatzea eguneratu?"
+msgstr "%s [#%d] aldaturik. Kodeketea eguneratu?"
 
-#: compose.c:272
+#: compose.c:269
 msgid "-- Attachments"
 msgstr "-- Gehigarriak"
 
-#: compose.c:302
+#: compose.c:299
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "Kontuz: '%s' IDN okerra da."
 
-#: compose.c:325
+#: compose.c:322
 msgid "You may not delete the only attachment."
 msgstr "Ezin duzu gehigarri bakarra ezabatu."
 
-#: compose.c:601 send.c:1561
+#: compose.c:597 send.c:1586
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "IDN okerra \"%s\"-n: '%s'"
 
-#: compose.c:684
+#: compose.c:680
 msgid "Attaching selected files..."
 msgstr "Aukeratutako fitxategia gehitzen..."
 
-#: compose.c:696
+#: compose.c:692
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "Ezin da %s gehitu!"
 
-#: compose.c:715
+#: compose.c:711
 msgid "Open mailbox to attach message from"
 msgstr "Bertatik mezu bat gehitzeko postakutxa ireki"
 
-#: compose.c:753
+#: compose.c:749
 msgid "No messages in that folder."
 msgstr "Ez dago mezurik karpeta honetan."
 
-#: compose.c:762
+#: compose.c:758
 msgid "Tag the messages you want to attach!"
 msgstr "Gehitu nahi dituzun mezuak markatu!"
 
-#: compose.c:794
+#: compose.c:790
 msgid "Unable to attach!"
 msgstr "Ezin da gehitu!"
 
-#: compose.c:845
+#: compose.c:841
 msgid "Recoding only affects text attachments."
 msgstr "Gordetzeak mezu gehigarriei bakarrik eragiten die."
 
-#: compose.c:850
+#: compose.c:846
 msgid "The current attachment won't be converted."
 msgstr "Gehigarri hau ezin da bihurtu."
 
-#: compose.c:852
+#: compose.c:848
 msgid "The current attachment will be converted."
 msgstr "Gehigarri hau bihurtua izango da."
 
-#: compose.c:927
+#: compose.c:923
 msgid "Invalid encoding."
-msgstr "Baliogabeko kodifikazioa"
+msgstr "Kodifikazio baliogabea."
 
-#: compose.c:953
+#: compose.c:949
 msgid "Save a copy of this message?"
 msgstr "Mezu honen kopia gorde?"
 
-#: compose.c:1009
+#: compose.c:1005
 msgid "Rename to: "
-msgstr "honetara izenaldatu: "
+msgstr "Honetara berrizendatu: "
 
-#: compose.c:1014 editmsg.c:96 editmsg.c:121 sendlib.c:857
+#: compose.c:1010 editmsg.c:96 editmsg.c:121 sendlib.c:872
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "Ezin egiaztatu %s egoera: %s"
 
-#: compose.c:1041
+#: compose.c:1037
 msgid "New file: "
 msgstr "Fitxategi berria: "
 
-#: compose.c:1054
+#: compose.c:1050
 msgid "Content-Type is of the form base/sub"
-msgstr "Eduki-mota bse/sub formatukoa da"
+msgstr "Eduki-mota base/sub modukoa da"
 
-#: compose.c:1060
+#: compose.c:1056
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "%s eduki mota ezezaguna"
 
-#: compose.c:1073
+#: compose.c:1069
 #, c-format
 msgid "Can't create file %s"
-msgstr "%s fitxategia ezin da sortu"
+msgstr "Ezin da %s fitxategia sortu"
 
-#: compose.c:1081
+#: compose.c:1077
 msgid "What we have here is a failure to make an attachment"
-msgstr "Hemen duguna gehigarria sortzerakoan huts bat da."
+msgstr "Hemen duguna gehigarria sortzerakoan huts bat da"
 
-#: compose.c:1142
+#: compose.c:1138
 msgid "Postpone this message?"
 msgstr "Mezu hau atzeratu?"
 
-#: compose.c:1201
+#: compose.c:1197
 msgid "Write message to mailbox"
 msgstr "Mezuak postakutxan gorde"
 
-#: compose.c:1204
+#: compose.c:1200
 #, c-format
 msgid "Writing message to %s ..."
-msgstr "mezuak %s-n gordetzen..."
+msgstr "Mezuak %s-n gordetzen ..."
 
-#: compose.c:1213
+#: compose.c:1209
 msgid "Message written."
 msgstr "Mezua idazten."
 
-#: compose.c:1225
+#: compose.c:1221
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "S/MIME dagoeneko aukeraturik. Garbitu era jarraitu ? "
 
-#: compose.c:1251
+#: compose.c:1247
 msgid "PGP already selected. Clear & continue ? "
 msgstr "PGP dagoeneko aukeraturik. Garbitu eta jarraitu ? "
 
-#: crypt-gpgme.c:345
+#: crypt-gpgme.c:358
 #, c-format
 msgid "error creating gpgme context: %s\n"
 msgstr "errorea gpgme ingurunea sortzean: %s\n"
 
-#: crypt-gpgme.c:355
+#: crypt-gpgme.c:368
 #, c-format
 msgid "error enabling CMS protocol: %s\n"
 msgstr "errorea CMS protokoloa gaitzerakoan: %s\n"
 
-#: crypt-gpgme.c:375
+#: crypt-gpgme.c:388
 #, c-format
 msgid "error creating gpgme data object: %s\n"
 msgstr "errorea gpgme datu objektua sortzerakoan: %s\n"
 
-#: crypt-gpgme.c:441 crypt-gpgme.c:459 crypt-gpgme.c:1400
+#: crypt-gpgme.c:454 crypt-gpgme.c:472 crypt-gpgme.c:1431
 #, c-format
 msgid "error allocating data object: %s\n"
 msgstr "errorea datu objektua esleitzerakoan: %s\n"
 
-#: crypt-gpgme.c:477
+#: crypt-gpgme.c:490
 #, c-format
 msgid "error rewinding data object: %s\n"
 msgstr "errorea datu objektua atzera eraman: %s\n"
 
-#: crypt-gpgme.c:499 crypt-gpgme.c:546
+#: crypt-gpgme.c:512 crypt-gpgme.c:559
 #, c-format
 msgid "error reading data object: %s\n"
 msgstr "errorea datu objektua irakurtzerakoan: %s\n"
 
-#: crypt-gpgme.c:607
+#: crypt-gpgme.c:620
 #, c-format
 msgid "error adding recipient `%s': %s\n"
-msgstr "errorea `%s' hartzailea geitzerakoan: %s\n"
+msgstr "errorea `%s' hartzailea gehitzerakoan: %s\n"
 
-#: crypt-gpgme.c:645
+#: crypt-gpgme.c:658
 #, c-format
 msgid "secret key `%s' not found: %s\n"
 msgstr "ez da `%s' gako sekretua aurkitu: %s\n"
 
-#: crypt-gpgme.c:655
+#: crypt-gpgme.c:668
 #, c-format
 msgid "ambiguous specification of secret key `%s'\n"
 msgstr "`%s' gako sekretu espezifikazio anbiguoa\n"
 
-#: crypt-gpgme.c:667
+#: crypt-gpgme.c:680
 #, c-format
 msgid "error setting secret key `%s': %s\n"
 msgstr "errorea`%s' gako sekretua ezartzerakoan: %s\n"
 
-#: crypt-gpgme.c:684
-#, fuzzy, c-format
+#: crypt-gpgme.c:697
+#, c-format
 msgid "error setting PKA signature notation: %s\n"
-msgstr "Errorea gako argibideak eskuratzen: "
+msgstr "errorea PKA sinadura notazioa ezartzean: %s\n"
 
-#: crypt-gpgme.c:740
+#: crypt-gpgme.c:753
 #, c-format
 msgid "error encrypting data: %s\n"
 msgstr "errorea datuak enkriptatzerakoan: %s\n"
 
-#: crypt-gpgme.c:850
+#: crypt-gpgme.c:870
 #, c-format
 msgid "error signing data: %s\n"
 msgstr "errorea datuak sinatzerakoan: %s\n"
 
-#: crypt-gpgme.c:1045
+#: crypt-gpgme.c:1065
 msgid "Warning: One of the keys has been revoked\n"
 msgstr "Abisua: Gakoetako bat errebokatua izan da\n"
 
-#: crypt-gpgme.c:1054
+#: crypt-gpgme.c:1074
 msgid "Warning: The key used to create the signature expired at: "
 msgstr "Abisua: sinadura sortzeko erabilitako gakoa iraungitze data: "
 
-#: crypt-gpgme.c:1060
+#: crypt-gpgme.c:1080
 msgid "Warning: At least one certification key has expired\n"
 msgstr "Abisua: Ziurtagiri bat behintzat iraungi egin da\n"
 
-#: crypt-gpgme.c:1076
+#: crypt-gpgme.c:1096
 msgid "Warning: The signature expired at: "
 msgstr "Abisua: Sinadura iraungitze data: "
 
-#: crypt-gpgme.c:1082
+#: crypt-gpgme.c:1102
 msgid "Can't verify due to a missing key or certificate\n"
 msgstr "Ezin da egiaztatu gakoa edo ziurtagiria falta delako\n"
 
-#: crypt-gpgme.c:1087
+#: crypt-gpgme.c:1107
 msgid "The CRL is not available\n"
 msgstr "CRL ez da erabilgarri\n"
 
-#: crypt-gpgme.c:1093
+#: crypt-gpgme.c:1113
 msgid "Available CRL is too old\n"
 msgstr "CRL erabilgarria zaharregia da\n"
 
-#: crypt-gpgme.c:1098
+#: crypt-gpgme.c:1118
 msgid "A policy requirement was not met\n"
 msgstr "Politika behar bat ez da aurkitu\n"
 
-#: crypt-gpgme.c:1107
+#: crypt-gpgme.c:1127
 msgid "A system error occurred"
 msgstr "Sistema errore bat gertatu da"
 
-#: crypt-gpgme.c:1141
-#, fuzzy
+#: crypt-gpgme.c:1161
 msgid "WARNING: PKA entry does not match signer's address: "
-msgstr "ABISUA Zerbitzari ostalari izena ez da ziurtagiriko berdina"
+msgstr "KONTUAZ: PKA sarrera ez da sinatzaile helbidearen berdina: "
 
-#: crypt-gpgme.c:1148
+#: crypt-gpgme.c:1168
 msgid "PKA verified signer's address is: "
-msgstr ""
+msgstr "PKA egiaztaturiko sinatzaile helbidea: "
 
-#: crypt-gpgme.c:1165 crypt-gpgme.c:3114
+#: crypt-gpgme.c:1185 crypt-gpgme.c:3294
 msgid "Fingerprint: "
 msgstr "Hatz-marka: "
 
-#: crypt-gpgme.c:1225
+#: crypt-gpgme.c:1245
 msgid ""
 "WARNING: We have NO indication whether the key belongs to the person named "
 "as shown above\n"
 msgstr ""
-"OHARRA: EZ dugu gakoa behean ikusten den pertsonarena denik dioenseinalerik\n"
+"KONTUZ: EZ dugu ezagutzarik gakoa behean agertzen den pertsonarena dela "
+"frogatzen duenik\n"
 
-#: crypt-gpgme.c:1232
+#: crypt-gpgme.c:1252
 msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
 msgstr "ABISUA: Gakoa ez da aurrerantzean behean agertzen den pertsonarena\n"
 
-#: crypt-gpgme.c:1236
+#: crypt-gpgme.c:1256
 msgid ""
 "WARNING: It is NOT certain that the key belongs to the person named as shown "
 "above\n"
@@ -865,7 +897,16 @@ msgstr ""
 "ABISUA: Ez da egia gakoa aurrerantzean behean agertzen den pertsonarena "
 "dela\n"
 
-#: crypt-gpgme.c:1311
+#: crypt-gpgme.c:1286
+msgid "aka: "
+msgstr ""
+
+#: crypt-gpgme.c:1297
+#, fuzzy
+msgid "created: "
+msgstr "Sortu %s?"
+
+#: crypt-gpgme.c:1362
 msgid "Error getting key information: "
 msgstr "Errorea gako argibideak eskuratzen: "
 
@@ -873,74 +914,79 @@ msgstr "Errorea gako argibideak eskuratzen: "
 #. signature, so we display what a PGP user expects: The name,
 #. fingerprint and the key validity (which is neither fully or
 #. ultimate).
-#: crypt-gpgme.c:1318 crypt-gpgme.c:1351
-msgid "Good signature from: "
+#: crypt-gpgme.c:1369 crypt-gpgme.c:1384
+#, fuzzy
+msgid "Good signature from:"
 msgstr "Hemendik ondo sinaturik: "
 
-#: crypt-gpgme.c:1328
-msgid "                aka: "
-msgstr "                ezizena: "
-
-#: crypt-gpgme.c:1332 crypt-gpgme.c:1354
-msgid "            created: "
-msgstr "            sortua: "
+#: crypt-gpgme.c:1376
+#, fuzzy
+msgid "*BAD* signature from:"
+msgstr "Hemendik ondo sinaturik: "
 
-#: crypt-gpgme.c:1341
-msgid "*BAD* signature claimed to be from: "
-msgstr "*OKERREKO* sinadurak hemengoa dela dio: "
+#: crypt-gpgme.c:1392
+#, fuzzy
+msgid "Problem signature from:"
+msgstr "Hemendik ondo sinaturik: "
 
-#: crypt-gpgme.c:1364
-msgid "Error checking signature"
-msgstr "Errorea sinadura egiaztatzerakoan"
+#: crypt-gpgme.c:1393
+#, fuzzy
+msgid "               expires: "
+msgstr "                ezizena: "
 
 #. Note: We don't need a current time output because GPGME avoids
 #. such an attack by separating the meta information from the
 #. data.
-#: crypt-gpgme.c:1408 crypt-gpgme.c:1623 crypt-gpgme.c:2108
+#: crypt-gpgme.c:1439 crypt-gpgme.c:1654 crypt-gpgme.c:2287
 msgid "[-- Begin signature information --]\n"
 msgstr "[-- Sinadura argibide hasiera --]\n"
 
-#: crypt-gpgme.c:1417
+#: crypt-gpgme.c:1448
 #, c-format
 msgid "Error: verification failed: %s\n"
 msgstr "Errorea: huts egiaztatzerakoan: %s\n"
 
-#: crypt-gpgme.c:1466
+#: crypt-gpgme.c:1497
 #, c-format
 msgid "*** Begin Notation (signature by: %s) ***\n"
-msgstr "*** Idazkera hasiera (sinatzailea: %s) ***\n"
+msgstr "*** Hasiera idazkera (sinadura: %s) ***\n"
 
-#: crypt-gpgme.c:1488
+#: crypt-gpgme.c:1519
 msgid "*** End Notation ***\n"
-msgstr "*** Amaiera Idazkera ***\n"
+msgstr "*** Amaiera idazkera ***\n"
 
-#: crypt-gpgme.c:1496 crypt-gpgme.c:1636 crypt-gpgme.c:2123
+#: crypt-gpgme.c:1527 crypt-gpgme.c:1667 crypt-gpgme.c:2302
 msgid ""
 "[-- End signature information --]\n"
 "\n"
 msgstr ""
-"[-- Sinadura Argibide Amaiera --] \n"
+"[-- Sinadura argibide amaiera --] \n"
 "\n"
 
-#: crypt-gpgme.c:1591
+#: crypt-gpgme.c:1622
 #, c-format
 msgid ""
 "[-- Error: decryption failed: %s --]\n"
 "\n"
 msgstr ""
-"[-- Errorea: Desenkriptatzerakoan huts: %s --]\n"
+"[-- Errorea: desenkriptatzerakoan huts: %s --]\n"
 "\n"
 
-#: crypt-gpgme.c:2083
+#: crypt-gpgme.c:2079
+#, fuzzy, c-format
+msgid "Error extracting key data!\n"
+msgstr "Errorea gako argibideak eskuratzen: "
+
+#: crypt-gpgme.c:2262
 #, c-format
 msgid "Error: decryption/verification failed: %s\n"
 msgstr "Errorea: desenkriptazio/egiaztapenak huts egin du: %s\n"
 
-#: crypt-gpgme.c:2131
+#: crypt-gpgme.c:2310
 msgid "Error: copy data failed\n"
-msgstr "Errorea: Huts datuak kopiatzerakoan\n"
+msgstr "Errorea: huts datuak kopiatzerakoan\n"
 
-#: crypt-gpgme.c:2151 pgp.c:428
+#: crypt-gpgme.c:2330 pgp.c:438
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -948,11 +994,11 @@ msgstr ""
 "[-- PGP MEZU HASIERA --]\n"
 "\n"
 
-#: crypt-gpgme.c:2153 pgp.c:430
+#: crypt-gpgme.c:2332 pgp.c:440
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP PUBLIKO GAKO BLOKE HASIERA --]\n"
 
-#: crypt-gpgme.c:2156 pgp.c:432
+#: crypt-gpgme.c:2335 pgp.c:442
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -960,19 +1006,19 @@ msgstr ""
 "[-- PGP SINATUTAKO MEZUAREN HASIERA --]\n"
 "\n"
 
-#: crypt-gpgme.c:2183 pgp.c:458
+#: crypt-gpgme.c:2362 pgp.c:473
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- PGP MEZU BUKAERA--]\n"
 
-#: crypt-gpgme.c:2185 pgp.c:465
+#: crypt-gpgme.c:2364 pgp.c:480
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP PUBLIKO GAKO BLOKE AMAIERA --]\n"
 
-#: crypt-gpgme.c:2187 pgp.c:467
+#: crypt-gpgme.c:2366 pgp.c:482
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- PGP SINATUTAKO MEZU BUKAERA --]\n"
 
-#: crypt-gpgme.c:2208 pgp.c:497
+#: crypt-gpgme.c:2388 pgp.c:515
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -980,7 +1026,7 @@ msgstr ""
 "[-- Errorea: ezin da PGP mezuaren hasiera aurkitu! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2239 pgp.c:926
+#: crypt-gpgme.c:2419 pgp.c:947
 msgid ""
 "[-- Error: malformed PGP/MIME message! --]\n"
 "\n"
@@ -988,11 +1034,11 @@ msgstr ""
 "[-- Errorea: gaizki eratutako PGP/MIME mezua! --]\n"
 "\n"
 
-#: crypt-gpgme.c:2251 crypt-gpgme.c:2317 pgp.c:939
+#: crypt-gpgme.c:2431 crypt-gpgme.c:2497 pgp.c:960
 msgid "[-- Error: could not create temporary file! --]\n"
-msgstr "[-- Errorea:Ezin da aldiroko fitxategi sortu! --]\n"
+msgstr "[-- Errorea: ezin da behin-behineko fitxategi sortu! --]\n"
 
-#: crypt-gpgme.c:2263
+#: crypt-gpgme.c:2443
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
@@ -1000,7 +1046,7 @@ msgstr ""
 "[-- Hurrengo datuak PGP/MIME bidez sinatu eta enkriptaturik daude --]\n"
 "\n"
 
-#: crypt-gpgme.c:2264 pgp.c:948
+#: crypt-gpgme.c:2444 pgp.c:969
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1008,15 +1054,15 @@ msgstr ""
 "[-- Hurrengo datuak PGP/MIME bidez enkriptaturik daude --]\n"
 "\n"
 
-#: crypt-gpgme.c:2286
+#: crypt-gpgme.c:2466
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- PGP/MIME bidez sinatu eta enkriptaturiko datuen amaiera --]\n"
 
-#: crypt-gpgme.c:2287 pgp.c:968
+#: crypt-gpgme.c:2467 pgp.c:989
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- PGP/MIME bidez enkriptaturiko datuen amaiera --]\n"
 
-#: crypt-gpgme.c:2329
+#: crypt-gpgme.c:2509
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
@@ -1024,7 +1070,7 @@ msgstr ""
 "[-- hurrengo datuak S/MIME bidez sinaturik daude --]\n"
 "\n"
 
-#: crypt-gpgme.c:2330
+#: crypt-gpgme.c:2510
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
@@ -1032,306 +1078,306 @@ msgstr ""
 "[-- hurrengo datuak S/MIME bidez enkriptaturik daude --]\n"
 "\n"
 
-#: crypt-gpgme.c:2360
+#: crypt-gpgme.c:2540
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr "[-- S/MIME bidez sinaturiko datuen amaiera --]\n"
 
-#: crypt-gpgme.c:2361
+#: crypt-gpgme.c:2541
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr "[-- S/MIME bidez enkriptaturiko datuen amaiera --]\n"
 
-#: crypt-gpgme.c:2954
+#: crypt-gpgme.c:3134
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr "[Ezin da erabiltzaile ID hau bistarazi (kodeketa ezezaguna)]"
 
-#: crypt-gpgme.c:2956
+#: crypt-gpgme.c:3136
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr "[Ezin da erabiltzaile ID hau bistarazi (kodeketa baliogabea)]"
 
-#: crypt-gpgme.c:2961
+#: crypt-gpgme.c:3141
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr "[Ezin da erabiltzaile ID hau bistarazi (DN baliogabea)]"
 
-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3220
 msgid " aka ......: "
-msgstr " ezizena ......: "
+msgstr " hemen ......: "
 
-#: crypt-gpgme.c:3040
+#: crypt-gpgme.c:3220
 msgid "Name ......: "
 msgstr "Izena ......: "
 
-#: crypt-gpgme.c:3043 crypt-gpgme.c:3182
+#: crypt-gpgme.c:3223 crypt-gpgme.c:3362
 msgid "[Invalid]"
 msgstr "[Baliogabea]"
 
-#: crypt-gpgme.c:3063 crypt-gpgme.c:3206
+#: crypt-gpgme.c:3243 crypt-gpgme.c:3386
 #, c-format
 msgid "Valid From : %s\n"
-msgstr "Baliozkoa Nork: %s\n"
+msgstr "Baliozko Nork: %s\n"
 
-#: crypt-gpgme.c:3076 crypt-gpgme.c:3219
+#: crypt-gpgme.c:3256 crypt-gpgme.c:3399
 #, c-format
 msgid "Valid To ..: %s\n"
-msgstr "Baliozkoa Nori: %s\n"
+msgstr "Baliozko Nori ..: %s\n"
 
-#: crypt-gpgme.c:3089 crypt-gpgme.c:3232
+#: crypt-gpgme.c:3269 crypt-gpgme.c:3412
 #, c-format
 msgid "Key Type ..: %s, %lu bit %s\n"
-msgstr "Gako Mota ..: %s, %lu bit %s\n"
+msgstr "Gako mota ..: %s, %lu bit %s\n"
 
-#: crypt-gpgme.c:3091 crypt-gpgme.c:3234
+#: crypt-gpgme.c:3271 crypt-gpgme.c:3414
 #, c-format
 msgid "Key Usage .: "
 msgstr "Tekla Erabilera .: "
 
-#: crypt-gpgme.c:3096 crypt-gpgme.c:3239
+#: crypt-gpgme.c:3276 crypt-gpgme.c:3419
 msgid "encryption"
 msgstr "enkriptazioa"
 
-#: crypt-gpgme.c:3097 crypt-gpgme.c:3102 crypt-gpgme.c:3107 crypt-gpgme.c:3240
-#: crypt-gpgme.c:3245 crypt-gpgme.c:3250
+#: crypt-gpgme.c:3277 crypt-gpgme.c:3282 crypt-gpgme.c:3287 crypt-gpgme.c:3420
+#: crypt-gpgme.c:3425 crypt-gpgme.c:3430
 msgid ", "
 msgstr ", "
 
-#: crypt-gpgme.c:3101 crypt-gpgme.c:3244
+#: crypt-gpgme.c:3281 crypt-gpgme.c:3424
 msgid "signing"
 msgstr "sinatzen"
 
-#: crypt-gpgme.c:3106 crypt-gpgme.c:3249
+#: crypt-gpgme.c:3286 crypt-gpgme.c:3429
 msgid "certification"
 msgstr "ziurtapena"
 
-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3326
 #, c-format
 msgid "Serial-No .: 0x%s\n"
 msgstr "Serial-Zb .: 0x%s\n"
 
-#: crypt-gpgme.c:3154
+#: crypt-gpgme.c:3334
 #, c-format
 msgid "Issued By .: "
 msgstr "Emana : "
 
 #. display only the short keyID
-#: crypt-gpgme.c:3173
+#: crypt-gpgme.c:3353
 #, c-format
 msgid "Subkey ....: 0x%s"
 msgstr "Azpigakoa ....: 0x%s"
 
-#: crypt-gpgme.c:3177
+#: crypt-gpgme.c:3357
 msgid "[Revoked]"
 msgstr "[Indargabetua]"
 
-#: crypt-gpgme.c:3187
+#: crypt-gpgme.c:3367
 msgid "[Expired]"
 msgstr "[Iraungia]"
 
-#: crypt-gpgme.c:3192
+#: crypt-gpgme.c:3372
 msgid "[Disabled]"
 msgstr "[Desgaitua]"
 
-#: crypt-gpgme.c:3276 pgpkey.c:560 pgpkey.c:740
+#: crypt-gpgme.c:3456 pgpkey.c:559 pgpkey.c:739
 msgid "Can't create temporary file"
-msgstr "Ezin da aldiroko fitxategia sortu"
+msgstr "Ezin da behin-behineko fitxategia sortu"
 
-#: crypt-gpgme.c:3279
+#: crypt-gpgme.c:3459
 msgid "Collecting data..."
 msgstr "Datuak batzen..."
 
-#: crypt-gpgme.c:3305
+#: crypt-gpgme.c:3485
 #, c-format
 msgid "Error finding issuer key: %s\n"
-msgstr "Errorea jaukitzaile gakoa bilatzerakoan: %s\n"
+msgstr "Errorea jaulkitzaile gakoa bilatzean: %s\n"
 
-#: crypt-gpgme.c:3315
+#: crypt-gpgme.c:3495
 msgid "Error: certification chain to long - stopping here\n"
-msgstr "Errorea: Ziurtagiri kate luzeegia - hemen gelditzen\n"
+msgstr "Errorea: ziurtagiri kate luzeegia - hemen gelditzen\n"
 
-#: crypt-gpgme.c:3326 pgpkey.c:581
+#: crypt-gpgme.c:3506 pgpkey.c:580
 #, c-format
 msgid "Key ID: 0x%s"
-msgstr "Gako ID: 0x%s"
+msgstr "Gako IDa: 0x%s"
 
-#: crypt-gpgme.c:3409
+#: crypt-gpgme.c:3589
 #, c-format
 msgid "gpgme_new failed: %s"
 msgstr "gpgme_new hutsa: %s"
 
-#: crypt-gpgme.c:3448 crypt-gpgme.c:3511
+#: crypt-gpgme.c:3628 crypt-gpgme.c:3691
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr "gpgme_op_keylist_start hutsa: %s"
 
-#: crypt-gpgme.c:3498 crypt-gpgme.c:3539
+#: crypt-gpgme.c:3678 crypt-gpgme.c:3719
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr "gpgme_op_keylist_next hutsa: %s"
 
-#: crypt-gpgme.c:3610
+#: crypt-gpgme.c:3790
 msgid "All matching keys are marked expired/revoked."
-msgstr "Aurkitutako gako guztiak iraungi/Errebokatutak daude."
+msgstr "Pareko gako guztiak iraungita/errebokatua bezala markaturik daude."
 
-#: crypt-gpgme.c:3639 mutt_ssl.c:677 mutt_ssl_gnutls.c:781 pgpkey.c:515
-#: smime.c:432
+#: crypt-gpgme.c:3819 mutt_ssl.c:986 mutt_ssl_gnutls.c:873 pgpkey.c:515
+#: smime.c:420
 msgid "Exit  "
 msgstr "Irten  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3641 pgpkey.c:517 smime.c:434
+#: crypt-gpgme.c:3821 pgpkey.c:517 smime.c:422
 msgid "Select  "
 msgstr "Aukeratu  "
 
 #. __STRCAT_CHECKED__
-#: crypt-gpgme.c:3644 pgpkey.c:520
+#: crypt-gpgme.c:3824 pgpkey.c:520
 msgid "Check key  "
 msgstr "Gakoa egiaztatu  "
 
-#: crypt-gpgme.c:3661
+#: crypt-gpgme.c:3840
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP eta S/MIME gako parekatzea"
 
-#: crypt-gpgme.c:3663
+#: crypt-gpgme.c:3842
 msgid "PGP keys matching"
 msgstr "PGP gako parekatzea"
 
-#: crypt-gpgme.c:3665
+#: crypt-gpgme.c:3844
 msgid "S/MIME keys matching"
 msgstr "S/MIME gako parekatzea"
 
-#: crypt-gpgme.c:3667
+#: crypt-gpgme.c:3846
 msgid "keys matching"
 msgstr "gako parekatzea"
 
-#: crypt-gpgme.c:3670
+#: crypt-gpgme.c:3849
 #, c-format
 msgid "%s <%s>."
 msgstr "%s <%s>."
 
-#: crypt-gpgme.c:3672
+#: crypt-gpgme.c:3851
 #, c-format
 msgid "%s \"%s\"."
 msgstr "%s \"%s\"."
 
-#: crypt-gpgme.c:3699 pgpkey.c:601
+#: crypt-gpgme.c:3878 pgpkey.c:600
 msgid "This key can't be used: expired/disabled/revoked."
-msgstr "Gako hau ezin da erabili: denboraz kanpo/ezgaitua/Errebokatuta"
+msgstr "Gako hau ezin da erabili: iraungita/desgaitua/errebokatuta."
 
-#: crypt-gpgme.c:3713 pgpkey.c:613
+#: crypt-gpgme.c:3892 pgpkey.c:612
 msgid "ID is expired/disabled/revoked."
 msgstr "ID-a denboraz kanpo/ezgaitua/ukatua dago."
 
-#: crypt-gpgme.c:3733 pgpkey.c:617
+#: crypt-gpgme.c:3912 pgpkey.c:616
 msgid "ID has undefined validity."
 msgstr "ID-ak mugagabeko balioa du."
 
-#: crypt-gpgme.c:3736 pgpkey.c:620
+#: crypt-gpgme.c:3915 pgpkey.c:619
 msgid "ID is not valid."
-msgstr "ID-a ez da baliozkoa"
+msgstr "ID-a ez da baliozkoa."
 
-#: crypt-gpgme.c:3739 pgpkey.c:623
+#: crypt-gpgme.c:3918 pgpkey.c:622
 msgid "ID is only marginally valid."
 msgstr "ID bakarrik marginalki erabilgarria da."
 
-#: crypt-gpgme.c:3747 pgpkey.c:627
+#: crypt-gpgme.c:3926 pgpkey.c:626
 #, c-format
 msgid "%s Do you really want to use the key?"
-msgstr "%s Ziur zaude gakoa erabili nahi duzula?"
+msgstr "%sZihur zaude gakoa erabili nahi duzula?"
 
-#: crypt-gpgme.c:3804 crypt-gpgme.c:3917 pgpkey.c:840 pgpkey.c:956
+#: crypt-gpgme.c:3983 crypt-gpgme.c:4096 pgpkey.c:834 pgpkey.c:939
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "\"%s\" duten gakoen bila..."
 
-#: crypt-gpgme.c:4080 pgp.c:1175
+#: crypt-gpgme.c:4259 pgp.c:1196
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "ID-gakoa=\"%s\" %s-rako erabili?"
 
-#: crypt-gpgme.c:4116 pgp.c:1209 smime.c:666 smime.c:791
+#: crypt-gpgme.c:4295 pgp.c:1230 smime.c:650 smime.c:775
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "%s-rako ID-gakoa sartu: "
 
-#: crypt-gpgme.c:4181
+#: crypt-gpgme.c:4360
 msgid ""
 "\n"
 "Using GPGME backend, although no gpg-agent is running"
 msgstr ""
 "\n"
-"GPGME interfazea erabiliaz, nahiz eta ez dagoen gpg-agenterik martxan."
+"GPGME interfazea erabiltzen, gpg-agent ez dagoenez abiaraziririk"
 
-#: crypt-gpgme.c:4209
+#: crypt-gpgme.c:4388
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?"
 msgstr "S/MIME (e)nkript, (s)ina, sin (a) honela, (b)iak, (p)gp or (g)arbitu?"
 
-#: crypt-gpgme.c:4210
+#: crypt-gpgme.c:4389
 msgid "esabpfc"
 msgstr "esabpfg"
 
-#: crypt-gpgme.c:4213
+#: crypt-gpgme.c:4392
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
 msgstr "PGP (e)nkrippt, (s)ina, sin(a)tu hola, (b)iak, s/(m)ime edo (g)abitu?"
 
-#: crypt-gpgme.c:4214
+#: crypt-gpgme.c:4393
 msgid "esabmfc"
 msgstr "esabmfg"
 
 #. sign (a)s
 #. unset_option(OPTCRYPTCHECKTRUST);
 #. sign (a)s
-#: crypt-gpgme.c:4230 pgp.c:1585 smime.c:2036
+#: crypt-gpgme.c:4409 pgp.c:1629 smime.c:2026 smime.c:2038
 msgid "Sign as: "
 msgstr "Honela sinatu: "
 
-#: crypt-gpgme.c:4327
+#: crypt-gpgme.c:4535
 msgid "Failed to verify sender"
 msgstr "Huts bidaltzailea egiaztatzerakoan"
 
-#: crypt-gpgme.c:4330
+#: crypt-gpgme.c:4538
 msgid "Failed to figure out sender"
-msgstr "Huts bidaltzailea erakusterakoan"
+msgstr "Ezin izan da biltzailea atzeman"
 
-#: crypt.c:69
+#: crypt.c:68
 #, c-format
 msgid " (current time: %c)"
 msgstr " (uneko ordua:%c)"
 
-#: crypt.c:75
+#: crypt.c:74
 #, c-format
 msgid "[-- %s output follows%s --]\n"
 msgstr "[-- %s irteera jarraian%s --]\n"
 
-#: crypt.c:90
+#: crypt.c:89
 msgid "Passphrase(s) forgotten."
 msgstr "Pasahitza(k) ahazturik."
 
 #. they really want to send it inline... go for it
-#: crypt.c:147 cryptglue.c:110 pgpkey.c:564 pgpkey.c:753
+#: crypt.c:146 cryptglue.c:110 pgpkey.c:563 pgpkey.c:752
 msgid "Invoking PGP..."
 msgstr "PGP deitzen..."
 
 #. otherwise inline won't work...ask for revert
-#: crypt.c:156
+#: crypt.c:155
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
-msgstr "Mezua ezin da linean bidali.  PGP/MIME erabiliaz itzuli?"
+msgstr "Mezua ezin da erantsia bidali.  PGP/MIME erabiltzea itzuli?"
 
 #. abort
-#: crypt.c:158 send.c:1513
+#: crypt.c:157 send.c:1537
 msgid "Mail not sent."
-msgstr "ePosta ez da bidali."
+msgstr "Eposta ez da bidali."
 
-#: crypt.c:409
+#: crypt.c:408
 msgid "S/MIME messages with no hints on content are unsupported."
-msgstr "edukian gomendiorik ez duten S/MIME mezuak ez dira onartzen"
+msgstr "S/MIME mezuak ez dira onartzen edukian gomendiorik ez badute."
 
-#: crypt.c:628 crypt.c:672
+#: crypt.c:627 crypt.c:671
 msgid "Trying to extract PGP keys...\n"
-msgstr "PGP gakoak ateratzen saiatzen...\n"
+msgstr "PGP-gakoak ateratzen saiatzen...\n"
 
-#: crypt.c:652 crypt.c:692
+#: crypt.c:651 crypt.c:691
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "S/MIME ziurtagiria ateratzen saiatzen...\n"
 
-#: crypt.c:814
+#: crypt.c:813
 msgid ""
 "[-- Error: Inconsistent multipart/signed structure! --]\n"
 "\n"
@@ -1339,16 +1385,16 @@ msgstr ""
 "[-- Errorea: konsistentzi gabeko zatianitz/sinaturiko estruktura! --]\n"
 "\n"
 
-#: crypt.c:835
+#: crypt.c:834
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
 "\n"
 msgstr ""
-"[-- Errorea: zati-anitz/sinatutako protokolo ezezaguna %s! --]\n"
+"[-- Errorea: zatianitz/sinatutako protokolo ezezaguna %s! --]\n"
 "\n"
 
-#: crypt.c:874
+#: crypt.c:873
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -1358,7 +1404,7 @@ msgstr ""
 "\n"
 
 #. Now display the signed body
-#: crypt.c:886
+#: crypt.c:885
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -1366,7 +1412,7 @@ msgstr ""
 "[-- Hurrengo datuak sinaturik daude --]\n"
 "\n"
 
-#: crypt.c:892
+#: crypt.c:891
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -1374,7 +1420,7 @@ msgstr ""
 "[-- Kontuz: Ez da sinadurarik aurkitu. --]\n"
 "\n"
 
-#: crypt.c:898
+#: crypt.c:897
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -1384,294 +1430,301 @@ msgstr ""
 
 #: cryptglue.c:89
 msgid "\"crypt_use_gpgme\" set but not built with GPGME support."
-msgstr "\"crypt_use_gpgme\" ezarria bina ez dago GPGME onarpenaz konpilatua."
+msgstr "\"crypt_use_gpgme\" ezarria bina ez dago GPGME onarpenik."
 
 #: cryptglue.c:112
 msgid "Invoking S/MIME..."
 msgstr "S/MIME deitzen..."
 
-#: curs_lib.c:189
+#: curs_lib.c:194
 msgid "yes"
-msgstr "Bai"
+msgstr "bai"
 
-#: curs_lib.c:190
+#: curs_lib.c:195
 msgid "no"
-msgstr "Ez"
+msgstr "ez"
 
 #. restore blocking operation
-#: curs_lib.c:286
+#: curs_lib.c:297
 msgid "Exit Mutt?"
 msgstr "Mutt utzi?"
 
-#: curs_lib.c:485 mutt_socket.c:570 mutt_ssl.c:329
+#: curs_lib.c:500 mutt_socket.c:577 mutt_ssl.c:358
 msgid "unknown error"
-msgstr "Errore ezezaguna"
+msgstr "errore ezezaguna"
 
-#: curs_lib.c:505
+#: curs_lib.c:520
 msgid "Press any key to continue..."
 msgstr "Edozein tekla jo jarraitzeko..."
 
-#: curs_lib.c:549
+#: curs_lib.c:564
 msgid " ('?' for list): "
 msgstr " (? zerrendarako): "
 
-#: curs_main.c:54 curs_main.c:625 curs_main.c:655
+#: curs_main.c:52 curs_main.c:613 curs_main.c:643
 msgid "No mailbox is open."
 msgstr "Ez da postakutxarik irekirik."
 
-#: curs_main.c:55
+#: curs_main.c:53
 msgid "There are no messages."
 msgstr "Ez daude mezurik."
 
-#: curs_main.c:56 mx.c:1115 pager.c:58 recvattach.c:44
+#: curs_main.c:54 mx.c:1095 pager.c:51 recvattach.c:43
 msgid "Mailbox is read-only."
-msgstr "Irakurtzeko bakarrik Posta kutxa."
+msgstr "Irakurketa soileko posta-kutxa."
 
-#: curs_main.c:57 pager.c:59 recvattach.c:913
+#: curs_main.c:55 pager.c:52 recvattach.c:924
 msgid "Function not permitted in attach-message mode."
-msgstr "Mezu gehitze moduan baimenik gabeko funtzioa."
+msgstr "Mezu-gehitze moduan baimenik gabeko funtzioa."
 
-#: curs_main.c:58
+#: curs_main.c:56
 msgid "No visible messages."
 msgstr "Ez dago ikus daitekeen mezurik."
 
-#: curs_main.c:98 pager.c:89
+#: curs_main.c:96 pager.c:82
 #, c-format
 msgid "Cannot %s: Operation not permitted by ACL"
-msgstr "Ezin da %s: ACL-ak ez du ekintza baimentzen"
+msgstr "Ezin da %s: ACL-ak ez du ekintza onartzen"
 
-#: curs_main.c:253
+#: curs_main.c:251
 msgid "Cannot toggle write on a readonly mailbox!"
-msgstr "Ezin da idatzitarikoa aldatu idaztezina den postakutxa batetan!"
+msgstr "Ezin da idazgarritasuna aldatu idaztezina den postakutxa batetan!"
 
-#: curs_main.c:260
+#: curs_main.c:258
 msgid "Changes to folder will be written on folder exit."
-msgstr "postakutxaren aldaketa bertatik irtetean gordeak izango dira."
+msgstr "Posta-kutxaren aldaketa bertatik irtetean gordeak izango dira."
 
-#: curs_main.c:265
+#: curs_main.c:263
 msgid "Changes to folder will not be written."
 msgstr "Karpetako aldaketak ezin dira gorde."
 
-#: curs_main.c:407
+#: curs_main.c:405
 msgid "Quit"
 msgstr "Irten"
 
-#: curs_main.c:410 recvattach.c:55
+#: curs_main.c:408 recvattach.c:54
 msgid "Save"
 msgstr "Gorde"
 
-#: curs_main.c:411 query.c:50
+#: curs_main.c:409 query.c:49
 msgid "Mail"
 msgstr "Posta"
 
-#: curs_main.c:412 pager.c:1488
+#: curs_main.c:410 pager.c:1538
 msgid "Reply"
 msgstr "Erantzun"
 
-#: curs_main.c:413
+#: curs_main.c:411
 msgid "Group"
 msgstr "Taldea"
 
-#: curs_main.c:502
+#: curs_main.c:495
 msgid "Mailbox was externally modified.  Flags may be wrong."
-msgstr "postakutxa kanpoaldetik aldaturik.  Banderak gaizki egon liteke."
+msgstr "Posta-kutxa kanpoaldetik aldaturik.  Banderak gaizki egon litezke."
 
-#: curs_main.c:505
+#: curs_main.c:498
 msgid "New mail in this mailbox."
-msgstr "ePosta berria postakutxa honetan."
+msgstr "Eposta berria posta-kutxa honetan."
 
-#: curs_main.c:509
+#: curs_main.c:502
 msgid "Mailbox was externally modified."
 msgstr "Postakutxa kanpokoaldetik aldatua."
 
-#: curs_main.c:631
+#: curs_main.c:619
 msgid "No tagged messages."
 msgstr "Ez dago mezu markaturik."
 
-#: curs_main.c:667 menu.c:906
+#: curs_main.c:655 menu.c:914
 msgid "Nothing to do."
 msgstr "Ez dago ezer egiterik."
 
-#: curs_main.c:753
+#: curs_main.c:741
 msgid "Jump to message: "
 msgstr "Mezura salto egin: "
 
-#: curs_main.c:759
+#: curs_main.c:747
 msgid "Argument must be a message number."
 msgstr "Argumentua mezu zenbaki bat izan behar da."
 
-#: curs_main.c:792
+#: curs_main.c:779
 msgid "That message is not visible."
 msgstr "Mezu hau ez da ikusgarria."
 
-#: curs_main.c:795
+#: curs_main.c:782
 msgid "Invalid message number."
 msgstr "Mezu zenbaki okerra."
 
-#: curs_main.c:808 curs_main.c:1849 pager.c:2279
+#: curs_main.c:795 curs_main.c:1872 pager.c:2373
 msgid "delete message(s)"
-msgstr "mezua(k) ezabatu"
+msgstr "ezabatu mezua(k)"
 
-#: curs_main.c:811
+#: curs_main.c:798
 msgid "Delete messages matching: "
 msgstr "Horrelako mezuak ezabatu: "
 
-#: curs_main.c:833
+#: curs_main.c:820
 msgid "No limit pattern is in effect."
 msgstr "Ez da muga patroirik funtzionamenduan."
 
 #. i18n: ask for a limit to apply
-#: curs_main.c:838
+#: curs_main.c:825
 #, c-format
 msgid "Limit: %s"
 msgstr "Muga: %s"
 
-#: curs_main.c:848
+#: curs_main.c:835
 msgid "Limit to messages matching: "
 msgstr "Hau duten mezuetara mugatu: "
 
-#: curs_main.c:870
+#: curs_main.c:857
 msgid "To view all messages, limit to \"all\"."
-msgstr "Mezu guztiak ikusteko, \"dena\"-n ezarri muga."
+msgstr "Mezu guztiak ikusteko, \"dena\" bezala mugatu."
 
-#: curs_main.c:882
+#: curs_main.c:869
 msgid "Quit Mutt?"
 msgstr "Mutt Itxi?"
 
-#: curs_main.c:967
+#: curs_main.c:959
 msgid "Tag messages matching: "
 msgstr "Horrelako mezuak markatu: "
 
-#: curs_main.c:976 curs_main.c:2138 pager.c:2589
+#: curs_main.c:968 curs_main.c:2166 pager.c:2683
 msgid "undelete message(s)"
-msgstr "mezua(k) berreskuratu"
+msgstr "desezabatu mezua(k)"
 
-#: curs_main.c:978
+#: curs_main.c:970
 msgid "Undelete messages matching: "
-msgstr "Hau betetzen duten mezua desezabatu:"
+msgstr "Hau betetzen duten mezua desezabatu: "
 
-#: curs_main.c:986
+#: curs_main.c:978
 msgid "Untag messages matching: "
 msgstr "Horrelako mezuen marka ezabatzen: "
 
-#: curs_main.c:1066
+#: curs_main.c:1004
+msgid "Logged out of IMAP servers."
+msgstr ""
+
+#: curs_main.c:1083
 msgid "Open mailbox in read-only mode"
 msgstr "Postakutxa irakurtzeko bakarrik ireki"
 
-#: curs_main.c:1068
+#: curs_main.c:1085
 msgid "Open mailbox"
 msgstr "Postakutxa ireki"
 
-#: curs_main.c:1078
-#, fuzzy
+#: curs_main.c:1095
 msgid "No mailboxes have new mail"
-msgstr "Ez da posta berririk postakutxetan"
+msgstr "Ez dago posta berririk duen postakutxarik"
 
-#: curs_main.c:1106 mx.c:503 mx.c:652
+#: curs_main.c:1123 mx.c:472 mx.c:621
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s ez da postakutxa bat."
 
-#: curs_main.c:1201
+#: curs_main.c:1222
 msgid "Exit Mutt without saving?"
 msgstr "Mutt gorde gabe itxi?"
 
-#: curs_main.c:1219 curs_main.c:1252 curs_main.c:1696 curs_main.c:1728
-#: flags.c:286 thread.c:1026 thread.c:1081 thread.c:1136
+#: curs_main.c:1240 curs_main.c:1275 curs_main.c:1719 curs_main.c:1751
+#: flags.c:282 thread.c:1029 thread.c:1084 thread.c:1139
 msgid "Threading is not enabled."
 msgstr "Hari bihurketa ez dago gaiturik."
 
-#: curs_main.c:1231
+#: curs_main.c:1252
 msgid "Thread broken"
 msgstr "Haria apurturik"
 
-#: curs_main.c:1249
+#: curs_main.c:1263
+msgid "Thread cannot be broken, message is not part of a thread"
+msgstr ""
+
+#: curs_main.c:1272
 msgid "link threads"
 msgstr "hariak lotu"
 
-#: curs_main.c:1254
+#: curs_main.c:1277
 msgid "No Message-ID: header available to link thread"
 msgstr "Ez da Mezu-ID burua jaso harira lotzeko"
 
-#: curs_main.c:1256
+#: curs_main.c:1279
 msgid "First, please tag a message to be linked here"
 msgstr "Lehenengo, markatu mezu bat hemen lotzeko"
 
-#: curs_main.c:1268
+#: curs_main.c:1291
 msgid "Threads linked"
 msgstr "Hariak loturik"
 
-#: curs_main.c:1271
+#: curs_main.c:1294
 msgid "No thread linked"
 msgstr "Hariak ez dira lotu"
 
-#: curs_main.c:1307 curs_main.c:1332
+#: curs_main.c:1330 curs_main.c:1355
 msgid "You are on the last message."
 msgstr "Azkenengo mezuan zaude."
 
-#: curs_main.c:1314 curs_main.c:1358
+#: curs_main.c:1337 curs_main.c:1381
 msgid "No undeleted messages."
-msgstr "Ez dago ezabatu gabeko mezurik"
+msgstr "Ez dago desezabatutako mezurik."
 
-#: curs_main.c:1351 curs_main.c:1375
+#: curs_main.c:1374 curs_main.c:1398
 msgid "You are on the first message."
 msgstr "Lehenengo mezuan zaude."
 
-#: curs_main.c:1450 pattern.c:1479
+#: curs_main.c:1473 menu.c:759 pager.c:2042 pattern.c:1477
 msgid "Search wrapped to top."
 msgstr "Bilaketa berriz hasieratik hasi da."
 
-#: curs_main.c:1459 pattern.c:1490
+#: curs_main.c:1482 pager.c:2064 pattern.c:1488
 msgid "Search wrapped to bottom."
 msgstr "Bilaketa berriz amaieratik hasi da."
 
-#: curs_main.c:1500
+#: curs_main.c:1523
 msgid "No new messages"
 msgstr "Ez dago mezu berririk"
 
-#: curs_main.c:1500
+#: curs_main.c:1523
 msgid "No unread messages"
 msgstr "Ez dago irakurgabeko mezurik"
 
-#: curs_main.c:1501
+#: curs_main.c:1524
 msgid " in this limited view"
-msgstr " Ikuspen mugatu honetan"
+msgstr " ikuspen mugatu honetan"
 
-#: curs_main.c:1517
+#: curs_main.c:1540
 msgid "flag message"
-msgstr "mezuari bandera ezarri"
+msgstr "markatu mezua"
 
-#: curs_main.c:1554 pager.c:2555
+#: curs_main.c:1577 pager.c:2649
 msgid "toggle new"
-msgstr "berria txandakatu"
+msgstr "txandakatu berria"
 
-#: curs_main.c:1631
+#: curs_main.c:1654
 msgid "No more threads."
 msgstr "Ez dago hari gehiagorik."
 
-#: curs_main.c:1633
+#: curs_main.c:1656
 msgid "You are on the first thread."
 msgstr "Lehenengo harian zaude."
 
-#: curs_main.c:1714
+#: curs_main.c:1737
 msgid "Thread contains unread messages."
 msgstr "Irakurgabeko mezuak dituen haria."
 
-#: curs_main.c:1808 pager.c:2262
+#: curs_main.c:1831 pager.c:2342
 msgid "delete message"
-msgstr "mezua ezabatu"
+msgstr "ezabatu mezua"
 
-#: curs_main.c:1890
+#: curs_main.c:1913
 msgid "edit message"
-msgstr "mezua editatu"
+msgstr "editatu mezua"
 
-#: curs_main.c:2021
+#: curs_main.c:2044
 msgid "mark message(s) as read"
-msgstr "mezua(k) irakurria bezala markatu"
+msgstr "markatu mezua(k) irakurri gisa"
 
-#: curs_main.c:2111 pager.c:2574
+#: curs_main.c:2139 pager.c:2668
 msgid "undelete message"
-msgstr "mezua berreskuratu"
+msgstr "desezabatu mezua"
 
 #.
 #. * SLcurses_waddnstr() can't take a "const char *", so this is only
@@ -1689,15 +1742,15 @@ msgid ""
 "~M messages\tsame as ~m, except include headers\n"
 "~p\t\tprint the message\n"
 msgstr ""
-"~~\t\tsoil batez hasten den lerroa txertatu\n"
-"~b erabiltzaileak\terabiltzaileak gehitu Bcc: eremura\n"
-"~c erabiltzaileak\terabiltzaileak gehitu Cc: eremura\n"
-"~f mezuak\tmezuak sartu\n"
-"~F mezuak\t~f bezala, baina goiburuak ere sartzen ditu\n"
-"~h\t\tmezu goiburua editatu\n"
-"~m mezuak\tmezuak sartu eta markatu\n"
-"~M mezuak\t~m bezala, baina goiburuak ere sartzen ditu\n"
-"~p\t\tmezua inprimatu\n"
+"~~\t\ttxertatu ~ soil bat duen lerro bat\n"
+"~b erabiltzaileak\tgehitu erabiltzaileak Bcc: eremuan\n"
+"~c erabiltzaileak\tgehitu erabiltzaileak Cc: eremuan\n"
+"~f mezuak\tmezuak txertatu\n"
+"~F mezuak\t~f-ren berdina, baina buruak ere txertatuaz\n"
+"~h\t\teditatu mezu goiburuak\n"
+"~m mezuak\ttxertatu eta zitatu mezuak\n"
+"~M mezuak\t~m-ren berdina, baina buruak ere txertatuaz\n"
+"~p\t\tinprimatu mezua\n"
 
 #: edit.c:52
 msgid ""
@@ -1711,51 +1764,51 @@ msgid ""
 "~?\t\tthis message\n"
 ".\t\ton a line by itself ends input\n"
 msgstr ""
-"~q\t\tfitxategia idatzi eta editorea itxi\n"
-"~r file\t\tfitxategia editorearen irakurri\n"
-"~t erabiltzaileak\terabiltzaileak gehitu To: eremura\n"
-"~u\t\taurreko lerroa berreskuratu\n"
-"~v\t\tmezua $visual editoran editatu\n"
-"~w file\t\tmezua fitxategira idatzi\n"
-"~x\t\taldaketak ezeztatu eta editorea itxi\n"
+"~q\t\tidatzi fitxategia eta editorea itxi\n"
+"~r fitx\t\tirakurri fitxategi bat editorean\n"
+"~t users\tgehitu erabiltzaileak Nori: eremuan\n"
+"~u\t\tberriz deitu aurreko lerroa\n"
+"~v\t\teditatu mezua $visual editorearekin\n"
+"~w fitx\t\tidatzi mezu fitxategi batetan\n"
+"~x\t\tbaztertu aldaketak eta itxi editorea\n"
 "~?\t\tmezu hau\n"
-".\t\ton a line by itself ends input\n"
+".\t\tbakarrik lerro batetan sarrera amaitzen du\n"
 
-#: edit.c:188
+#: edit.c:187
 #, c-format
 msgid "%d: invalid message number.\n"
 msgstr "%d: mezu zenbaki okerra.\n"
 
-#: edit.c:330
+#: edit.c:329
 msgid "(End message with a . on a line by itself)\n"
-msgstr "(mezua . bakarreko lerro batekin amaitu)\n"
+msgstr "(Mezua . bakarreko lerro batekin amaitu)\n"
 
-#: edit.c:389
+#: edit.c:388
 msgid "No mailbox.\n"
-msgstr "Ez da Postakutxarik\n"
+msgstr "Ez dago postakutxarik.\n"
 
-#: edit.c:393
+#: edit.c:392
 msgid "Message contains:\n"
 msgstr "Mezuaren edukia:\n"
 
-#: edit.c:397 edit.c:454
+#: edit.c:396 edit.c:453
 msgid "(continue)\n"
 msgstr "(jarraitu)\n"
 
-#: edit.c:410
+#: edit.c:409
 msgid "missing filename.\n"
 msgstr "fitxategi izena ez da aurkitu.\n"
 
-#: edit.c:430
+#: edit.c:429
 msgid "No lines in message.\n"
-msgstr "Ez dago lerrorik mezuan\n"
+msgstr "Ez dago lerrorik mezuan.\n"
 
-#: edit.c:447
+#: edit.c:446
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
-msgstr " %s-ren IDN okerra: '%s'\n"
+msgstr "%s-n IDN okerra: '%s'\n"
 
-#: edit.c:465
+#: edit.c:464
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s: editore komando ezezaguna (~? laguntzarako)\n"
@@ -1763,17 +1816,17 @@ msgstr "%s: editore komando ezezaguna (~? laguntzarako)\n"
 #: editmsg.c:78
 #, c-format
 msgid "could not create temporary folder: %s"
-msgstr "Ezin aldiroko karpeta sortu: %s"
+msgstr "ezin behin-behineko karpeta sortu: %s"
 
 #: editmsg.c:90
 #, c-format
 msgid "could not write temporary mail folder: %s"
-msgstr "Ezin da Posta aldiroko karpetan idatzi: %s"
+msgstr "ezin da posta behin-behineko karpetan idatzi: %s"
 
 #: editmsg.c:110
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
-msgstr "Ezin da bein beineko ePosta karpeta ezabatu: %s"
+msgstr "ezin da behin-behineko ePosta karpeta trinkotu: %s"
 
 #: editmsg.c:127
 msgid "Message file is empty!"
@@ -1796,85 +1849,90 @@ msgstr "Ezin karpetan gehitu: %s"
 #: editmsg.c:208
 #, c-format
 msgid "Error. Preserving temporary file: %s"
-msgstr "Errorea. Aldiroko fitxategia gordetzen: %s"
+msgstr "Errorea. Behin behineko fitxategi gordetzen: %s"
 
-#: flags.c:329
+#: flags.c:325
 msgid "Set flag"
 msgstr "Bandera ezarri"
 
-#: flags.c:329
+#: flags.c:325
 msgid "Clear flag"
 msgstr "Bandera ezabatu"
 
-#: handler.c:1049
+#: handler.c:1058
 msgid "[-- Error:  Could not display any parts of Multipart/Alternative! --]\n"
 msgstr "[-- Errorea:  Ezin da Multipart/Alternative zatirik bistarazi! --]\n"
 
-#: handler.c:1166
+#: handler.c:1176
 #, c-format
 msgid "[-- Attachment #%d"
 msgstr "[-- Gehigarria #%d"
 
-#: handler.c:1178
+#: handler.c:1188
 #, c-format
 msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
 msgstr "[-- Mota: %s/%s, Kodifikazioa: %s, Size: %s --]\n"
 
-#: handler.c:1250
+#: handler.c:1204
+#, fuzzy
+msgid "One or more parts of this message could not be displayed"
+msgstr "Abisua -.Mezu honen zati bat ezin izan da sinatu."
+
+#: handler.c:1256
 #, c-format
 msgid "[-- Autoview using %s --]\n"
-msgstr "[-- Autoerakutsi %s erabiliaz --]\n"
+msgstr "[-- Autoerkutsi %s erabiliaz --]\n"
 
-#: handler.c:1251
+#: handler.c:1257
 #, c-format
 msgid "Invoking autoview command: %s"
 msgstr "Autoikusketarako komandoa deitzen: %s"
 
-#: handler.c:1283
+#: handler.c:1289
 #, c-format
 msgid "[-- Can't run %s. --]\n"
-msgstr "[-- %s. ezin da abiarazi--]\n"
+msgstr "[-- Ezin da %s abiarazi. --]\n"
 
-#: handler.c:1302 handler.c:1323
+#: handler.c:1308 handler.c:1329
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- %s-ren irteera estandara Autoikusken--]\n"
+msgstr "[-- Aurreikusi %s-eko stderr --]\n"
 
-#: handler.c:1362
+#: handler.c:1368
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr ""
 "[-- Erroreak: mezu/kanpoko edukiak ez du access-type parametrorik --]\n"
 
-#: handler.c:1383
+#: handler.c:1389
 #, c-format
 msgid "[-- This %s/%s attachment "
-msgstr "[-- %s/%s gehigarri hau "
+msgstr "[--  %s/%s gehigarri hau "
 
-#: handler.c:1390
+#: handler.c:1396
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(tamaina %s byte) "
 
-#: handler.c:1392
+#: handler.c:1398
 msgid "has been deleted --]\n"
 msgstr "ezabatua izan da --]\n"
 
-#: handler.c:1397
+#: handler.c:1403
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- %s-an --]\n"
 
-#: handler.c:1402
+#: handler.c:1408
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- izena: %s --]\n"
 
-#: handler.c:1415 handler.c:1431
+#: handler.c:1421 handler.c:1437
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
-msgstr "[-- %s/%s gehigarria ez da gehituko, --]\n"
+msgstr "[-- %s/%s gehigarria ez dago gehiturik, --]\n"
 
-#: handler.c:1417
+#: handler.c:1423
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
@@ -1882,41 +1940,46 @@ msgstr ""
 "[-- ezarritako kanpoko jatorria denboraz --]\n"
 "[-- kanpo dago. --]\n"
 
-#: handler.c:1435
+#: handler.c:1441
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- eta ezarritako access type %s ez da onartzen --]\n"
 
-#: handler.c:1550
+#: handler.c:1583
 msgid "Error: multipart/signed has no protocol."
 msgstr "Errorea: zati anitzeko sinadurak ez du protokolorik."
 
-#: handler.c:1560
+#: handler.c:1593
 msgid "Error: multipart/encrypted has no protocol parameter!"
 msgstr "Errorea: zati anitzeko sinadurak ez du protokoloparametrorik."
 
-#: handler.c:1600
+#: handler.c:1650
 msgid "Unable to open temporary file!"
-msgstr "Ezin da aldiroko fitxategi ireki!"
+msgstr "Ezin da behin-behineko fitxategia ireki!"
 
-#: handler.c:1667
+#: handler.c:1723
+#, fuzzy
+msgid "[-- This is an attachment "
+msgstr "[--  %s/%s gehigarri hau "
+
+#: handler.c:1725
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s ez da onartzen "
 
-#: handler.c:1672
+#: handler.c:1730
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "('%s' erabili zati hau ikusteko)"
 
-#: handler.c:1674
+#: handler.c:1732
 msgid "(need 'view-attachments' bound to key!)"
-msgstr "('view-attachments' lotzeko tekla behar !)"
+msgstr "(lotu 'view-attachments' tekla bati!)"
 
-#: headers.c:177
+#: headers.c:189
 #, c-format
 msgid "%s: unable to attach file"
-msgstr "%s: ezin gehigarria gehitu."
+msgstr "%s: ezin gehigarria gehitu"
 
 #: help.c:306
 msgid "ERROR: please report this bug"
@@ -1933,7 +1996,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"Lotura Orokorrak:\n"
+"Lotura orokorrak:\n"
 "\n"
 
 #: help.c:364
@@ -1954,24 +2017,24 @@ msgstr "%s-rako laguntza"
 #: history.c:77 history.c:114 history.c:140
 #, c-format
 msgid "Bad history file format (line %d)"
-msgstr ""
+msgstr "Okerreko historia fitxategi formatua (%d lerroa)"
 
-#: hook.c:251
+#: hook.c:250
 #, c-format
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: Ezin da gantxoaren barnekaldetik desengatxatu."
 
-#: hook.c:263
+#: hook.c:262
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook: gantxo mota ezezaguna: %s"
 
-#: hook.c:269
+#: hook.c:268
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook: Ezin da %s bat ezabatu %s baten barnetik."
 
-#: imap/auth.c:108 pop_auth.c:398 smtp.c:452
+#: imap/auth.c:108 pop_auth.c:398 smtp.c:515
 msgid "No authenticators available"
 msgstr "Ez da autentifikatzailerik aukeran"
 
@@ -1992,13 +2055,13 @@ msgid "CRAM-MD5 authentication failed."
 msgstr "CRAM-MD5 autentifikazioak huts egin du."
 
 #. now begin login
-#: imap/auth_gss.c:142
+#: imap/auth_gss.c:144
 msgid "Authenticating (GSSAPI)..."
 msgstr "(GSSAPI) autentifikazioa..."
 
-#: imap/auth_gss.c:307
+#: imap/auth_gss.c:309
 msgid "GSSAPI authentication failed."
-msgstr "(GSSAPI) autentifikazioak huts egin du."
+msgstr "GSSAPI autentifikazioak huts egin du."
 
 #: imap/auth_login.c:38
 msgid "LOGIN disabled on this server."
@@ -2012,7 +2075,7 @@ msgstr "Saio asten..."
 msgid "Login failed."
 msgstr "Huts saioa hasterakoan."
 
-#: imap/auth_sasl.c:97 smtp.c:487
+#: imap/auth_sasl.c:97 smtp.c:551
 #, c-format
 msgid "Authenticating (%s)..."
 msgstr "Autentifikazioa (%s)..."
@@ -2021,425 +2084,449 @@ msgstr "Autentifikazioa (%s)..."
 msgid "SASL authentication failed."
 msgstr "SASL egiaztapenak huts egin du."
 
-#: imap/browse.c:58 imap/imap.c:562
+#: imap/browse.c:58 imap/imap.c:569
 #, c-format
 msgid "%s is an invalid IMAP path"
-msgstr "%s baliogabeko IMAP datu bidea da."
+msgstr "%s baliogabeko IMAP datu bidea da"
 
 #: imap/browse.c:69
 msgid "Getting folder list..."
 msgstr "Karpeta zerrenda eskuratzen..."
 
-#: imap/browse.c:189
+#: imap/browse.c:191
 msgid "No such folder"
 msgstr "Ez da karpeta aurkitu"
 
-#: imap/browse.c:276
+#: imap/browse.c:280
 msgid "Create mailbox: "
-msgstr "Postakutxa sortu:"
+msgstr "Postakutxa sortu: "
 
-#: imap/browse.c:281 imap/browse.c:327
+#: imap/browse.c:285 imap/browse.c:331
 msgid "Mailbox must have a name."
 msgstr "Postakotxak izen bat eduki behar du."
 
-#: imap/browse.c:289
+#: imap/browse.c:293
 msgid "Mailbox created."
 msgstr "Postakutxa sortua."
 
-#: imap/browse.c:320
+#: imap/browse.c:324
 #, c-format
 msgid "Rename mailbox %s to: "
-msgstr "%s postakutxa honela berrizendatu: "
+msgstr "%s posta-kutxa honela berrizendatu: "
 
-#: imap/browse.c:333
+#: imap/browse.c:339
 #, c-format
 msgid "Rename failed: %s"
 msgstr "Berrizendaketak huts egin du: %s"
 
-#: imap/browse.c:338
+#: imap/browse.c:344
 msgid "Mailbox renamed."
 msgstr "Postakutxa berrizendaturik."
 
-#: imap/command.c:372
+#: imap/command.c:445
 msgid "Mailbox closed"
 msgstr "Postakutxa itxia"
 
-#: imap/imap.c:185
+#: imap/imap.c:126
+#, fuzzy, c-format
+msgid "CREATE failed: %s"
+msgstr "SSL hutsa: %s"
+
+#: imap/imap.c:190
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "%s-ra konexioak ixten..."
 
-#: imap/imap.c:306
+#: imap/imap.c:310
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "IMAP zerbitzaria aspaldikoa da. Mutt-ek ezin du berarekin lan egin."
 
-#: imap/imap.c:429 pop_lib.c:286 smtp.c:373
+#: imap/imap.c:433 pop_lib.c:295 smtp.c:424
 msgid "Secure connection with TLS?"
 msgstr "TLS-duen konexio ziurra?"
 
-#: imap/imap.c:438 pop_lib.c:306 smtp.c:385
+#: imap/imap.c:442 pop_lib.c:315 smtp.c:436
 msgid "Could not negotiate TLS connection"
 msgstr "Ezin da TLS konexioa negoziatu"
 
-#: imap/imap.c:454 pop_lib.c:327
+#: imap/imap.c:458 pop_lib.c:336
 msgid "Encrypted connection unavailable"
 msgstr "Enkriptaturiko konexioa ez da erabilgarria"
 
-#: imap/imap.c:594
+#: imap/imap.c:603
 #, c-format
 msgid "Selecting %s..."
 msgstr "Aukeratzen %s..."
 
-#: imap/imap.c:749
+#: imap/imap.c:758
 msgid "Error opening mailbox"
 msgstr "Postakutxa irekitzean errorea"
 
-#: imap/imap.c:802 imap/message.c:792 muttlib.c:1466
+#: imap/imap.c:813 imap/message.c:851 muttlib.c:1545
 #, c-format
 msgid "Create %s?"
 msgstr "Sortu %s?"
 
-#: imap/imap.c:1132
+#: imap/imap.c:1186
+msgid "Expunge failed"
+msgstr "Ezabatzea huts"
+
+#: imap/imap.c:1198
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "%d mezu ezabatuak markatzen..."
 
-#: imap/imap.c:1141
-msgid "Expunge failed"
-msgstr "Ezabatzea huts"
-
-#: imap/imap.c:1174
+#: imap/imap.c:1230
 #, c-format
 msgid "Saving changed messages... [%d/%d]"
-msgstr "Aldatutako mezuak gordetzen... [%d/%d]"
+msgstr "Aldaturiko mezuak gordetzen... [%d/%d]"
 
-#: imap/imap.c:1228
+#: imap/imap.c:1279
 msgid "Error saving flags. Close anyway?"
-msgstr "Errore banderak gordetzean, Itxi ala ere?"
+msgstr "Erroreak banderak gordetzean. Itxi hala ere?"
 
-#: imap/imap.c:1236
+#: imap/imap.c:1287
 msgid "Error saving flags"
 msgstr "Errorea banderak gordetzean"
 
-#: imap/imap.c:1248
+#: imap/imap.c:1299
 msgid "Expunging messages from server..."
 msgstr "Mezuak zerbitzaritik ezabatzen..."
 
-#: imap/imap.c:1253
+#: imap/imap.c:1304
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE huts egin du"
 
-#: imap/imap.c:1726
+#: imap/imap.c:1754
 #, c-format
 msgid "Header search without header name: %s"
 msgstr "Goiburu bilaketa goiburu izen gabe: %s"
 
-#: imap/imap.c:1798
+#: imap/imap.c:1826
 msgid "Bad mailbox name"
 msgstr "Postakutxa izen okerra"
 
-#: imap/imap.c:1821
+#: imap/imap.c:1851
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "%s-ra harpidetzen..."
 
-#: imap/imap.c:1823
+#: imap/imap.c:1853
 #, c-format
 msgid "Unsubscribing from %s..."
-msgstr "%s-ra harpidetza kentze..."
+msgstr "%s-ra harpidetzaz ezabatzen..."
 
-#: imap/imap.c:1833
+#: imap/imap.c:1863
 #, c-format
 msgid "Subscribed to %s"
 msgstr "%s-ra harpideturik"
 
-#: imap/imap.c:1835
+#: imap/imap.c:1865
 #, c-format
 msgid "Unsubscribed from %s"
-msgstr "%s-ra harpidetzaz ezabatua"
+msgstr "%s-ra harpidetzaz ezabaturik"
 
 #. Unable to fetch headers for lower versions
-#: imap/message.c:97
+#: imap/message.c:99
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "IMAP zerbitzari bertsio honetatik ezin dira mezuak eskuratu."
 
-#: imap/message.c:107
+#: imap/message.c:109
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "Ezin da %s fitxategi tenporala sortu"
 
-#: imap/message.c:137
+#: imap/message.c:141
 msgid "Evaluating cache..."
 msgstr "Katxea ebaluatzen..."
 
-#: imap/message.c:221 pop.c:272
+#: imap/message.c:232 pop.c:272
 msgid "Fetching message headers..."
 msgstr "Mezu burukoak eskuratzen..."
 
-#: imap/message.c:402 imap/message.c:459 pop.c:547
+#: imap/message.c:441 imap/message.c:498 pop.c:563
 msgid "Fetching message..."
 msgstr "Mezua eskuratzen..."
 
-#: imap/message.c:448 pop.c:542
+#: imap/message.c:487 pop.c:558
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "Mezu sarrera baliogabekoa. Saia zaitez postakutxa berrirekitzen."
 
-#: imap/message.c:599
+#: imap/message.c:641
 msgid "Uploading message..."
 msgstr "Mezua igotzen..."
 
-#: imap/message.c:758
+#: imap/message.c:815
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "%d mezuak %s-ra kopiatzen..."
 
-#: imap/message.c:762
+#: imap/message.c:819
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "%d mezua %s-ra kopiatzen..."
 
-#: imap/util.c:335
+#: imap/util.c:358
 msgid "Continue?"
 msgstr "Jarraitu?"
 
-#: init.c:57 init.c:1755 pager.c:57
+#: init.c:60 init.c:1758 pager.c:50
 #, c-format
 msgid "Not available in this menu."
 msgstr "Menu honetan ezin da egin."
 
-#: init.c:465
+#: init.c:468
 #, c-format
 msgid "Bad regexp: %s"
 msgstr "Okerreko espresio erregularra: %s"
 
-#: init.c:522
+#: init.c:525
 #, c-format
 msgid "Not enough subexpressions for spam template"
-msgstr ""
+msgstr "Ez dago zabor-posta txantiloirako aski azpiespresio"
 
-#: init.c:748
+#: init.c:715
 msgid "spam: no matching pattern"
 msgstr "zabor-posta: ez da patroia aurkitu"
 
-#: init.c:750
+#: init.c:717
 msgid "nospam: no matching pattern"
 msgstr "ez zabor-posta: ez da patroia aurkitu"
 
-#: init.c:887
-msgid "Missing -rx or -addr."
-msgstr "-rx edo -addr falta da."
+#: init.c:861
+#, fuzzy, c-format
+msgid "%sgroup: missing -rx or -addr."
+msgstr "-rx edo -helb falta da."
 
-#: init.c:900
-#, c-format
-msgid "Warning: Bad IDN '%s'.\n"
-msgstr "Kontuz: okerreko '%s' IDN.\n"
+#: init.c:879
+#, fuzzy, c-format
+msgid "%sgroup: warning: bad IDN '%s'.\n"
+msgstr "Kontuz: '%s' IDN okerra.\n"
 
-#: init.c:1108
+#: init.c:1094
 msgid "attachments: no disposition"
 msgstr "eranskinak: disposiziorik ez"
 
-#: init.c:1146
+#: init.c:1132
 msgid "attachments: invalid disposition"
-msgstr "eranskinak: disposizio baliogabea"
+msgstr "eranskinak: disposizio okerra"
 
-#: init.c:1160
+#: init.c:1146
 msgid "unattachments: no disposition"
-msgstr "kendutako eranskinak: disposiziorik ez"
+msgstr "deseranskinak: disposiziorik ez"
 
-#: init.c:1183
+#: init.c:1169
 msgid "unattachments: invalid disposition"
-msgstr "kendutako eranskinak: disposizio baliogabea"
+msgstr "deseranskinak: disposizio okerra"
 
-#: init.c:1310
+#: init.c:1296
 msgid "alias: no address"
-msgstr "alias: helbide gabea"
+msgstr "ezizena: helbide gabea"
 
-#: init.c:1357
+#: init.c:1344
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
-msgstr "Kontuz: '%s' IDN okerra '%s' aliasean.\n"
+msgstr "Kontuz: '%s' IDN okerra '%s' ezizenean.\n"
 
-#: init.c:1445
+#: init.c:1432
 msgid "invalid header field"
 msgstr "baliogabeko mezu burua"
 
-#: init.c:1498
+#: init.c:1485
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s: sailkatze modu ezezaguna"
 
-#: init.c:1608
+#: init.c:1592
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_default(%s): errorea espresio erregularrean: %s\n"
 
-#: init.c:1732 init.c:1845
+#: init.c:1735 init.c:1848
 #, c-format
 msgid "%s: unknown variable"
-msgstr "%s: Aldagai ezezaguna"
+msgstr "%s: aldagai ezezaguna"
 
-#: init.c:1741
+#: init.c:1744
 #, c-format
 msgid "prefix is illegal with reset"
 msgstr "aurrizkia legezkanpokoa da reset-ekin"
 
-#: init.c:1747
+#: init.c:1750
 #, c-format
 msgid "value is illegal with reset"
 msgstr "balioa legezkanpokoa da reset-ekin"
 
-#: init.c:1783 init.c:1795
+#: init.c:1786 init.c:1798
 #, c-format
 msgid "Usage: set variable=yes|no"
-msgstr ""
+msgstr "Erabilera: set variable=yes|no"
 
-#: init.c:1803
+#: init.c:1806
 #, c-format
 msgid "%s is set"
 msgstr "%s ezarririk dago"
 
-#: init.c:1803
+#: init.c:1806
 #, c-format
 msgid "%s is unset"
 msgstr "%s ezarri gabe dago"
 
-#: init.c:2033
+#: init.c:1909
+#, fuzzy, c-format
+msgid "Invalid value for option %s: \"%s\""
+msgstr "Baliogabeko hilabete eguna: %s"
+
+#: init.c:2046
 #, c-format
 msgid "%s: invalid mailbox type"
-msgstr "%s: Postakutxa mota okerra"
+msgstr "%s: posta-kutxa mota okerra"
+
+#: init.c:2077
+#, fuzzy, c-format
+msgid "%s: invalid value (%s)"
+msgstr "%s: balio okerra"
+
+#: init.c:2078
+msgid "format error"
+msgstr ""
 
-#: init.c:2064 init.c:2117
+#: init.c:2078
+msgid "number overflow"
+msgstr ""
+
+#: init.c:2138
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s: balio okerra"
 
-#: init.c:2158
+#: init.c:2179
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s Mota ezezaguna."
 
-#: init.c:2185
+#: init.c:2206
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s: mota ezezaguna"
 
-#: init.c:2247
+#: init.c:2268
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "Errorea %s-n, %d lerroan: %s"
 
 #. the muttrc source keyword
-#: init.c:2270
+#: init.c:2291
 #, c-format
 msgid "source: errors in %s"
 msgstr "jatorria: erroreak %s-n"
 
-#: init.c:2271
+#: init.c:2292
 #, c-format
 msgid "source: reading aborted due too many errors in %s"
 msgstr "jatorria: %s-n akats gehiegiengatik irakurketa ezeztatua"
 
-#: init.c:2285
+#: init.c:2306
 #, c-format
 msgid "source: error at %s"
 msgstr "jatorria: %s-n errorea"
 
-#: init.c:2290
+#: init.c:2311
 msgid "source: too many arguments"
 msgstr "jatorria : argumentu gutxiegi"
 
-#: init.c:2341
+#: init.c:2365
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s: komando ezezaguna"
 
-#: init.c:2826
+#: init.c:2850
 #, c-format
 msgid "Error in command line: %s\n"
-msgstr "komando lerroan errorea: %s\n"
+msgstr "Komando lerroan errorea: %s\n"
 
-#: init.c:2878
+#: init.c:2923
 msgid "unable to determine home directory"
-msgstr "Ezin da \"home\" karpeta aukeratu"
+msgstr "ezin da \"home\" karpeta aukeratu"
 
-#: init.c:2886
+#: init.c:2931
 msgid "unable to determine username"
-msgstr "ezin da erabiltzaile izena aurkitu"
+msgstr "ezinda erabiltzaile izena aurkitu"
 
-#: init.c:3122
+#: init.c:3167
 msgid "-group: no group name"
-msgstr "-group: talde izenik ez"
+msgstr "-group: ez dago talde izenik"
 
-#: init.c:3132
+#: init.c:3177
 msgid "out of arguments"
-msgstr "argumentu gutxiegi"
+msgstr "argumentu gehiegi"
 
-#: keymap.c:466
+#: keymap.c:526
 msgid "Macro loop detected."
 msgstr "Makro begizta aurkitua."
 
-#: keymap.c:676 keymap.c:684
+#: keymap.c:827 keymap.c:835
 msgid "Key is not bound."
 msgstr "Letra ez dago mugaturik."
 
-#: keymap.c:688
+#: keymap.c:839
 #, c-format
 msgid "Key is not bound.  Press '%s' for help."
-msgstr "Letra ez dago mugaturik.  %s jo laguntzarako"
+msgstr "Letra ez dago mugaturik.  %s jo laguntzarako."
 
-#: keymap.c:699
+#: keymap.c:850
 msgid "push: too many arguments"
 msgstr "push: argumentu gutxiegi"
 
-#: keymap.c:729
+#: keymap.c:880
 #, c-format
 msgid "%s: no such menu"
 msgstr "%s: ez da menurik"
 
-#: keymap.c:744
+#: keymap.c:895
 msgid "null key sequence"
 msgstr "baloigabeko sekuentzi gakoa"
 
-#: keymap.c:831
+#: keymap.c:982
 msgid "bind: too many arguments"
 msgstr "bind:argumentu gehiegi"
 
-#: keymap.c:854
+#: keymap.c:1005
 #, c-format
 msgid "%s: no such function in map"
 msgstr "%s: ez da horrelako funtziorik aurkitu mapan"
 
-#: keymap.c:878
+#: keymap.c:1029
 msgid "macro: empty key sequence"
 msgstr "macro: sekuentzi gako hutsa"
 
-#: keymap.c:889
+#: keymap.c:1040
 msgid "macro: too many arguments"
 msgstr "makro: argumentu gutxiegi"
 
-#: keymap.c:925
+#: keymap.c:1076
 msgid "exec: no arguments"
 msgstr "exec: ez da argumenturik"
 
-#: keymap.c:945
+#: keymap.c:1096
 #, c-format
 msgid "%s: no such function"
 msgstr "%s: ez da funtziorik"
 
-#: keymap.c:966
+#: keymap.c:1117
 msgid "Enter keys (^G to abort): "
 msgstr "Sartu gakoak (^G uzteko): "
 
-#: keymap.c:971
+#: keymap.c:1122
 #, c-format
 msgid "Char = %s, Octal = %o, Decimal = %d"
-msgstr "Kar = %s, Zortziko = %o, amarreko = %d"
+msgstr "Kar = %s, Zortziko = %o, hamarreko = %d"
 
-#: lib.c:129
+#: lib.c:131
 msgid "Integer overflow -- can't allocate memory!"
 msgstr "Osoko zenbakia iraultzea - ezin da memoria esleitu!"
 
-#: lib.c:136 lib.c:151 lib.c:183
+#: lib.c:138 lib.c:153 lib.c:185
 msgid "Out of memory!"
 msgstr "Memoriaz kanpo!"
 
@@ -2448,49 +2535,45 @@ msgid ""
 "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
 "To report a bug, please visit http://bugs.mutt.org/.\n"
 msgstr ""
-"Garatzaileekin harremanetan ipintzeko, idatzi <mutt-dev@mutt.org>-era.\n"
-"Programa errore baten berri emateko, joan http://bugs.mutt.org/ gunera.\n"
+"Garatzaileekin harremanetan ipintzeko , idatzi <mutt-dev@mutt.org> "
+"helbidera.\n"
+"Programa-errore baten berri emateko joan http://bugs.mutt.org/ helbidera.\n"
 
 #: main.c:67
-#, fuzzy
 msgid ""
-"Copyright (C) 1996-2008 Michael R. Elkins and others.\n"
+"Copyright (C) 1996-2009 Michael R. Elkins and others.\n"
 "Mutt comes with ABSOLUTELY NO WARRANTY; for details type `mutt -vv'.\n"
 "Mutt is free software, and you are welcome to redistribute it\n"
 "under certain conditions; type `mutt -vv' for details.\n"
 msgstr ""
-"Copyright (C) 1996-2006 Michael R. Elkins eta beste batzuk.\n"
-"Mutt INOLAKO BERMERIK GABE dator; xehetasunentzat `mutt -vv' erabili.\n"
-"Mutt software librea da eta berau baldintza batzuetan zabaldu dezakezu;\n"
-" xehetasunentzat `mutt -vv' erabili.\n"
 
 #: main.c:73
 #, fuzzy
 msgid ""
 "Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2008 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2009 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+"Copyright (C) 2006-2009 Rocco Rutte <pdmef@gmx.net>\n"
 "\n"
 "Many others not mentioned here contributed code, fixes,\n"
 "and suggestions.\n"
 msgstr ""
-"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
+"Copyright (C) 1996-2007 Michael R. Elkins <me@mutt.org>\n"
 "Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
-"Copyright (C) 1997-2006 Thomas Roessler <roessler@does-not-exist.org>\n"
+"Copyright (C) 1997-2007 Thomas Roessler <roessler@does-not-exist.org>\n"
 "Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
-"Copyright (C) 1999-2006 Brendan Cully <brendan@kublai.com>\n"
+"Copyright (C) 1999-2008 Brendan Cully <brendan@kublai.com>\n"
 "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
 "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
 "\n"
-"Hemen izendatzen ez direnbeste hainabtek kodea, konponketa eta gomendioak\n"
-"eginez lagundu dute,\n"
-"and suggestions.\n"
+"Izendatzen ez diren beste zenbaitek kodea, zuzenketak eta gomendioekin\n"
+"lagundu dute.\n"
 
-#: main.c:85
+#: main.c:86
 msgid ""
 "    This program is free software; you can redistribute it and/or modify\n"
 "    it under the terms of the GNU General Public License as published by\n"
@@ -2502,60 +2585,61 @@ msgid ""
 "    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
 "    GNU General Public License for more details.\n"
 msgstr ""
-"    Programa hau software librea da; berau eraldatu edo banatzeko\n"
-"    aukera duzu Free Software Foundation-ek argitaratutako GNU Lizentzi\n"
-"    Publiko Orokorrak, lizentziaren 2 bertsioan edo (nahi izanez gero)\n"
-"    berriagoetan ezartzen dituen baldintzetan.    Programa hau erabilgarri "
-"izango den esperantzan banatzen da,\n"
-"    baina INOLAKO BERMERIK GABE; APLIKAGARRIA DEN LEGEAK\n"
-"    ONARTZEN DUEN NEURRIRARTE.  Begiratu GNU Lizentzia Publiko Orokorra\n"
-"    xehetasun gehiagorako.\n"
-
-#: main.c:95
+
+#: main.c:96
 msgid ""
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
 "    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-"
 "1301, USA.\n"
 msgstr ""
-"    Programa honekin batera GNU Lizentzia Publiko Orokorraren kopia bat "
-"jaso\n"
-"    izan behar duzu; hala ez bada helbide honetara idatzi: Free Software\n"
-"    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-"
-"1301, USA.\n"
 
-#: main.c:112
+#: main.c:113
+#, fuzzy
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-x] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
-"<file> [...]] [--] <addr> [...]\n"
+"<file> [...] --] <addr> [...]\n"
+"       mutt [<options>] [-x] [-s <subj>] [-bc <addr>] [-a <file> [...] --] "
+"<addr> [...] < message\n"
 "       mutt [<options>] -p\n"
 "       mutt [<options>] -A <alias> [...]\n"
 "       mutt [<options>] -Q <query> [...]\n"
 "       mutt [<options>] -D\n"
 "       mutt -v[v]\n"
 msgstr ""
+"erabilera: mutt [<aukerak>] [-z] [-f <fitx> | -yZ]\n"
+"       mutt [<aukerak>] [-x] [-Hi <fitx>] [-s <gaia>] [-bc <helb>] [-a "
+"<fitx> [...]] [--] <helb> [...]\n"
+"       mutt [<aukerak>] -p\n"
+"       mutt [<aukerak>] -A <ezizena> [...]\n"
+"       mutt [<aukerak>] -Q <query> [...]\n"
+"       mutt [<aukerak>] -D\n"
+"       mutt -v[v]\n"
 
-#: main.c:120
+#: main.c:122
+#, fuzzy
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
-"  -a <file>\tattach a file to the message\n"
+"  -a <file> [...] --\tattach file(s) to the message\n"
+"\t\tthe list of files must be terminated with the \"--\" sequence\n"
 "  -b <address>\tspecify a blind carbon-copy (BCC) address\n"
 "  -c <address>\tspecify a carbon-copy (CC) address\n"
 "  -D\t\tprint the value of all variables to stdout"
 msgstr ""
-"options:  -A <ezizena>\temandako ezizena zabaldu\n"
-"  -a <fitx>\tmezura fitxategia erantsi\n"
-"  -b <helbidea>\tezkutatutako kopiarako (BCC) helbide bat idatzi\n"
-"  -c <helbidea>\tKopian (CC) ezartzeko helbide bat idatzi\n"
-"  -D\\irteera estandarreko aldagaien balioak inprimatu"
+"aukerak:\n"
+"  -A <ezizena>\tzabaldu emandako ezizena\n"
+"  -a <fitx>\terantsi fitxategi bat mezura\n"
+"  -b <helbidea>\tzehaztu ezkutuko kopiarako (BCC) helbide bat\n"
+"  -c <helbidea>\tzehaztu kopiarako (CC) helbide bat\n"
+"  -D\t\tinprimatu aldagai guztien balioa irteera estandarrean"
 
-#: main.c:128
+#: main.c:131
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
-msgstr "  -d <maila>\tarazpen irteera ~/.muttdebug0-en erregistratu"
+msgstr "  -d <maila>\tinprimatu arazpen irteera hemen: ~/.muttdebug0"
 
-#: main.c:131
+#: main.c:134
 msgid ""
 "  -e <command>\tspecify a command to be executed after initialization\n"
 "  -f <file>\tspecify which mailbox to read\n"
@@ -2566,17 +2650,17 @@ msgid ""
 "  -n\t\tcauses Mutt not to read the system Muttrc\n"
 "  -p\t\trecall a postponed message"
 msgstr ""
-"  -e <komandoa>\tabiarazi ondoren exekutatzeko komando bat ezarri\n"
-"  -f <fitx>\tirakurtzeko postakutxa ezarri\n"
-"  -F <fitx>\tbeste muttrc fitxategi bat ezarri\n"
-"  -H <fitx>\tburua eta gorputza handik irakurtzeko zirriborro fitxategi bat "
-"ezarri\n"
-"  -i <fitx>\tMutt-ek gorputzean sartu behar duen fitxategi bat ezarri\n"
-"  -m <mota>\tlehenetsiriko postakutxa mota ezarri\n"
-"  -n\t\tMutt-ke sistemako muttrc ez irakurtzea eragiten du\n"
-"  -p\t\\atzeratutako mezu bat berreskuratu"
-
-#: main.c:140
+"  -e <komandoa>\tzehaztu abiarazi ondoren exekutatuko den komando bat\n"
+"  -f <fitx>\tzein posta-kutxa irakurri zehaztu\n"
+"  -F <fitx>\tbeste muttrc fitxategi bat zehaztu\n"
+"  -H <fitx>\tzehaztu zirriborro fitxategi bat burua eta gorputza bertatik "
+"kopiatzeko\n"
+"  -i <fitx>\tzehaztu mutt-ek gorputzean txertatu behar duen fitxategi bat\n"
+"  -m <type>\tzehaztu lehenetsiriko postakutxa mota\n"
+"  -n\t\tMutt-ek sistema Muttrc ez irakurtzea eragiten du\n"
+"  -p\t\tatzeratutako mezu bat berreskuratzen du"
+
+#: main.c:143
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"
@@ -2588,23 +2672,17 @@ msgid ""
 "  -Z\t\topen the first folder with new message, exit immediately if none\n"
 "  -h\t\tthis help message"
 msgstr ""
-"  -Q <aldagaia>\tkonfigruazio aldagai bat gadetu\n"
-"  -R\tpostakutxa irakurketa soil moduan ireki\n"
-"  -s <gaia>\tgai bat ezarri(gako artean zuriunerik badu)  -v\tbertsio eta "
-"konpilazio data ikusi  -x\tmaix bidalketa modua simulatu  -y\t`mailboxes' "
-"zerrendan ezarririko postakutxa bat hautatu\n"
-"  -z\tberehala irten postakutxan mezurik ez badago\n"
-"  -Z\tmezu berriak dituen lehen karpeta ireki, irten mezu berririk ez "
-"badago\n"
-"  -h\tlaguntza mezu hau"
-
-#: main.c:150
-msgid ""
-"  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
-"\t\twhen using -a with multiple filenames using -- is mandatory"
-msgstr ""
-
-#: main.c:195
+"  -Q <aldagaia>\tgaldezkatu konfigurazio aldagai bat\n"
+"  -R\t\tireki postakutxa irakurketa-soileko moduan\n"
+"  -s <gaia>\tzehaztu gai bat (komatxo artean zuriunerik badu)\n"
+"  -v\t\tikusi bertsio eta konpilazio-une definizioak\n"
+"  -x\t\tsimulatu mailx bidalketa modua\n"
+"  -y\t\tzehaztu postakutxa zehatz zure `postakutxa' zerrendan\n"
+"  -z\t\tirten berehala postakutxan mezurik ez badago\n"
+"  -Z\t\tireki mezu berri bat duen lehen karpeta, irten batez ez balego\n"
+"  -h\t\tlaguntza testu hau"
+
+#: main.c:196
 msgid ""
 "\n"
 "Compile options:"
@@ -2612,72 +2690,77 @@ msgstr ""
 "\n"
 "Konpilazio aukerak:"
 
-#: main.c:502
+#: main.c:500
 msgid "Error initializing terminal."
 msgstr "Errorea terminala abiaraztekoan."
 
-#: main.c:620
+#: main.c:636
+#, fuzzy, c-format
+msgid "Error: value '%s' is invalid for -d.\n"
+msgstr "Errorea: '%s' IDN okerra da."
+
+#: main.c:639
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "%d. mailan arazten.\n"
 
-#: main.c:622
+#: main.c:641
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
-msgstr "DEBUG ez dago konpilatzerakoan definiturik.  Alde batetara uzten.\n"
+msgstr "DEBUG ez dago kopiatzerakoan definiturik.  Alde batetara uzten.\n"
 
-#: main.c:785
+#: main.c:806
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s ez da existitzen. Sortu?"
 
-#: main.c:789
+#: main.c:810
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "Ezin da %s sortu: %s."
 
-#: main.c:831
+#: main.c:852
 msgid "Failed to parse mailto: link\n"
-msgstr ""
+msgstr "Huts maito: lotura analizatzean\n"
 
-#: main.c:843
+#: main.c:864
 msgid "No recipients specified.\n"
 msgstr "Ez da jasotzailerik eman.\n"
 
-#: main.c:929
+#: main.c:950
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s: ezin da fitxategia txertatu.\n"
 
-#: main.c:952
+#: main.c:973
 msgid "No mailbox with new mail."
-msgstr "Ez da posta berririk postakutxetan"
+msgstr "Ez dago posta berririk duen postakutxarik."
 
-#: main.c:961
+#: main.c:982
 msgid "No incoming mailboxes defined."
 msgstr "Ez da sarrera postakutxarik ezarri."
 
-#: main.c:989
+#: main.c:1010
 msgid "Mailbox is empty."
 msgstr "Postakutxa hutsik dago."
 
-#: mbox.c:123 mbox.c:277 mh.c:1137 mx.c:673
+#: mbox.c:119 mbox.c:269 mh.c:1152 mx.c:642
 #, c-format
 msgid "Reading %s..."
-msgstr "%s Irakurtzen..."
+msgstr "%s irakurtzen..."
 
-#: mbox.c:161 mbox.c:218
+#: mbox.c:157 mbox.c:214
 msgid "Mailbox is corrupt!"
 msgstr "Postakutxa hondaturik dago!"
 
-#: mbox.c:678
+#: mbox.c:670
 msgid "Mailbox was corrupted!"
 msgstr "Postakutxa hondaturik zegoen!"
 
-#: mbox.c:719 mbox.c:975
+#: mbox.c:752 mbox.c:1008
 msgid "Fatal error!  Could not reopen mailbox!"
 msgstr "Errore konponezina!  Ezin da postakutxa berrireki!"
 
-#: mbox.c:728
+#: mbox.c:761
 msgid "Unable to lock mailbox!"
 msgstr "Ezin da postakutxa blokeatu!"
 
@@ -2685,355 +2768,373 @@ msgstr "Ezin da postakutxa blokeatu!"
 #. * messages were found to be changed or deleted.  This should
 #. * never happen, is we presume it is a bug in mutt.
 #.
-#: mbox.c:771
+#: mbox.c:804
 msgid "sync: mbox modified, but no modified messages! (report this bug)"
 msgstr ""
 "sync: mbox aldatuta baina ez dira mezuak aldatu! (zorri honen berri eman)"
 
-#: mbox.c:795 mh.c:1636 mx.c:766
+#: mbox.c:828 mh.c:1658 mx.c:739
 #, c-format
 msgid "Writing %s..."
 msgstr "%s idazten..."
 
-#. copy the temp mailbox back into place starting at the first
-#. * change/deleted message
-#.
-#: mbox.c:928
+#: mbox.c:963
 msgid "Committing changes..."
 msgstr "Aldaketak eguneratzen..."
 
-#: mbox.c:959
+#: mbox.c:994
 #, c-format
 msgid "Write failed!  Saved partial mailbox to %s"
 msgstr "Idazteak huts egin du!  postakutxa zatia %s-n gorderik"
 
-#: mbox.c:1023
+#: mbox.c:1056
 msgid "Could not reopen mailbox!"
 msgstr "Ezin da postakutxa berrireki!"
 
-#: mbox.c:1058
+#: mbox.c:1092
 msgid "Reopening mailbox..."
-msgstr "Postakuxa berrirekitzen... "
+msgstr "Postakutxa berrirekitzen..."
 
-#: menu.c:425
+#: menu.c:423
 msgid "Jump to: "
 msgstr "Joan hona: "
 
-#: menu.c:434
+#: menu.c:432
 msgid "Invalid index number."
 msgstr "Baliogabeko sarrera zenbakia."
 
-#: menu.c:438 menu.c:459 menu.c:524 menu.c:567 menu.c:583 menu.c:594
-#: menu.c:605 menu.c:616 menu.c:629 menu.c:642 menu.c:1043
+#: menu.c:436 menu.c:457 menu.c:522 menu.c:565 menu.c:581 menu.c:592
+#: menu.c:603 menu.c:614 menu.c:627 menu.c:640 menu.c:1051
 msgid "No entries."
 msgstr "Ez dago sarrerarik."
 
-#: menu.c:456
+#: menu.c:454
 msgid "You cannot scroll down farther."
 msgstr "Ezin duzu hurrunago jaitsi."
 
-#: menu.c:474
+#: menu.c:472
 msgid "You cannot scroll up farther."
 msgstr "Ezin duzu hurrunago igo."
 
-#: menu.c:517
+#: menu.c:515
 msgid "You are on the first page."
 msgstr "Lehenengo orrialdean zaude."
 
-#: menu.c:518
+#: menu.c:516
 msgid "You are on the last page."
 msgstr "Azkenengo orrialdean zaude."
 
-#: menu.c:653
+#: menu.c:651
 msgid "You are on the last entry."
 msgstr "Azkenengo sarreran zaude."
 
-#: menu.c:664
+#: menu.c:662
 msgid "You are on the first entry."
 msgstr "Lehenengo sarreran zaude."
 
-#: menu.c:724 pattern.c:1417
+#: menu.c:733 pager.c:2086 pattern.c:1417
 msgid "Search for: "
-msgstr "Bilatu hau:"
+msgstr "Bilatu hau: "
 
-#: menu.c:725 pattern.c:1418
+#: menu.c:733 pager.c:2086 pattern.c:1417
 msgid "Reverse search for: "
-msgstr "Hau atzetik-aurrera begiratu:"
+msgstr "Bilatu hau atzetik-aurrera: "
 
-#: menu.c:735 pattern.c:1450
-msgid "No search pattern."
-msgstr "Ez da bilaketa patroia aurkitu."
-
-#: menu.c:765 pager.c:1987 pager.c:2003 pager.c:2111 pattern.c:1533
+#: menu.c:777 pager.c:2039 pager.c:2061 pager.c:2181 pattern.c:1531
 msgid "Not found."
 msgstr "Ez da aurkitu."
 
-#: menu.c:895
+#: menu.c:903
 msgid "No tagged entries."
 msgstr "Ez dago markaturiko sarrerarik."
 
-#: menu.c:1000
+#: menu.c:1008
 msgid "Search is not implemented for this menu."
 msgstr "Menu honek ez du bilaketarik inplementaturik."
 
-#: menu.c:1005
+#: menu.c:1013
 msgid "Jumping is not implemented for dialogs."
-msgstr "elkarrizketetan ez da saltorik inplementatu"
+msgstr "Elkarrizketetan ez da saltorik inplementatu."
 
-#: menu.c:1046
+#: menu.c:1054
 msgid "Tagging is not supported."
 msgstr "Markatzea ez da onartzen."
 
-#: mh.c:1116
-#, fuzzy, c-format
+#: mh.c:1131
+#, c-format
 msgid "Scanning %s..."
-msgstr "Aukeratzen %s..."
+msgstr "Arakatzen %s..."
+
+#: mh.c:1332 mh.c:1410
+#, fuzzy
+msgid "Could not flush message to disk"
+msgstr "Ezin da mezua bidali."
 
-#: mh.c:1358
+#: mh.c:1377
 msgid "maildir_commit_message(): unable to set time on file"
 msgstr "maildir_commit_message(): fitxategian ezin da data ezarri"
 
 #: mutt_sasl.c:192
 msgid "Unknown SASL profile"
-msgstr ""
+msgstr "SASL profil ezezaguna"
 
 #: mutt_sasl.c:226
-#, fuzzy
 msgid "Error allocating SASL connection"
-msgstr "errorea datu objektua esleitzerakoan: %s\n"
+msgstr "Errorea SASL konexioa esleitzerakoan"
 
 #: mutt_sasl.c:236
 msgid "Error setting SASL security properties"
-msgstr ""
+msgstr "Errorea SASL segurtasun propietateak ezartzean"
 
 #: mutt_sasl.c:246
 msgid "Error setting SASL external security strength"
-msgstr ""
+msgstr "Errorea SASL kanpo segurtasun maila ezartzean"
 
-#: mutt_sasl.c:252
+#: mutt_sasl.c:255
 msgid "Error setting SASL external user name"
-msgstr ""
+msgstr "Errorea SASL kanpo erabiltzaile izena ezartzean"
 
-#: mutt_socket.c:103 mutt_socket.c:174
+#: mutt_socket.c:103 mutt_socket.c:181
 #, c-format
 msgid "Connection to %s closed"
-msgstr "%s-rekiko konexioa itxia."
+msgstr "%s-rekiko konexioa itxia"
 
-#: mutt_socket.c:294
+#: mutt_socket.c:300
 msgid "SSL is unavailable."
-msgstr "SSL ez da erabilgarri"
+msgstr "SSL ez da erabilgarri."
 
-#: mutt_socket.c:326
+#: mutt_socket.c:332
 msgid "Preconnect command failed."
 msgstr "Aurrekonexio komandoak huts egin du."
 
-#: mutt_socket.c:397 mutt_socket.c:411
+#: mutt_socket.c:403 mutt_socket.c:417
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "Errorea %s (%s) komunikatzerakoan"
 
-#: mutt_socket.c:464 mutt_socket.c:522
+#: mutt_socket.c:470 mutt_socket.c:529
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "IDN okerra \"%s\"."
 
-#: mutt_socket.c:471 mutt_socket.c:529
+#: mutt_socket.c:478 mutt_socket.c:537
 #, c-format
 msgid "Looking up %s..."
 msgstr "%s Bilatzen..."
 
-#: mutt_socket.c:482 mutt_socket.c:536
+#: mutt_socket.c:488 mutt_socket.c:546
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "Ezin da \"%s\" ostalaria aurkitu"
 
-#: mutt_socket.c:487 mutt_socket.c:545
+#: mutt_socket.c:494 mutt_socket.c:552
 #, c-format
 msgid "Connecting to %s..."
 msgstr "%s-ra konektatzen..."
 
-#: mutt_socket.c:569
+#: mutt_socket.c:576
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "Ezin da %s (%s)-ra konektatu."
 
-#: mutt_ssl.c:175
+#: mutt_ssl.c:187
 msgid "Failed to find enough entropy on your system"
 msgstr "Huts zure sisteman entropia nahikoak bidaltzerakoan"
 
-#: mutt_ssl.c:199
+#: mutt_ssl.c:211
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr "Entropia elkarbiltzea betetzen: %s...\n"
 
-#: mutt_ssl.c:207
+#: mutt_ssl.c:219
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s ziurtasun gabeko biamenak ditu!"
 
-#: mutt_ssl.c:226
+#: mutt_ssl.c:238
 msgid "SSL disabled due the lack of entropy"
 msgstr "Entropia gabezia dela eta SSL ezgaitu egin da"
 
-#: mutt_ssl.c:323
+#: mutt_ssl.c:352
 msgid "I/O error"
 msgstr "S/I errorea"
 
-#: mutt_ssl.c:332
+#: mutt_ssl.c:361
 #, c-format
 msgid "SSL failed: %s"
 msgstr "SSL hutsa: %s"
 
-#: mutt_ssl.c:341 mutt_ssl_gnutls.c:504 mutt_ssl_gnutls.c:513
-#: mutt_ssl_gnutls.c:542
+#: mutt_ssl.c:370 mutt_ssl_gnutls.c:950 mutt_ssl_gnutls.c:984
+#: mutt_ssl_gnutls.c:994
 msgid "Unable to get certificate from peer"
-msgstr "auzolagunengatik ezin da ziurtagiria jaso"
+msgstr "Auzolagunengatik ezin da ziurtagiria jaso"
 
-#: mutt_ssl.c:349
+#: mutt_ssl.c:378
 #, c-format
 msgid "SSL connection using %s (%s)"
 msgstr "%s (%s) erabiltzen SSL konexioa"
 
-#: mutt_ssl.c:393
+#: mutt_ssl.c:480
 msgid "Unknown"
 msgstr "Ezezaguna"
 
-#: mutt_ssl.c:418 mutt_ssl_gnutls.c:392
+#: mutt_ssl.c:505 mutt_ssl_gnutls.c:473
 #, c-format
 msgid "[unable to calculate]"
-msgstr "[Ezin da kalkulatu]"
+msgstr "[ezin da kalkulatu]"
 
-#: mutt_ssl.c:436 mutt_ssl_gnutls.c:415
+#: mutt_ssl.c:523 mutt_ssl_gnutls.c:496
 msgid "[invalid date]"
 msgstr "[baliogabeko data]"
 
-#: mutt_ssl.c:557
+#: mutt_ssl.c:651
 msgid "Server certificate is not yet valid"
 msgstr "Jadanik zerbitzari ziurtagiria ez da baliozkoa"
 
-#: mutt_ssl.c:564
+#: mutt_ssl.c:658
 msgid "Server certificate has expired"
 msgstr "Zerbitzariaren ziurtagiria denboraz kanpo dago"
 
-#: mutt_ssl.c:630 mutt_ssl_gnutls.c:645
+#: mutt_ssl.c:780
+#, fuzzy
+msgid "cannot get certificate subject"
+msgstr "Auzolagunengatik ezin da ziurtagiria jaso"
+
+#: mutt_ssl.c:790 mutt_ssl.c:799
+#, fuzzy
+msgid "cannot get certificate common name"
+msgstr "Auzolagunengatik ezin da ziurtagiria jaso"
+
+#: mutt_ssl.c:813
+#, fuzzy, c-format
+msgid "certificate owner does not match hostname %s"
+msgstr "S/MIME ziurtagiriaren jabea ez da mezua bidali duena."
+
+#: mutt_ssl.c:854
+#, fuzzy, c-format
+msgid "Certificate host check failed: %s"
+msgstr "Ziurtagiria gordea"
+
+#: mutt_ssl.c:932 mutt_ssl_gnutls.c:732
 msgid "This certificate belongs to:"
 msgstr "Ziurtagiriaren jabea:"
 
-#: mutt_ssl.c:641 mutt_ssl_gnutls.c:684
+#: mutt_ssl.c:945 mutt_ssl_gnutls.c:771
 msgid "This certificate was issued by:"
 msgstr "Honek emandako ziurtagiria:"
 
-#: mutt_ssl.c:652 mutt_ssl_gnutls.c:723
+#: mutt_ssl.c:956 mutt_ssl_gnutls.c:810
 #, c-format
 msgid "This certificate is valid"
-msgstr "Ziurtagiri hau baliozkoa da"
+msgstr "Ziurtagiria hau baliozkoa da"
 
-#: mutt_ssl.c:653 mutt_ssl_gnutls.c:726
+#: mutt_ssl.c:957 mutt_ssl_gnutls.c:813
 #, c-format
 msgid "   from %s"
 msgstr "   %s-tik"
 
-#: mutt_ssl.c:655 mutt_ssl_gnutls.c:730
+#: mutt_ssl.c:959 mutt_ssl_gnutls.c:817
 #, c-format
 msgid "     to %s"
 msgstr "     %s-ra"
 
-#: mutt_ssl.c:661
+#: mutt_ssl.c:965
 #, c-format
 msgid "Fingerprint: %s"
 msgstr "Hatz-marka: %s"
 
-#: mutt_ssl.c:663
-msgid "SSL Certificate check"
-msgstr "SSL Ziurtagiri arakatzea"
+#: mutt_ssl.c:968 mutt_ssl_gnutls.c:854
+#, c-format
+msgid "SSL Certificate check (certificate %d of %d in chain)"
+msgstr ""
 
-#: mutt_ssl.c:667 mutt_ssl_gnutls.c:771
+#: mutt_ssl.c:976 mutt_ssl_gnutls.c:863
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "(u)katu, behin (o)nartu, (b)etirko onartu"
 
-#: mutt_ssl.c:668 mutt_ssl_gnutls.c:772
+#: mutt_ssl.c:977 mutt_ssl_gnutls.c:864
 msgid "roa"
 msgstr "uob"
 
-#: mutt_ssl.c:672 mutt_ssl_gnutls.c:776
+#: mutt_ssl.c:981 mutt_ssl_gnutls.c:868
 msgid "(r)eject, accept (o)nce"
 msgstr "(u)katu, behin (o)nartu"
 
-#: mutt_ssl.c:673 mutt_ssl_gnutls.c:777
+#: mutt_ssl.c:982 mutt_ssl_gnutls.c:869
 msgid "ro"
 msgstr "uo"
 
-#: mutt_ssl.c:704 mutt_ssl_gnutls.c:826
+#: mutt_ssl.c:1013 mutt_ssl_gnutls.c:918
 msgid "Warning: Couldn't save certificate"
 msgstr "Kontuz: Ezin da ziurtagiria gorde"
 
-#: mutt_ssl.c:709 mutt_ssl_gnutls.c:831
+#: mutt_ssl.c:1018 mutt_ssl_gnutls.c:923
 msgid "Certificate saved"
 msgstr "Ziurtagiria gordea"
 
-#: mutt_ssl_gnutls.c:96 mutt_ssl_gnutls.c:119
+#: mutt_ssl_gnutls.c:106 mutt_ssl_gnutls.c:133
 msgid "Error: no TLS socket open"
 msgstr "Errorea ez da TLS socket-ik ireki"
 
-#: mutt_ssl_gnutls.c:215
+#: mutt_ssl_gnutls.c:292
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr "TLS/SSL bidezko protokolo erabilgarri guztiak ezgaiturik"
 
-#: mutt_ssl_gnutls.c:276
+#: mutt_ssl_gnutls.c:356
 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "SSL/TLS konexioa hau erabiliaz: %s (%s/%s/%s)"
 
-#: mutt_ssl_gnutls.c:519
-#, c-format
-msgid "Certificate verification error (%s)"
-msgstr "Ziurtagiria egiaztapen errorea (%s)"
-
-#: mutt_ssl_gnutls.c:527
-msgid "Certificate is not X.509"
-msgstr "Ziurtagiria ez da X.509"
-
-#: mutt_ssl_gnutls.c:534
+#: mutt_ssl_gnutls.c:563 mutt_ssl_gnutls.c:712
 msgid "Error initialising gnutls certificate data"
 msgstr "Errorea gnutls ziurtagiri datuak abiaraztean"
 
-#: mutt_ssl_gnutls.c:550
+#: mutt_ssl_gnutls.c:570 mutt_ssl_gnutls.c:719
 msgid "Error processing certificate data"
 msgstr "Errorea ziurtagiri datuak prozesatzerakoan"
 
-#: mutt_ssl_gnutls.c:735
+#: mutt_ssl_gnutls.c:703
+msgid "Warning: Server certificate was signed using an insecure algorithm"
+msgstr ""
+
+#: mutt_ssl_gnutls.c:822
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "SHA1 Hatz-marka: %s"
 
-#: mutt_ssl_gnutls.c:738
+#: mutt_ssl_gnutls.c:825
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "MD5 Hatz-marka: %s"
 
-#: mutt_ssl_gnutls.c:743
+#: mutt_ssl_gnutls.c:830
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "ABISUA Zerbitzari ziurtagiria ez baliozkoa dagoeneko"
 
-#: mutt_ssl_gnutls.c:748
+#: mutt_ssl_gnutls.c:835
 msgid "WARNING: Server certificate has expired"
 msgstr "ABISUA Zerbitzaria ziurtagiria iraungi egin da"
 
-#: mutt_ssl_gnutls.c:753
+#: mutt_ssl_gnutls.c:840
 msgid "WARNING: Server certificate has been revoked"
 msgstr "ABISUA Zerbitzariaziurtagiria errebokatu egin da"
 
-#: mutt_ssl_gnutls.c:758
+#: mutt_ssl_gnutls.c:845
 msgid "WARNING: Server hostname does not match certificate"
 msgstr "ABISUA Zerbitzari ostalari izena ez da ziurtagiriko berdina"
 
-#: mutt_ssl_gnutls.c:763
+#: mutt_ssl_gnutls.c:850
 msgid "WARNING: Signer of server certificate is not a CA"
-msgstr "WARNING: Zerbitzari ziurtagiri sinatzailea ez da CA"
+msgstr "KONTUZ:: Zerbitzari ziurtagiri sinatzailea ez da CA"
 
-#: mutt_ssl_gnutls.c:766
-msgid "TLS/SSL Certificate check"
-msgstr "TLS/SSL Ziurtagiria egiaztapena"
+#: mutt_ssl_gnutls.c:956
+#, c-format
+msgid "Certificate verification error (%s)"
+msgstr "Ziurtagiria egiaztapen errorea (%s)"
+
+#: mutt_ssl_gnutls.c:965
+msgid "Certificate is not X.509"
+msgstr "Ziurtagiria ez da X.509"
 
 #: mutt_tunnel.c:72
 #, c-format
@@ -3050,41 +3151,41 @@ msgstr "%s-rako tunelak %d errorea itzuli du (%s)"
 msgid "Tunnel error talking to %s: %s"
 msgstr "Tunel errorea %s-rekiko konexioan: %s"
 
-#: muttlib.c:911
+#: muttlib.c:976
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr ""
-"Fitxategia direktorioa bat da, honen barnean gorde?[(b)ai, (e)z, d(a)na]\t"
+"Fitxategia direktorioa bat da, honen barnean gorde?[(b)ai, (e)z, d(a)na]"
 
-#: muttlib.c:911
+#: muttlib.c:976
 msgid "yna"
 msgstr "bea"
 
-#: muttlib.c:927
+#: muttlib.c:992
 msgid "File is a directory, save under it?"
-msgstr "Fitxategia direktorio bat da. Honen barnean gorde?"
+msgstr "Fitxategia direktorio bat da, honen barnean gorde?"
 
-#: muttlib.c:933
+#: muttlib.c:998
 msgid "File under directory: "
 msgstr "Direktorio barneko fitxategiak: "
 
-#: muttlib.c:945
+#: muttlib.c:1010
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "Fitxategia existitzen da (b)erridatzi, (g)ehitu edo (e)zeztatu?"
 
-#: muttlib.c:945
+#: muttlib.c:1010
 msgid "oac"
 msgstr "bge"
 
-#: muttlib.c:1429
+#: muttlib.c:1511
 msgid "Can't save message to POP mailbox."
 msgstr "Ezin da mezua POP postakutxan gorde."
 
-#: muttlib.c:1438
+#: muttlib.c:1520
 #, c-format
 msgid "Append messages to %s?"
 msgstr "Mezuak %s-ra gehitu?"
 
-#: muttlib.c:1450
+#: muttlib.c:1532
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s ez da postakutxa bat!"
@@ -3097,7 +3198,7 @@ msgstr "Blokeo kontua gainditua, %s-ren blokeoa ezabatu?"
 #: mx.c:128
 #, c-format
 msgid "Can't dotlock %s.\n"
-msgstr "Ezin Izan da dotlock bidez %s blokeatu.\n"
+msgstr "Ezin izan da dotlock bidez %s blokeatu.\n"
 
 #: mx.c:184
 msgid "Timeout exceeded while attempting fcntl lock!"
@@ -3117,196 +3218,193 @@ msgstr "flock lock itxaroten denbora amaitu da!"
 msgid "Waiting for flock attempt... %d"
 msgstr "flock eskuratzea itxaroten... %d"
 
-#: mx.c:586
+#: mx.c:555
 #, c-format
 msgid "Couldn't lock %s\n"
 msgstr "Ezin da %s blokeatu\n"
 
-#: mx.c:798
+#: mx.c:771
 #, c-format
 msgid "Could not synchronize mailbox %s!"
 msgstr "Ezin da %s postakutxa eguneratu!"
 
-#: mx.c:862
+#: mx.c:835
 #, c-format
 msgid "Move read messages to %s?"
 msgstr "Irakurritako mezuak %s-ra mugitu?"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111
 #, c-format
 msgid "Purge %d deleted message?"
 msgstr "Ezabatutako %d mezua betirako ezabatu?"
 
-#: mx.c:878 mx.c:1130
+#: mx.c:851 mx.c:1111
 #, c-format
 msgid "Purge %d deleted messages?"
 msgstr "Ezabatutako %d mezuak betirako ezabatu?"
 
-#: mx.c:898
+#: mx.c:872
 #, c-format
 msgid "Moving read messages to %s..."
 msgstr "Irakurritako mezuak %s-ra mugitzen..."
 
-#: mx.c:957 mx.c:1121
+#: mx.c:932 mx.c:1102
 msgid "Mailbox is unchanged."
 msgstr "Postakutxak ez du aldaketarik."
 
-#: mx.c:993
+#: mx.c:972
 #, c-format
 msgid "%d kept, %d moved, %d deleted."
-msgstr "%d utzi, %d mugiturik, %d ezabaturik"
+msgstr "%d utzi, %d mugiturik, %d ezabaturik."
 
-#: mx.c:996 mx.c:1170
+#: mx.c:975 mx.c:1154
 #, c-format
 msgid "%d kept, %d deleted."
-msgstr "%d utzi, %d ezabaturik"
+msgstr "%d utzi, %d ezabaturik."
 
-#: mx.c:1106
+#: mx.c:1086
 #, c-format
 msgid " Press '%s' to toggle write"
 msgstr " %s sakatu idatzitarikoa aldatzeko"
 
-#: mx.c:1108
+#: mx.c:1088
 msgid "Use 'toggle-write' to re-enable write!"
 msgstr "'toogle-write' erabili idazketa berriz gaitzeko!"
 
-#: mx.c:1110
+#: mx.c:1090
 #, c-format
 msgid "Mailbox is marked unwritable. %s"
 msgstr "Postakutxa idaztezin bezala markatuta. %s"
 
-#: mx.c:1167
+#: mx.c:1148
 msgid "Mailbox checkpointed."
-msgstr "Postakutxa markaturik"
+msgstr "Postakutxa markaturik."
 
-#: mx.c:1479
+#: mx.c:1466
 msgid "Can't write message"
-msgstr "Ezin da mezua idatzi."
+msgstr "Ezin da mezua idatzi"
 
-#: mx.c:1524
+#: mx.c:1505
 msgid "Integer overflow -- can't allocate memory."
-msgstr "Integral gainezkatzea -- ezin da memoria esleitu"
+msgstr "Integral gainezkatzea -- ezin da memoria esleitu."
 
-#: pager.c:1481
+#: pager.c:1531
 msgid "PrevPg"
 msgstr "AurrekoOrria"
 
-#: pager.c:1482
+#: pager.c:1532
 msgid "NextPg"
 msgstr "HurrengoOrria"
 
-#: pager.c:1486
+#: pager.c:1536
 msgid "View Attachm."
 msgstr "Ikusi gehigar."
 
-#: pager.c:1489
+#: pager.c:1539
 msgid "Next"
 msgstr "Hurrengoa"
 
 #. emulate "less -q" and don't go on to the next message.
-#: pager.c:1895 pager.c:1926 pager.c:1958 pager.c:2199
+#: pager.c:1940 pager.c:1971 pager.c:2003 pager.c:2279
 msgid "Bottom of message is shown."
 msgstr "Mezuaren bukaera erakutsita dago."
 
-#: pager.c:1911 pager.c:1933 pager.c:1940 pager.c:1947
+#: pager.c:1956 pager.c:1978 pager.c:1985 pager.c:1992
 msgid "Top of message is shown."
 msgstr "Mezuaren hasiera erakutsita dago."
 
-#: pager.c:2016
-msgid "Reverse search: "
-msgstr "Atzetik aurrera bilatu:"
-
-#: pager.c:2017
-msgid "Search: "
-msgstr "Bilatu: "
-
-#: pager.c:2137
+#: pager.c:2217
 msgid "Help is currently being shown."
 msgstr "Laguntza erakutsirik dago."
 
-#: pager.c:2166
+#: pager.c:2246
 msgid "No more quoted text."
 msgstr "Ez dago gakoarteko testu gehiago."
 
-#: pager.c:2179
+#: pager.c:2259
 msgid "No more unquoted text after quoted text."
 msgstr "Ez dago gakogabeko testu gehiago gakoarteko testuaren ondoren."
 
-# boundary es un parámetro definido por el estándar MIME
-#: parse.c:622
+# boundary es un parámetro definido por el estándar MIME
+#: parse.c:577
 msgid "multipart message has no boundary parameter!"
 msgstr "zati anitzeko mezuak ez du errebote parametrorik!"
 
-#: pattern.c:275
+#: pattern.c:264
 #, c-format
 msgid "Error in expression: %s"
 msgstr "Espresioan errorea: %s"
 
-#: pattern.c:280
+#: pattern.c:269
 #, c-format
 msgid "Empty expression"
 msgstr "Espresio hutsa"
 
-#: pattern.c:411
+#: pattern.c:402
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "Baliogabeko hilabete eguna: %s"
 
-#: pattern.c:425
+#: pattern.c:416
 #, c-format
 msgid "Invalid month: %s"
 msgstr "Baliogabeko hilabetea: %s"
 
 #. getDate has its own error message, don't overwrite it here
-#: pattern.c:577
+#: pattern.c:568
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "Data erlatibo baliogabea: %s"
 
-#: pattern.c:591
+#: pattern.c:582
 msgid "error in expression"
 msgstr "errorea espresioan"
 
-#: pattern.c:812 pattern.c:958
+#: pattern.c:804 pattern.c:956
 #, c-format
 msgid "error in pattern at: %s"
-msgstr "Patroiean akatsa: %s"
+msgstr "patroiean akatsa: %s"
+
+#: pattern.c:830
+#, fuzzy, c-format
+msgid "missing pattern: %s"
+msgstr "galdutako parametroa"
 
-#: pattern.c:842
+#: pattern.c:840
 #, c-format
 msgid "mismatched brackets: %s"
 msgstr "parentesiak ez datoz bat: %s"
 
-#: pattern.c:898
-#, fuzzy, c-format
+#: pattern.c:896
+#, c-format
 msgid "%c: invalid pattern modifier"
-msgstr "%c: Baliogabeko komandoa"
+msgstr "%c: patroi eraldatzaile baliogabea"
 
-#: pattern.c:904
+#: pattern.c:902
 #, c-format
 msgid "%c: not supported in this mode"
-msgstr "%c: Ez da onartzen modu honetan."
+msgstr "%c: ez da onartzen modu honetan"
 
-#: pattern.c:917
+#: pattern.c:915
 #, c-format
 msgid "missing parameter"
 msgstr "galdutako parametroa"
 
-#: pattern.c:933
+#: pattern.c:931
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "parentesiak ez datoz bat: %s"
 
-#: pattern.c:965
+#: pattern.c:963
 msgid "empty pattern"
 msgstr "patroi hutsa"
 
-#: pattern.c:1218
+#: pattern.c:1217
 #, c-format
 msgid "error: unknown op %d (report this error)."
-msgstr "errorea:%d aukera ezezaguna (errore honen berri eman)"
+msgstr "errorea:%d aukera ezezaguna (errore honen berri eman)."
 
-#: pattern.c:1301 pattern.c:1436
+#: pattern.c:1300 pattern.c:1438
 msgid "Compiling search pattern..."
 msgstr "Bilaketa patroia konpilatzen..."
 
@@ -3318,19 +3416,19 @@ msgstr "Markaturiko mezuetan komandoa abiarazten..."
 msgid "No messages matched criteria."
 msgstr "Ez eskatutako parametroetako mezurik aurkitu."
 
-#: pattern.c:1469
+#: pattern.c:1467
 msgid "Searching..."
 msgstr "Bilatzen..."
 
-#: pattern.c:1482
+#: pattern.c:1480
 msgid "Search hit bottom without finding match"
 msgstr "Bilaketa bukaeraraino iritsi da parekorik aurkitu gabe"
 
-#: pattern.c:1493
+#: pattern.c:1491
 msgid "Search hit top without finding match"
 msgstr "Bilaketa hasieraraino iritsi da parekorik aurkitu gabe"
 
-#: pattern.c:1525
+#: pattern.c:1523
 msgid "Search interrupted."
 msgstr "Bilaketa geldiarazirik."
 
@@ -3342,11 +3440,11 @@ msgstr "Sar PGP pasahitza:"
 msgid "PGP passphrase forgotten."
 msgstr "PGP pasahitza ahazturik."
 
-#: pgp.c:358
+#: pgp.c:368
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- Errorea: Ezin da PGP azpiprozesua sortu! --]\n"
 
-#: pgp.c:392 pgp.c:641 pgp.c:845
+#: pgp.c:402 pgp.c:659 pgp.c:863
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3354,20 +3452,20 @@ msgstr ""
 "[-- PGP irteeraren amaiera --]\n"
 "\n"
 
-#: pgp.c:412 pgp.c:460 pgp.c:977
+#: pgp.c:424 pgp.c:475 pgp.c:998
 msgid "Could not decrypt PGP message"
 msgstr "Ezin da PGP mezua desenkriptatu"
 
 #. clear 'Invoking...' message, since there's no error
-#: pgp.c:462 pgp.c:973
+#: pgp.c:477 pgp.c:994
 msgid "PGP message successfully decrypted."
 msgstr "PGP mezua arrakastatsuki desenkriptatu da."
 
-#: pgp.c:749
+#: pgp.c:767
 msgid "Internal error. Inform <roessler@does-not-exist.org>."
 msgstr "Barne arazoa. Berri eman <roessler@does-not-exist.org>."
 
-#: pgp.c:810
+#: pgp.c:828
 msgid ""
 "[-- Error: could not create a PGP subprocess! --]\n"
 "\n"
@@ -3375,34 +3473,52 @@ msgstr ""
 "[-- Errorea: ezin da PGP azpiprozesua sortu! --]\n"
 "\n"
 
-#: pgp.c:854
+#: pgp.c:875
 msgid "Decryption failed"
 msgstr "Desenkriptazio hutsa"
 
-#: pgp.c:1029
+#: pgp.c:1050
 msgid "Can't open PGP subprocess!"
 msgstr "Ezin da PGP azpiprozesua ireki!"
 
-#: pgp.c:1466
+#: pgp.c:1487
 msgid "Can't invoke PGP"
 msgstr "Ezin da PGP deitu"
 
-#: pgp.c:1567
-#, c-format
-msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+#: pgp.c:1592
+#, fuzzy, c-format
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "
 msgstr "PGP (e)nkript, (s)ina, sign (a)tu hola, (b)iak, %s, edo (g)arbitu? "
 
-#: pgp.c:1568
+#: pgp.c:1593
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1568
+#: pgp.c:1593
 msgid "(i)nline"
 msgstr "(i)barnean"
 
-#: pgp.c:1570
-msgid "esabifc"
-msgstr "esabifg"
+#. The keys accepted for this prompt *must* match the order in the second
+#. * version in the else clause since the switch statement below depends on
+#. * it.  The 'i' key is appended in this version.
+#.
+#: pgp.c:1599
+#, fuzzy
+msgid "esabfci"
+msgstr "esabpfg"
+
+#. The keys accepted *must* be a prefix of the accepted keys in the "if"
+#. * clause above since the switch statement below depends on it.
+#.
+#: pgp.c:1606
+#, fuzzy
+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
+msgstr "PGP (e)nkript, (s)ina, sign (a)tu hola, (b)iak, %s, edo (g)arbitu? "
+
+#: pgp.c:1607
+#, fuzzy
+msgid "esabfc"
+msgstr "esabpfg"
 
 #: pgpinvoke.c:308
 msgid "Fetching PGP key..."
@@ -3414,30 +3530,30 @@ msgstr ""
 "Aurkitutako gako guztiak denboraz kanpo, errebokatutarik edo ezgaiturik "
 "daude."
 
-#: pgpkey.c:533
+#: pgpkey.c:532
 #, c-format
 msgid "PGP keys matching <%s>."
-msgstr "aurkitutako PGP gakoak <%s>"
+msgstr "aurkitutako PGP gakoak <%s>."
 
-#: pgpkey.c:535
+#: pgpkey.c:534
 #, c-format
 msgid "PGP keys matching \"%s\"."
-msgstr "aurkitutako PGP gakoak \"%s\"."
+msgstr "\"%s\" duten PGP gakoak."
 
-#: pgpkey.c:554 pgpkey.c:746
+#: pgpkey.c:553 pgpkey.c:745
 msgid "Can't open /dev/null"
 msgstr "Ezin da /dev/null ireki"
 
-#: pgpkey.c:725
+#: pgpkey.c:724
 msgid "Please enter the key ID: "
 msgstr "Mesedez sar ezazu gako-ID-a: "
 
-#: pgpkey.c:778
+#: pgpkey.c:777
 #, c-format
 msgid "PGP Key %s."
 msgstr "PGP Gakoa %s."
 
-#: pop.c:101 pop_lib.c:201
+#: pop.c:101 pop_lib.c:210
 #, c-format
 msgid "Command TOP is not supported by server."
 msgstr "TOP komandoa ez du zerbitzariak onartzen."
@@ -3446,69 +3562,74 @@ msgstr "TOP komandoa ez du zerbitzariak onartzen."
 msgid "Can't write header to temporary file!"
 msgstr "Ezin da burua fitxategi tenporalean gorde!"
 
-#: pop.c:267 pop_lib.c:203
+#: pop.c:267 pop_lib.c:212
 #, c-format
 msgid "Command UIDL is not supported by server."
 msgstr "UIDL komandoa ez du zerbitzariak onartzen."
 
-#: pop.c:391 pop.c:761
+#: pop.c:287
+#, fuzzy, c-format
+msgid "%d messages have been lost. Try reopening the mailbox."
+msgstr "Mezu sarrera baliogabekoa. Saia zaitez postakutxa berrirekitzen."
+
+#: pop.c:402 pop.c:785
 #, c-format
 msgid "%s is an invalid POP path"
-msgstr "%s ez da baliozko POP bidea"
+msgstr "%s ez da baliozko datu-bidea"
 
-#: pop.c:429
+#: pop.c:445
 msgid "Fetching list of messages..."
 msgstr "Mezuen zerrenda eskuratzen..."
 
-#: pop.c:587
+#: pop.c:603
 msgid "Can't write message to temporary file!"
 msgstr "Ezin da mezua fitxategi tenporalean gorde!"
 
-#: pop.c:646
+#: pop.c:662
 msgid "Marking messages deleted..."
-msgstr "Mezuak ezabatuak bezala markatzen..."
+msgstr "Mezu ezabatuak markatzen..."
 
-#: pop.c:716 pop.c:781
+#: pop.c:740 pop.c:805
 msgid "Checking for new messages..."
 msgstr "Mezu berriak bilatzen..."
 
-#: pop.c:745
+#: pop.c:769
 msgid "POP host is not defined."
 msgstr "POP ostalaria ez dago ezarririk."
 
-#: pop.c:809
+#: pop.c:833
 msgid "No new mail in POP mailbox."
 msgstr "Ez dago posta berririk POP postakutxan."
 
-#: pop.c:816
+#: pop.c:840
 msgid "Delete messages from server?"
 msgstr "Zerbitzaritik mezuak ezabatu?"
 
-#: pop.c:818
+#: pop.c:842
 #, c-format
 msgid "Reading new messages (%d bytes)..."
 msgstr "Mezu berriak irakurtzen (%d byte)..."
 
-#: pop.c:860
+#: pop.c:884
 msgid "Error while writing mailbox!"
 msgstr "Postakutxa idazterakoan errorea!"
 
-#: pop.c:864
+#: pop.c:888
 #, c-format
 msgid "%s [%d of %d messages read]"
 msgstr "%s [%d-tik %d mezu irakurririk]"
 
-#: pop.c:887 pop_lib.c:369
+#: pop.c:911 pop_lib.c:378
 msgid "Server closed connection!"
 msgstr "Zerbitzariak konexioa itxi du!"
 
 #: pop_auth.c:78
 msgid "Authenticating (SASL)..."
-msgstr "(SASL) autentifikazioa..."
+msgstr "Autentifikatzen (SASL)..."
 
 #: pop_auth.c:188
 msgid "POP timestamp is invalid!"
-msgstr ""
+msgstr "POP data-marka baliogabea!"
 
 #: pop_auth.c:193
 msgid "Authenticating (APOP)..."
@@ -3523,203 +3644,213 @@ msgstr "APOP autentifikazioak huts egin du."
 msgid "Command USER is not supported by server."
 msgstr "USER komandoa ez du zerbitzariak onartzen."
 
-#: pop_lib.c:199
+#: pop_lib.c:55
+#, fuzzy, c-format
+msgid "Invalid POP URL: %s\n"
+msgstr "Okerreko SMTP URLa: %s"
+
+#: pop_lib.c:208
 msgid "Unable to leave messages on server."
 msgstr "Ezin dira mezuak zerbitzarian utzi."
 
-#: pop_lib.c:229
+#: pop_lib.c:238
 #, c-format
 msgid "Error connecting to server: %s"
 msgstr "Errorea zerbitzariarekin konektatzerakoan: %s"
 
-#: pop_lib.c:383
+#: pop_lib.c:392
 msgid "Closing connection to POP server..."
 msgstr "POP Zerbitzariarekiko konexioa ixten..."
 
-#: pop_lib.c:553
+#: pop_lib.c:563
 msgid "Verifying message indexes..."
 msgstr "Mezu indizea egiaztatzen..."
 
-#: pop_lib.c:575
+#: pop_lib.c:585
 msgid "Connection lost. Reconnect to POP server?"
-msgstr "Konexioa galdua. POP zerbitzariarekiko konexioa berrasi?"
+msgstr "Konexioa galdua. POP zerbitzariarekiko konexio berrasi?"
 
-#: postpone.c:167
+#: postpone.c:165
 msgid "Postponed Messages"
 msgstr "Atzeratutako mezuak"
 
-#: postpone.c:247 postpone.c:256
+#: postpone.c:245 postpone.c:254
 msgid "No postponed messages."
 msgstr "Ez da atzeraturiko mezurik."
 
-#: postpone.c:444 postpone.c:465 postpone.c:499
+#: postpone.c:442 postpone.c:463 postpone.c:497
 msgid "Illegal crypto header"
-msgstr "Baliogabeko PGP burukoa"
+msgstr "Kriptografia baliogabeko burukoa"
 
-#: postpone.c:485
+#: postpone.c:483
 msgid "Illegal S/MIME header"
 msgstr "Baliogabeko S/MIME burukoa"
 
-#: postpone.c:565
+#: postpone.c:563
 msgid "Decrypting message..."
 msgstr "Mezua desenkriptatzen..."
 
-#: postpone.c:574
+#: postpone.c:572
 msgid "Decryption failed."
 msgstr "Deskribapenak huts egin du."
 
-#: query.c:51
+#: query.c:50
 msgid "New Query"
 msgstr "Bilaketa berria"
 
-#: query.c:52
+#: query.c:51
 msgid "Make Alias"
 msgstr "Aliasa egin"
 
-#: query.c:53
+#: query.c:52
 msgid "Search"
 msgstr "Bilatu"
 
-#: query.c:101
+#: query.c:95
 msgid "Waiting for response..."
-msgstr "Erantzunaren zain..."
+msgstr "Erantzunaren zai..."
 
-#: query.c:263 query.c:291
+#: query.c:246 query.c:274
 msgid "Query command not defined."
 msgstr "Bilaketa komadoa ezarri gabea."
 
-#: query.c:318
+#: query.c:301
 #, c-format
 msgid "Query"
 msgstr "Bilaketa"
 
 #. Prompt for Query
-#: query.c:331 query.c:356
+#: query.c:313 query.c:338
 msgid "Query: "
 msgstr "Bilaketa: "
 
-#: query.c:339 query.c:365
+#: query.c:321 query.c:347
 #, c-format
 msgid "Query '%s'"
 msgstr "Bilaketa '%s'"
 
-#: recvattach.c:56
+#: recvattach.c:55
 msgid "Pipe"
 msgstr "Hodia"
 
-#: recvattach.c:57
+#: recvattach.c:56
 msgid "Print"
 msgstr "Inprimatu"
 
-#: recvattach.c:473
+#: recvattach.c:484
 msgid "Saving..."
 msgstr "Gordetzen..."
 
-#: recvattach.c:476 recvattach.c:567
+#: recvattach.c:487 recvattach.c:578
 msgid "Attachment saved."
 msgstr "Gehigarria gordea."
 
-#: recvattach.c:579
+#: recvattach.c:590
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
-msgstr "KONTUZ!  %s gainetik idaztera zoaz. Jarraitu ?"
+msgstr "KONTUZ!  %s gainetik idaztera zoaz, Jarraitu ?"
 
-#: recvattach.c:597
+#: recvattach.c:608
 msgid "Attachment filtered."
 msgstr "Gehigarria iragazirik."
 
-#: recvattach.c:664
+#: recvattach.c:675
 msgid "Filter through: "
-msgstr "Honen arabera iragazi:"
+msgstr "Iragazi honen arabera: "
 
-#: recvattach.c:664
+#: recvattach.c:675
 msgid "Pipe to: "
-msgstr "komandora hodia egin:"
+msgstr "Komandora hodia egin: "
 
-#: recvattach.c:699
+#: recvattach.c:710
 #, c-format
 msgid "I dont know how to print %s attachments!"
 msgstr "Ez dakit nola inprimatu %s gehigarriak!"
 
-#: recvattach.c:764
+#: recvattach.c:775
 msgid "Print tagged attachment(s)?"
-msgstr "Markaturiko gehigarria(K) inprimatu?"
+msgstr "Markaturiko mezua(k) inprimatu?"
 
-#: recvattach.c:764
+#: recvattach.c:775
 msgid "Print attachment?"
 msgstr "Gehigarria inprimatu?"
 
-#: recvattach.c:997
+#: recvattach.c:1008
 msgid "Can't decrypt encrypted message!"
-msgstr "Ezin da enkriptaturiko mezua desenkriptatu!"
+msgstr "Ezin da enkriptaturiko mezua desenkriptratu!"
 
-#: recvattach.c:1010
+#: recvattach.c:1020
 msgid "Attachments"
 msgstr "Gehigarriak"
 
-#: recvattach.c:1046
+#: recvattach.c:1056
 msgid "There are no subparts to show!"
 msgstr "Hemen ez dago erakusteko azpizatirik!"
 
-#: recvattach.c:1107
+#: recvattach.c:1117
 msgid "Can't delete attachment from POP server."
 msgstr "Ezi da gehigarria POP zerbitzaritik ezabatu."
 
-#: recvattach.c:1115
+#: recvattach.c:1125
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "Enkriptaturiko mezuetatik gehigarriak ezabatzea ez da onartzen."
 
-#: recvattach.c:1134 recvattach.c:1151
+#: recvattach.c:1144 recvattach.c:1161
 msgid "Only deletion of multipart attachments is supported."
 msgstr "Zati anitzetako gehigarrien ezabaketa bakarrik onartzen da."
 
-#: recvcmd.c:47
+#: recvcmd.c:43
 msgid "You may only bounce message/rfc822 parts."
-msgstr "Bakarrik message/rfc822 motatako zatiak errebota ditzakezu."
+msgstr "Bakarrik message/rfc822 motako zatiak errebota ditzakezu."
 
-#: recvcmd.c:217
+#: recvcmd.c:148 recvcmd.c:161
+msgid "Warning: message contains no From: header"
+msgstr ""
+
+#: recvcmd.c:241
 msgid "Error bouncing message!"
 msgstr "Errorea mezua errebotatzerakoan!"
 
-#: recvcmd.c:217
+#: recvcmd.c:241
 msgid "Error bouncing messages!"
 msgstr "Errorea mezuak errebotatzerakoan!"
 
-#: recvcmd.c:417
+#: recvcmd.c:441
 #, c-format
 msgid "Can't open temporary file %s."
-msgstr "Ezin da %s aldiroko fitxategi ireki."
+msgstr "Ezin da %s behin-behineko fitxategia ireki."
 
-#: recvcmd.c:448
+#: recvcmd.c:472
 msgid "Forward as attachments?"
 msgstr "Gehigarri bezala berbidali?"
 
-#: recvcmd.c:462
+#: recvcmd.c:486
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr ""
-"Ezin dira markaturiko mezu guztiak dekodifikatu.  Besteak MIME bezala bidali?"
+"Ezin dira markaturiko mezu guztiak deskodifikatu.  Besteak MIME bezala "
+"bidali?"
 
-#: recvcmd.c:587
+#: recvcmd.c:611
 msgid "Forward MIME encapsulated?"
 msgstr "MIME enkapsulaturik berbidali?"
 
-#: recvcmd.c:595 recvcmd.c:845
+#: recvcmd.c:619 recvcmd.c:869
 #, c-format
 msgid "Can't create %s."
 msgstr "Ezin da %s sortu."
 
-#: recvcmd.c:728
+#: recvcmd.c:752
 msgid "Can't find any tagged messages."
 msgstr "Ezin da markaturiko mezurik aurkitu."
 
-#: recvcmd.c:749 send.c:728
+#: recvcmd.c:773 send.c:738
 msgid "No mailing lists found!"
-msgstr "Ez da ePosta zerrendarik aurkitu"
+msgstr "Ez da eposta zerrendarik aurkitu!"
 
-#: recvcmd.c:824
+#: recvcmd.c:848
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr ""
-"Ezin dira markaturiko mezu guztiak dekodifikatu.  MIME enkapsulatu besteak?"
+"Ezin dira markaturiko mezu guztiak deskodifikatu.  MIME enkapsulatu besteak?"
 
 #: remailer.c:485
 msgid "Append"
@@ -3739,65 +3870,65 @@ msgstr "Ados"
 
 #: remailer.c:517
 msgid "Can't get mixmaster's type2.list!"
-msgstr "mixmaster's type2.zerrenda ezin da eskuratu!"
+msgstr "Mixmaster-en type2.zerrenda ezin da eskuratu!"
 
-#: remailer.c:543
+#: remailer.c:542
 msgid "Select a remailer chain."
-msgstr "berbidaltze katea aukeratu."
+msgstr "Berbidaltze katea aukeratu."
 
-#: remailer.c:603
+#: remailer.c:602
 #, c-format
 msgid "Error: %s can't be used as the final remailer of a chain."
-msgstr "Errorea: %s ezin da katearen azken berbidaltzaile bezala erabili."
+msgstr "Errorea: %s ezin da katearen azken berbidaltze bezala erabili."
 
-#: remailer.c:633
+#: remailer.c:632
 #, c-format
 msgid "Mixmaster chains are limited to %d elements."
 msgstr "Mixmaster kateak %d elementuetara mugaturik daude."
 
-#: remailer.c:656
+#: remailer.c:655
 msgid "The remailer chain is already empty."
 msgstr "Berbidaltzaile katea dagoeneko betea dago."
 
-#: remailer.c:666
+#: remailer.c:665
 msgid "You already have the first chain element selected."
 msgstr "Zuk dagoeneko kateko lehenengo elementua aukeraturik duzu."
 
-#: remailer.c:676
+#: remailer.c:675
 msgid "You already have the last chain element selected."
 msgstr "Zuk dagoeneko kateko azkenengo elementua aukeraturik duzu."
 
-#: remailer.c:715
+#: remailer.c:714
 msgid "Mixmaster doesn't accept Cc or Bcc headers."
 msgstr "Miixmasterrek ez du Cc eta Bcc burukorik onartzen."
 
-#: remailer.c:739
+#: remailer.c:738
 msgid ""
 "Please set the hostname variable to a proper value when using mixmaster!"
 msgstr "Mesedez ezarri mixmaster erabiltzen denerako ostalari izen egokia!"
 
-#: remailer.c:773
+#: remailer.c:772
 #, c-format
 msgid "Error sending message, child exited %d.\n"
 msgstr "Errorea mezua bidaltzerakoan, azpiprozesua uzten %d.\n"
 
-#: remailer.c:777
+#: remailer.c:776
 msgid "Error sending message."
 msgstr "Errorea mezua bidaltzerakoan."
 
-#: rfc1524.c:163
+#: rfc1524.c:164
 #, c-format
 msgid "Improperly formated entry for type %s in \"%s\" line %d"
-msgstr "Gaizki eratutako %s motatako sarrera \"%s\"-n %d lerroan"
+msgstr "Gaizki eratutako %s motako sarrera \"%s\"-n %d lerroan"
 
-#: rfc1524.c:395
+#: rfc1524.c:396
 msgid "No mailcap path specified"
 msgstr "Ez da mailcap bidea ezarri"
 
-#: rfc1524.c:423
+#: rfc1524.c:424
 #, c-format
 msgid "mailcap entry for type %s not found"
-msgstr "Ez da aurkitu %s motatako mailcap sarrerarik"
+msgstr "ez da aurkitu %s motako mailcap sarrerarik"
 
 #: score.c:75
 msgid "score: too few arguments"
@@ -3807,11 +3938,15 @@ msgstr "score: argumentu gutxiegi"
 msgid "score: too many arguments"
 msgstr "score: argumentu gehiegi"
 
-#: send.c:253
+#: score.c:122
+msgid "Error: score: invalid number"
+msgstr ""
+
+#: send.c:252
 msgid "No subject, abort?"
 msgstr "Ez du gairik, ezeztatu?"
 
-#: send.c:255
+#: send.c:254
 msgid "No subject, aborting."
 msgstr "Ez du gairik, ezeztatzen."
 
@@ -3820,12 +3955,12 @@ msgstr "Ez du gairik, ezeztatzen."
 #. * to send a message to only the sender of the message.  This
 #. * provides a way to do that.
 #.
-#: send.c:497
+#: send.c:501
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "%s%s-ra erantzun?"
 
-#: send.c:531
+#: send.c:535
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "Jarraitu %s%s-ra?"
@@ -3833,114 +3968,120 @@ msgstr "Jarraitu %s%s-ra?"
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.
 #.
-#: send.c:703
+#: send.c:713
 msgid "No tagged messages are visible!"
 msgstr "Ez da markatutako mezu ikusgarririk!"
 
-#: send.c:754
+#: send.c:764
 msgid "Include message in reply?"
 msgstr "Erantzunean mezua gehitu?"
 
-#: send.c:759
+#: send.c:769
 msgid "Including quoted message..."
-msgstr "markaturiko mezua gehitzen..."
+msgstr "Markaturiko mezua gehitzen..."
 
-#: send.c:769
+#: send.c:779
 msgid "Could not include all requested messages!"
 msgstr "Ezin dira eskaturiko mezu guztiak gehitu!"
 
-#: send.c:783
+#: send.c:793
 msgid "Forward as attachment?"
 msgstr "Gehigarri gisa berbidali?"
 
-#: send.c:787
+#: send.c:797
 msgid "Preparing forwarded message..."
 msgstr "Berbidalketa mezua prestatzen..."
 
 #. If the user is composing a new message, check to see if there
 #. * are any postponed messages first.
 #.
-#: send.c:1117
+#: send.c:1147
 msgid "Recall postponed message?"
-msgstr "Atzeraturiko mezuak artu?"
+msgstr "Atzeraturiko mezuak hartu?"
 
-#: send.c:1429
+#: send.c:1379
 msgid "Edit forwarded message?"
-msgstr "berbidalitako mezua editatu?"
+msgstr "Berbidalitako mezua editatu?"
 
-#: send.c:1469
+#: send.c:1419
 msgid "Abort unmodified message?"
 msgstr "Aldatugabeko mezua ezeztatu?"
 
-#: send.c:1471
+#: send.c:1421
 msgid "Aborted unmodified message."
 msgstr "Aldatugabeko mezua ezeztatuta."
 
-#: send.c:1540
+#: send.c:1564
 msgid "Message postponed."
 msgstr "Mezua atzeraturik."
 
-#: send.c:1549
+#: send.c:1574
 msgid "No recipients are specified!"
 msgstr "Ez da hartzailerik eman!"
 
-#: send.c:1554
+#: send.c:1579
 msgid "No recipients were specified."
 msgstr "Ez zen hartzailerik eman."
 
-#: send.c:1570
+#: send.c:1595
 msgid "No subject, abort sending?"
 msgstr "Ez dago gairik, bidalketa ezeztatzen?"
 
-#: send.c:1574
+#: send.c:1599
 msgid "No subject specified."
 msgstr "Ez da gairik ezarri."
 
-#: send.c:1636 smtp.c:158
+#: send.c:1661 smtp.c:185
 msgid "Sending message..."
 msgstr "Mezua bidaltzen..."
 
-#: send.c:1777
+#. check to see if the user wants copies of all attachments
+#: send.c:1694
+#, fuzzy
+msgid "Save attachments in Fcc?"
+msgstr "gehigarriak testua balira ikusi"
+
+#: send.c:1803
 msgid "Could not send the message."
 msgstr "Ezin da mezua bidali."
 
-#: send.c:1782
+#: send.c:1808
 msgid "Mail sent."
 msgstr "Mezua bidalirik."
 
-#: send.c:1782
+#: send.c:1808
 msgid "Sending in background."
 msgstr "Bigarren planoan bidaltzen."
 
-#: sendlib.c:410
+#: sendlib.c:425
 msgid "No boundary parameter found! [report this error]"
 msgstr "Ez da birbidalketa parametroa aurkitu! [errore honen berri eman]"
 
-#: sendlib.c:440
+#: sendlib.c:455
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s ez da gehiago existitzen!"
 
-#: sendlib.c:863
+#: sendlib.c:878
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s ez da fitxategi erregularra."
 
-#: sendlib.c:1035
+#: sendlib.c:1050
 #, c-format
 msgid "Could not open %s"
 msgstr "Ezin da %s ireki"
 
-#: sendlib.c:2228
+#: sendlib.c:2414
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "Errorea mezua bidaltzerakoan, azpiprozesua irteten %d (%s)."
 
-#: sendlib.c:2234
+#: sendlib.c:2420
 msgid "Output of the delivery process"
-msgstr "postaketa prozesuaren irteera"
+msgstr "Postaketa prozesuaren irteera"
 
-#: sendlib.c:2448
+#: sendlib.c:2594
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "%s berbidalketa inprimakia prestatzerakoan IDN okerra."
@@ -3966,7 +4107,7 @@ msgstr "Sartu S/MIME pasahitza:"
 
 #: smime.c:322
 msgid "Trusted   "
-msgstr "Fidagarria  "
+msgstr "Fidagarria   "
 
 #: smime.c:325
 msgid "Verified  "
@@ -3986,78 +4127,82 @@ msgstr "Errebokaturik   "
 
 #: smime.c:337
 msgid "Invalid   "
-msgstr "Baliogabea  "
+msgstr "Baliogabea        "
 
 #: smime.c:340
 msgid "Unknown   "
 msgstr "Ezezaguna   "
 
-#: smime.c:369
+#: smime.c:368
 msgid "Enter keyID: "
 msgstr "IDgakoa sartu: "
 
-#: smime.c:392
+#: smime.c:378
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME ziurtagiria aurkiturik \"%s\"."
 
-#: smime.c:542 smime.c:612 smime.c:630
+#: smime.c:526 smime.c:596 smime.c:614
 #, c-format
 msgid "ID %s is unverified. Do you want to use it for %s ?"
-msgstr "%s ID egiaztatu gabe. Berau %s-rako erabiltzea nahi al duzu?"
+msgstr "%s IDa egiaztatu gabe dago. Berau %s-rako erabiltzea nahi al duzu ?"
 
-#: smime.c:546 smime.c:616
+#: smime.c:530 smime.c:600
 #, c-format
 msgid "Use (untrusted!) ID %s for %s ?"
-msgstr "Erabili (segurtasun gabeko!) %s ID-a %s-rentzat?"
+msgstr "Erabili (segurtasun gabeko!) %s ID-a %s-rentzat ?"
 
-#: smime.c:549 smime.c:619
+#: smime.c:533 smime.c:603
 #, c-format
 msgid "Use ID %s for %s ?"
-msgstr "ID %s erabili %s-rentzat?"
+msgstr "ID %s erabili %s-rentzat ?"
 
-#: smime.c:638
+#: smime.c:622
 #, c-format
 msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)"
 msgstr ""
 "Kontuz: Oraindik ez duzu erabaki kofidantzako ID %s-a. (edozein tekla "
 "jarraitzeko)"
 
-#: smime.c:797
+#: smime.c:781
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr "Ez da (baliozko) ziurtagiririk aurkitu %s-rentzat."
 
-#: smime.c:852 smime.c:880 smime.c:945 smime.c:989 smime.c:1054 smime.c:1129
+#: smime.c:836 smime.c:864 smime.c:929 smime.c:973 smime.c:1038 smime.c:1113
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "Errorea: Ezin da OpenSSL azpiprozesua sortu!"
 
-#: smime.c:1207
+#: smime.c:1191
 msgid "no certfile"
-msgstr "Ziurtagiri gabea"
+msgstr "ziurtagiri gabea"
 
-#: smime.c:1210
+#: smime.c:1194
 msgid "no mbox"
 msgstr "ez dago postakutxarik"
 
 #. fatal error while trying to encrypt message
-#: smime.c:1353
+#: smime.c:1337
 msgid "No output from OpenSSL.."
 msgstr "Ez dago OpenSSL irteerarik.."
 
-#: smime.c:1391
+#: smime.c:1375
+msgid "Can't sign: No key specified. Use Sign As."
+msgstr "Ezin da sinatu. Ez da gakorik ezarri. Honela sinatu erabili."
+
+#: smime.c:1382
 msgid "Warning: Intermediate certificate not found."
 msgstr "Kontuz: biderdiko ziurtagiria ezin da aurkitu."
 
-#: smime.c:1434
+#: smime.c:1429
 msgid "Can't open OpenSSL subprocess!"
 msgstr "Ezin da OpenSSL azpiprozesua ireki!"
 
-#: smime.c:1472
+#: smime.c:1469
 msgid "No output from OpenSSL..."
 msgstr "Ez dago irteerarik OpenSSL-tik..."
 
-#: smime.c:1637 smime.c:1762
+#: smime.c:1634 smime.c:1759
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4065,19 +4210,19 @@ msgstr ""
 "[-- OpenSSL irteeraren bukaera --]\n"
 "\n"
 
-#: smime.c:1721 smime.c:1732
+#: smime.c:1718 smime.c:1729
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- Errorea: Ezin da OpenSSL azpiprozesua sortu!--]\n"
 
-#: smime.c:1766
+#: smime.c:1763
 msgid "[-- The following data is S/MIME encrypted --]\n"
-msgstr "[-- Honako datu hauek  S/MIME enkriptatutik daude --]\n"
+msgstr "[-- Honako datu hauek S/MIME enkriptatutik daude --]\n"
 
-#: smime.c:1769
+#: smime.c:1766
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- Hurrengo datu hauek S/MIME sinaturik daude --]\n"
 
-#: smime.c:1833
+#: smime.c:1830
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4085,7 +4230,7 @@ msgstr ""
 "\n"
 "[-- S/MIME enkriptaturiko duen amaiera --]\n"
 
-#: smime.c:1835
+#: smime.c:1832
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4093,90 +4238,97 @@ msgstr ""
 "\n"
 "[-- S/MIME sinatutako datuen amaiera. --]\n"
 
-#: smime.c:1946
+#: smime.c:1943
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr ""
 "S/MIME (e)nkrip, (s)inatu, enript (h)onez, sinatu hol(a), (b)iak) edo (g)"
-"arbitu?"
+"arbitu? "
 
-#: smime.c:1947
+#: smime.c:1944
 msgid "eswabfc"
 msgstr "eshabfc"
 
 #. I use "dra" because "123" is recognized anyway
-#: smime.c:1962
+#: smime.c:1959
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
-msgstr "Algoritmo famili hautatu: 1: DES, 2: RC2, 3: AES, edo (g)arbitu? "
+msgstr "Hautatu algoritmo familia: 1: DES, 2: RC2, 3: AES, edo (g)arbitu? "
 
-#: smime.c:1965
+#: smime.c:1962
 msgid "drac"
 msgstr "drag"
 
-#: smime.c:1968
+#: smime.c:1965
 msgid "1: DES, 2: Triple-DES "
-msgstr "1: DES, 2: Triple-DES "
+msgstr "1: DES, 2: DES-Hirukoitza "
 
-#: smime.c:1969
+#: smime.c:1966
 msgid "dt"
-msgstr "dt"
+msgstr "dh"
 
-#: smime.c:1981
+#: smime.c:1978
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 
-#: smime.c:1982
+#: smime.c:1979
 msgid "468"
 msgstr "468"
 
-#: smime.c:1997
+#: smime.c:1994
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr "1: AES128, 2: AES192, 3: AES256 "
 
-#: smime.c:1998
+#: smime.c:1995
 msgid "895"
 msgstr "895"
 
-#: smime.c:2026
-msgid "Can't sign: No key specified. Use Sign As."
-msgstr "Ezin da sinatu. Ez da gakorik ezarri. Honela sinatu erabili."
-
-#: smtp.c:113
-#, fuzzy, c-format
+#: smtp.c:134
+#, c-format
 msgid "SMTP session failed: %s"
-msgstr "Berrizendaketak huts egin du: %s"
+msgstr "SMTP saioak huts egin du: %s"
 
-#: smtp.c:153
+#: smtp.c:180
 #, c-format
 msgid "SMTP session failed: unable to open %s"
+msgstr "SMTP saioak huts egin du: ezin da %s ireki"
+
+#: smtp.c:258
+msgid "No from address given"
 msgstr ""
 
-#: smtp.c:269
+#: smtp.c:314
 msgid "SMTP session failed: read error"
-msgstr ""
+msgstr "SMTP saioak huts egin du: irakurketa errorea"
 
-#: smtp.c:271
+#: smtp.c:316
 msgid "SMTP session failed: write error"
+msgstr "SMTP saioak huts egin du: idazketa errorea"
+
+#: smtp.c:318
+msgid "Invalid server response"
 msgstr ""
 
-#: smtp.c:294
-#, fuzzy, c-format
+#: smtp.c:341
+#, c-format
 msgid "Invalid SMTP URL: %s"
-msgstr "Baliogabea  "
+msgstr "Okerreko SMTP URLa: %s"
 
-#: smtp.c:400
+#: smtp.c:451
 msgid "SMTP server does not support authentication"
-msgstr ""
+msgstr "SMTP zerbitzariak ez du autentifikazioa onartzen"
 
-#: smtp.c:408
-#, fuzzy
+#: smtp.c:459
 msgid "SMTP authentication requires SASL"
-msgstr "(GSSAPI) autentifikazioak huts egin du."
+msgstr "SMTP autentifikazioak SASL behar du"
 
-#: smtp.c:551
-#, fuzzy
+#: smtp.c:493
+#, fuzzy, c-format
+msgid "%s authentication failed, trying next method"
+msgstr "SASL egiaztapenak huts egin du"
+
+#: smtp.c:510
 msgid "SASL authentication failed"
-msgstr "SASL egiaztapenak huts egin du."
+msgstr "SASL egiaztapenak huts egin du"
 
 #: sort.c:265
 msgid "Sorting mailbox..."
@@ -4190,11 +4342,11 @@ msgstr "Ezin da ordenatze funtzioa aurkitu! [zorri honen berri eman]"
 msgid "(no mailbox)"
 msgstr "(ez dago postakutxarik)"
 
-#: thread.c:1093
+#: thread.c:1096
 msgid "Parent message is not visible in this limited view."
 msgstr "Jatorrizko mezua ez da ikusgarria bistaratze mugatu honetan."
 
-#: thread.c:1099
+#: thread.c:1102
 msgid "Parent message is not available."
 msgstr "Aurreko mezua ez da eskuragarri."
 
@@ -4208,11 +4360,11 @@ msgstr "balizko exekuzio amaiera (noop)"
 
 #: ../keymap_alldefs.h:7
 msgid "force viewing of attachment using mailcap"
-msgstr "Gehigarria mailcap erabiliaz erakustea derrigortu"
+msgstr "gehigarria mailcap erabiliaz erakustea derrigortu"
 
 #: ../keymap_alldefs.h:8
 msgid "view attachment as text"
-msgstr "Gehigarriak testua balira ikusi"
+msgstr "gehigarriak testua balira ikusi"
 
 #: ../keymap_alldefs.h:9
 msgid "Toggle display of subparts"
@@ -4220,11 +4372,11 @@ msgstr "Azpizatien erakustaldia txandakatu"
 
 #: ../keymap_alldefs.h:10
 msgid "move to the bottom of the page"
-msgstr "Orrialdearen azkenera mugitu"
+msgstr "orrialdearen azkenera mugitu"
 
 #: ../keymap_alldefs.h:11
 msgid "remail a message to another user"
-msgstr "Mezua beste erabiltzaile bati berbidali"
+msgstr "mezua beste erabiltzaile bati birbidali"
 
 #: ../keymap_alldefs.h:12
 msgid "select a new file in this directory"
@@ -4236,15 +4388,15 @@ msgstr "fitxategia ikusi"
 
 #: ../keymap_alldefs.h:14
 msgid "display the currently selected file's name"
-msgstr "une honetan aukeratutako fitxategi izena erakutsi."
+msgstr "une honetan aukeratutako fitxategi izena erakutsi"
 
 #: ../keymap_alldefs.h:15
 msgid "subscribe to current mailbox (IMAP only)"
-msgstr "Une honetako postakutxan harpidetza egin (IMAP bakarrik)"
+msgstr "une honetako posta-kutxan harpidetza egin (IMAP bakarrik)"
 
 #: ../keymap_alldefs.h:16
 msgid "unsubscribe from current mailbox (IMAP only)"
-msgstr "Une honetako postakutxatik harpidetza kendu (IMAP bakarrik)"
+msgstr "une honetako posta-kutxan harpidetza ezabatu (IMAP bakarrik)"
 
 #: ../keymap_alldefs.h:17
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
@@ -4253,27 +4405,27 @@ msgstr ""
 
 #: ../keymap_alldefs.h:18
 msgid "list mailboxes with new mail"
-msgstr "Posta berridun postakutxen zerrenda"
+msgstr "posta berria duten posta-kutxen zerrenda"
 
 #: ../keymap_alldefs.h:19
 msgid "change directories"
-msgstr "Karpetak aldatu"
+msgstr "karpetak aldatu"
 
 #: ../keymap_alldefs.h:20
 msgid "check mailboxes for new mail"
-msgstr "Postakutxak eposta berrien bila arakatu"
+msgstr "posta-kutxak eposta berrien bila arakatu"
 
 #: ../keymap_alldefs.h:21
 msgid "attach file(s) to this message"
-msgstr "fitxategia(k) gehitu mezu honetara"
+msgstr "fitxategia(k) erantsi mezu honetara"
 
 #: ../keymap_alldefs.h:22
 msgid "attach message(s) to this message"
-msgstr "Mezuak gehitu mezu honetara"
+msgstr "mezua(k) erantsi mezu honetara"
 
 #: ../keymap_alldefs.h:23
 msgid "edit the BCC list"
-msgstr "BCC Zerrenda editatu"
+msgstr "BCC zerrenda editatu"
 
 #: ../keymap_alldefs.h:24
 msgid "edit the CC list"
@@ -4289,23 +4441,23 @@ msgstr "gehigarriaren transferentzi kodifikazioa editatu"
 
 #: ../keymap_alldefs.h:27
 msgid "enter a file to save a copy of this message in"
-msgstr "Mezu honen kopia egingo den fitxategia sartu"
+msgstr "mezu honen kopia egingo den fitxategia sartu"
 
 #: ../keymap_alldefs.h:28
 msgid "edit the file to be attached"
-msgstr "Gehitu behar den fitxategia editatu"
+msgstr "gehitu behar den fitxategia editatu"
 
 #: ../keymap_alldefs.h:29
 msgid "edit the from field"
-msgstr "Nondik parametroa editatu"
+msgstr "nondik parametroa editatu"
 
 #: ../keymap_alldefs.h:30
 msgid "edit the message with headers"
-msgstr "Mezua buruekin editatu"
+msgstr "mezua buruekin editatu"
 
 #: ../keymap_alldefs.h:31
 msgid "edit the message"
-msgstr "Mezua editatu"
+msgstr "mezua editatu"
 
 #: ../keymap_alldefs.h:32
 msgid "edit attachment using mailcap entry"
@@ -4313,11 +4465,11 @@ msgstr "mailcap sarrera erabiliaz gehigarria editatu"
 
 #: ../keymap_alldefs.h:33
 msgid "edit the Reply-To field"
-msgstr "Erantzun-honi aldagaia aldatu"
+msgstr "erantzun-honi eremua aldatu"
 
 #: ../keymap_alldefs.h:34
 msgid "edit the subject of this message"
-msgstr "Mezu honen gaia editatu"
+msgstr "mezu honen gaia editatu"
 
 #: ../keymap_alldefs.h:35
 msgid "edit the TO list"
@@ -4325,7 +4477,7 @@ msgstr "Nori zerrenda editatu"
 
 #: ../keymap_alldefs.h:36
 msgid "create a new mailbox (IMAP only)"
-msgstr "Postakutxa berria sortu (IMAP bakarrik)"
+msgstr "posta-kutxa berria sortu (IMAP bakarrik)"
 
 #: ../keymap_alldefs.h:37
 msgid "edit attachment content type"
@@ -4333,11 +4485,11 @@ msgstr "gehigarriaren eduki mota editatu"
 
 #: ../keymap_alldefs.h:38
 msgid "get a temporary copy of an attachment"
-msgstr "Gehigarriaren aldiroko kopia eskuratu"
+msgstr "eskuratu gehigarriaren behin-behineko kopia"
 
 #: ../keymap_alldefs.h:39
 msgid "run ispell on the message"
-msgstr "Mezu honetan ispell abiarazi"
+msgstr "ispell abiarazi mezu honetan"
 
 #: ../keymap_alldefs.h:40
 msgid "compose new attachment using mailcap entry"
@@ -4349,15 +4501,15 @@ msgstr "txandakatu gehigarri honen gordetzea"
 
 #: ../keymap_alldefs.h:42
 msgid "save this message to send later"
-msgstr "Mezu hau beranduago bidaltzeko gorde"
+msgstr "mezu hau beranduago bidaltzeko gorde"
 
 #: ../keymap_alldefs.h:43
 msgid "rename/move an attached file"
-msgstr "Gehituriko fitxategia ezabatu/izenaldatu"
+msgstr "gehituriko fitxategia ezabatu/berrizendatu"
 
 #: ../keymap_alldefs.h:44
 msgid "send the message"
-msgstr "Mezua bidali"
+msgstr "bidali mezua"
 
 #: ../keymap_alldefs.h:45
 msgid "toggle disposition between inline/attachment"
@@ -4365,7 +4517,7 @@ msgstr "mezua/gehigarriaren artean kokalekua aldatu"
 
 #: ../keymap_alldefs.h:46
 msgid "toggle whether to delete file after sending it"
-msgstr "Bidali aurretik gehigarria ezabatua baldin bada aldatu."
+msgstr "bidali aurretik gehigarria ezabatua baldin bada aldatu"
 
 #: ../keymap_alldefs.h:47
 msgid "update an attachment's encoding info"
@@ -4373,7 +4525,7 @@ msgstr "gehigarriaren kodeaketa argibideak eguneratu"
 
 #: ../keymap_alldefs.h:48
 msgid "write the message to a folder"
-msgstr "Mezua karpeta batetan gorde"
+msgstr "mezua karpeta batetan gorde"
 
 #: ../keymap_alldefs.h:49
 msgid "copy a message to a file/mailbox"
@@ -4381,63 +4533,63 @@ msgstr "fitxategi/postakutxa batetara kopiatu mezua"
 
 #: ../keymap_alldefs.h:50
 msgid "create an alias from a message sender"
-msgstr "Mezuaren bidaltzailearentzat alias berria sortu"
+msgstr "mezuaren bidaltzailearentzat ezizena berria sortu"
 
 #: ../keymap_alldefs.h:51
 msgid "move entry to bottom of screen"
-msgstr "Sarrera pantailaren bukaerara mugitu"
+msgstr "sarrera pantailaren bukaerara mugitu"
 
 #: ../keymap_alldefs.h:52
 msgid "move entry to middle of screen"
-msgstr "Sarrera pantailaren erdira mugitu"
+msgstr "sarrera pantailaren erdira mugitu"
 
 #: ../keymap_alldefs.h:53
 msgid "move entry to top of screen"
-msgstr "Sarrera pantailaren goikaldera mugitu"
+msgstr "sarrera pantailaren goikaldera mugitu"
 
 #: ../keymap_alldefs.h:54
 msgid "make decoded (text/plain) copy"
-msgstr "Enkriptatu gabeko (testu/laua) kopia"
+msgstr "enkriptatu gabeko (testu/laua) kopia"
 
 #: ../keymap_alldefs.h:55
 msgid "make decoded copy (text/plain) and delete"
-msgstr "Enkriptatu gabeko (testu/laua) kopia egin eta ezabatu"
+msgstr "enkriptatu gabeko (testu/laua) kopia egin eta ezabatu"
 
 #: ../keymap_alldefs.h:56
 msgid "delete the current entry"
-msgstr "Uneko sarrera ezabatu"
+msgstr "uneko sarrera ezabatu"
 
 #: ../keymap_alldefs.h:57
 msgid "delete the current mailbox (IMAP only)"
-msgstr "Uneko postakutxa ezabatu (IMAP bakarrik)"
+msgstr "uneko posta-kutxa ezabatu (IMAP bakarrik)"
 
 #: ../keymap_alldefs.h:58
 msgid "delete all messages in subthread"
-msgstr "hariazpi honetako mezuak ezabatu"
+msgstr "azpihari honetako mezuak ezabatu"
 
 #: ../keymap_alldefs.h:59
 msgid "delete all messages in thread"
-msgstr "Hari honetako mezu guztiak ezabatu"
+msgstr "hari honetako mezu guztiak ezabatu"
 
 #: ../keymap_alldefs.h:60
 msgid "display full address of sender"
-msgstr "Bidaltzailearen helbide osoa erakutsi"
+msgstr "bidaltzailearen helbide osoa erakutsi"
 
 #: ../keymap_alldefs.h:61
 msgid "display message and toggle header weeding"
-msgstr "Mezua erakutsi eta buru guztien erakustaldia aldatu"
+msgstr "mezua erakutsi eta buru guztien erakustaldia aldatu"
 
 #: ../keymap_alldefs.h:62
 msgid "display a message"
-msgstr "Mezua erakutsi"
+msgstr "mezua erakutsi"
 
 #: ../keymap_alldefs.h:63
 msgid "edit the raw message"
-msgstr "Mezu laua editatu"
+msgstr "mezu laua editatu"
 
 #: ../keymap_alldefs.h:64
 msgid "delete the char in front of the cursor"
-msgstr "Kurtsorearen aurrean dagoen karakterra ezabatu"
+msgstr "kurtsorearen aurrean dagoen karakterra ezabatu"
 
 #: ../keymap_alldefs.h:65
 msgid "move the cursor one character to the left"
@@ -4449,27 +4601,27 @@ msgstr "kurtsorea hitzaren hasierara mugitu"
 
 #: ../keymap_alldefs.h:67
 msgid "jump to the beginning of the line"
-msgstr "Lerroaren haserara salto egin"
+msgstr "lerroaren hasierara salto egin"
 
 #: ../keymap_alldefs.h:68
 msgid "cycle among incoming mailboxes"
-msgstr "Sarrera postakutxen artean aldatu"
+msgstr "sarrera posta-kutxen artean aldatu"
 
 #: ../keymap_alldefs.h:69
 msgid "complete filename or alias"
-msgstr "fitxategi izen edo alias bete"
+msgstr "fitxategi izen edo ezizena bete"
 
 #: ../keymap_alldefs.h:70
 msgid "complete address with query"
-msgstr "Galderarekin osatu helbidea"
+msgstr "galderarekin osatu helbidea"
 
 #: ../keymap_alldefs.h:71
 msgid "delete the char under the cursor"
-msgstr "Kurtsorearen azpian dagoen karakterra ezabatu"
+msgstr "kurtsorearen azpian dagoen karakterra ezabatu"
 
 #: ../keymap_alldefs.h:72
 msgid "jump to the end of the line"
-msgstr "Lerroaren bukaerara salto egin"
+msgstr "lerroaren bukaerara salto egin"
 
 #: ../keymap_alldefs.h:73
 msgid "move the cursor one character to the right"
@@ -4497,11 +4649,11 @@ msgstr "kurtsoretik hitzaren bukaerara dauden karakterrak ezabatu"
 
 #: ../keymap_alldefs.h:79
 msgid "delete all chars on the line"
-msgstr "Lerro honetako karaktere guziak ezabatu"
+msgstr "lerro honetako karaktere guziak ezabatu"
 
 #: ../keymap_alldefs.h:80
 msgid "delete the word in front of the cursor"
-msgstr "Kurtsorearen aurrean dagoen hitza ezabatu"
+msgstr "kurtsorearen aurrean dagoen hitza ezabatu"
 
 #: ../keymap_alldefs.h:81
 msgid "quote the next typed key"
@@ -4513,15 +4665,15 @@ msgstr "kurtsorearen azpiko karakterra aurrekoarekin irauli"
 
 #: ../keymap_alldefs.h:83
 msgid "capitalize the word"
-msgstr "Hitza kapitalizatu"
+msgstr "hitza kapitalizatu"
 
 #: ../keymap_alldefs.h:84
 msgid "convert the word to lower case"
-msgstr "Hitza minuskuletara bihurtu"
+msgstr "hitza minuskuletara bihurtu"
 
 #: ../keymap_alldefs.h:85
 msgid "convert the word to upper case"
-msgstr "Hitza maiuskuletara bihurtu"
+msgstr "hitza maiuskuletara bihurtu"
 
 #: ../keymap_alldefs.h:86
 msgid "enter a muttrc command"
@@ -4541,39 +4693,39 @@ msgstr "sheel komando bidezko gehigarri iragazkia"
 
 #: ../keymap_alldefs.h:90
 msgid "move to the first entry"
-msgstr "Lehenengo sarrerara mugitu"
+msgstr "lehenengo sarrerara mugitu"
 
 #: ../keymap_alldefs.h:91
 msgid "toggle a message's 'important' flag"
-msgstr "Mezuen bandera garrantzitsuak txandakatu"
+msgstr "mezuen bandera garrantzitsuak txandakatu"
 
 #: ../keymap_alldefs.h:92
 msgid "forward a message with comments"
-msgstr "Birbidali mezua iruzkinekin"
+msgstr "birbidali mezua iruzkinekin"
 
 #: ../keymap_alldefs.h:93
 msgid "select the current entry"
-msgstr "Uneko sarrera aukeratu"
+msgstr "uneko sarrera aukeratu"
 
 #: ../keymap_alldefs.h:94
 msgid "reply to all recipients"
-msgstr "Denei erantzun"
+msgstr "denei erantzun"
 
 #: ../keymap_alldefs.h:95
 msgid "scroll down 1/2 page"
-msgstr "Orrialde erdia jaitsi"
+msgstr "orrialde erdia jaitsi"
 
 #: ../keymap_alldefs.h:96
 msgid "scroll up 1/2 page"
-msgstr "Orrialde erdia igo"
+msgstr "orrialde erdia igo"
 
 #: ../keymap_alldefs.h:97
 msgid "this screen"
-msgstr "Leiho hau"
+msgstr "leiho hau"
 
 #: ../keymap_alldefs.h:98
 msgid "jump to an index number"
-msgstr "joan sarrera zenbakira "
+msgstr "joan sarrera zenbakira"
 
 #: ../keymap_alldefs.h:99
 msgid "move to the last entry"
@@ -4581,7 +4733,7 @@ msgstr "azkenengo sarrerara salto egin"
 
 #: ../keymap_alldefs.h:100
 msgid "reply to specified mailing list"
-msgstr "emandako ePosta zerrendara erantzun"
+msgstr "emandako eposta zerrendara erantzun"
 
 #: ../keymap_alldefs.h:101
 msgid "execute a macro"
@@ -4589,467 +4741,447 @@ msgstr "macro bat abiarazi"
 
 #: ../keymap_alldefs.h:102
 msgid "compose a new mail message"
-msgstr "ePosta mezu berri bat idatzi"
+msgstr "eposta mezu berri bat idatzi"
 
 #: ../keymap_alldefs.h:103
 msgid "break the thread in two"
-msgstr "Haria bitan zatitu"
+msgstr "haria bitan zatitu"
 
 #: ../keymap_alldefs.h:104
 msgid "open a different folder"
-msgstr "Beste karpeta bat ireki"
+msgstr "beste karpeta bat ireki"
 
 #: ../keymap_alldefs.h:105
 msgid "open a different folder in read only mode"
-msgstr "Irakurketa soilerako beste karpeta bat ireki"
+msgstr "irakurketa soilerako beste karpeta bat ireki"
 
 #: ../keymap_alldefs.h:106
 msgid "clear a status flag from a message"
-msgstr "Mezuaren egoera bandera ezabatu"
+msgstr "mezuaren egoera bandera ezabatu"
 
 #: ../keymap_alldefs.h:107
 msgid "delete messages matching a pattern"
-msgstr "Emandako patroiaren araberako mezuak ezabatu"
+msgstr "emandako patroiaren araberako mezuak ezabatu"
 
 #: ../keymap_alldefs.h:108
 msgid "force retrieval of mail from IMAP server"
 msgstr "IMAP zerbitzari batetatik ePosta jasotzea behartu"
 
 #: ../keymap_alldefs.h:109
+msgid "logout from all IMAP servers"
+msgstr ""
+
+#: ../keymap_alldefs.h:110
 msgid "retrieve mail from POP server"
 msgstr "POP zerbitzaritik ePosta jaso"
 
-#: ../keymap_alldefs.h:110
+#: ../keymap_alldefs.h:111
 msgid "move to the first message"
-msgstr "Lehenengo mezura joan"
+msgstr "lehenengo mezura joan"
 
-#: ../keymap_alldefs.h:111
+#: ../keymap_alldefs.h:112
 msgid "move to the last message"
-msgstr "Azkenengo mezura joan"
+msgstr "azkenengo mezura joan"
 
-#: ../keymap_alldefs.h:112
+#: ../keymap_alldefs.h:113
 msgid "show only messages matching a pattern"
-msgstr "Emandako patroia betetzen duten mezuak bakarrik erakutsi"
+msgstr "emandako patroia betetzen duten mezuak bakarrik erakutsi"
 
-#: ../keymap_alldefs.h:113
+#: ../keymap_alldefs.h:114
 msgid "link tagged message to the current one"
 msgstr "lotu markaturiko mezua honetara"
 
-#: ../keymap_alldefs.h:114
-#, fuzzy
+#: ../keymap_alldefs.h:115
 msgid "open next mailbox with new mail"
-msgstr "Ez da posta berririk postakutxetan"
+msgstr "ireki posta berria duen hurrengo postakutxa"
 
-#: ../keymap_alldefs.h:115
+#: ../keymap_alldefs.h:116
 msgid "jump to the next new message"
-msgstr "Hurrengo mezu berrira joan"
+msgstr "hurrengo mezu berrira joan"
 
-#: ../keymap_alldefs.h:116
+#: ../keymap_alldefs.h:117
 msgid "jump to the next new or unread message"
-msgstr "Hurrengo mezu berri edo irakurgabera joan"
+msgstr "hurrengo mezu berri edo irakurgabera joan"
 
-#: ../keymap_alldefs.h:117
+#: ../keymap_alldefs.h:118
 msgid "jump to the next subthread"
-msgstr "Hurrengo hariazpira joan"
+msgstr "hurrengo azpiharira joan"
 
-#: ../keymap_alldefs.h:118
+#: ../keymap_alldefs.h:119
 msgid "jump to the next thread"
-msgstr "Hurrengo harira joan"
+msgstr "hurrengo harira joan"
 
-#: ../keymap_alldefs.h:119
+#: ../keymap_alldefs.h:120
 msgid "move to the next undeleted message"
-msgstr "Hurrengo ezabatu gabeko mezura joan"
+msgstr "hurrengo ezabatu gabeko mezura joan"
 
-#: ../keymap_alldefs.h:120
+#: ../keymap_alldefs.h:121
 msgid "jump to the next unread message"
-msgstr "Hurrengo irakurgabeko mezura joan"
+msgstr "hurrengo irakurgabeko mezura joan"
 
-#: ../keymap_alldefs.h:121
+#: ../keymap_alldefs.h:122
 msgid "jump to parent message in thread"
-msgstr "Hariko goiko mezura joan"
+msgstr "hariko goiko mezura joan"
 
-#: ../keymap_alldefs.h:122
+#: ../keymap_alldefs.h:123
 msgid "jump to previous thread"
-msgstr "Aurreko harira joan"
+msgstr "aurreko harira joan"
 
-#: ../keymap_alldefs.h:123
+#: ../keymap_alldefs.h:124
 msgid "jump to previous subthread"
-msgstr "Aurreko azpiharira joan"
+msgstr "aurreko harirazpira joan"
 
-#: ../keymap_alldefs.h:124
+#: ../keymap_alldefs.h:125
 msgid "move to the previous undeleted message"
 msgstr "ezabatugabeko hurrengo mezura joan"
 
-#: ../keymap_alldefs.h:125
+#: ../keymap_alldefs.h:126
 msgid "jump to the previous new message"
 msgstr "aurreko mezu berrira joan"
 
-#: ../keymap_alldefs.h:126
+#: ../keymap_alldefs.h:127
 msgid "jump to the previous new or unread message"
 msgstr "aurreko mezu berri edo irakurgabera joan"
 
-#: ../keymap_alldefs.h:127
+#: ../keymap_alldefs.h:128
 msgid "jump to the previous unread message"
 msgstr "aurreko mezu irakurgabera joan"
 
-#: ../keymap_alldefs.h:128
+#: ../keymap_alldefs.h:129
 msgid "mark the current thread as read"
 msgstr "uneko haria irakurria bezala markatu"
 
-#: ../keymap_alldefs.h:129
+#: ../keymap_alldefs.h:130
 msgid "mark the current subthread as read"
-msgstr "uneko hariazpia irakurria bezala markatu"
+msgstr "uneko azpiharia irakurria bezala markatu"
 
-#: ../keymap_alldefs.h:130
+#: ../keymap_alldefs.h:131
 msgid "set a status flag on a message"
 msgstr "egoera bandera ezarri mezuari"
 
-#: ../keymap_alldefs.h:131
+#: ../keymap_alldefs.h:132
 msgid "save changes to mailbox"
 msgstr "postakutxaren aldaketak gorde"
 
-#: ../keymap_alldefs.h:132
+#: ../keymap_alldefs.h:133
 msgid "tag messages matching a pattern"
 msgstr "emandako patroiaren araberako mezuak markatu"
 
-#: ../keymap_alldefs.h:133
+#: ../keymap_alldefs.h:134
 msgid "undelete messages matching a pattern"
-msgstr "emandako patroiaren araberako mezuak berreskuratu."
+msgstr "emandako patroiaren araberako mezuak berreskuratu"
 
-#: ../keymap_alldefs.h:134
+#: ../keymap_alldefs.h:135
 msgid "untag messages matching a pattern"
-msgstr "Emandako patroiaren araberako mezuak desmarkatu."
+msgstr "emandako patroiaren araberako mezuak desmarkatu"
 
-#: ../keymap_alldefs.h:135
+#: ../keymap_alldefs.h:136
 msgid "move to the middle of the page"
-msgstr "Orriaren erdira joan"
+msgstr "orriaren erdira joan"
 
-#: ../keymap_alldefs.h:136
+#: ../keymap_alldefs.h:137
 msgid "move to the next entry"
 msgstr "hurrengo sarrerara joan"
 
-#: ../keymap_alldefs.h:137
+#: ../keymap_alldefs.h:138
 msgid "scroll down one line"
 msgstr "lerro bat jaitsi"
 
-#: ../keymap_alldefs.h:138
+#: ../keymap_alldefs.h:139
 msgid "move to the next page"
 msgstr "hurrengo orrialdera joan"
 
-#: ../keymap_alldefs.h:139
+#: ../keymap_alldefs.h:140
 msgid "jump to the bottom of the message"
 msgstr "mezuaren bukaerara joan"
 
-#: ../keymap_alldefs.h:140
+#: ../keymap_alldefs.h:141
 msgid "toggle display of quoted text"
-msgstr "gakoarteko testuaren erakustaldia aldatu."
+msgstr "gako arteko testuaren erakustaldia aldatu"
 
-#: ../keymap_alldefs.h:141
+#: ../keymap_alldefs.h:142
 msgid "skip beyond quoted text"
 msgstr "gako arteko testuaren atzera salto egin"
 
-#: ../keymap_alldefs.h:142
+#: ../keymap_alldefs.h:143
 msgid "jump to the top of the message"
 msgstr "mezuaren hasierara joan"
 
-#: ../keymap_alldefs.h:143
+#: ../keymap_alldefs.h:144
 msgid "pipe message/attachment to a shell command"
 msgstr "mezua/gehigarria shell komando batetara bideratu"
 
-#: ../keymap_alldefs.h:144
+#: ../keymap_alldefs.h:145
 msgid "move to the previous entry"
-msgstr "Aurreko sarrerara joan"
+msgstr "aurreko sarrerara joan"
 
-#: ../keymap_alldefs.h:145
+#: ../keymap_alldefs.h:146
 msgid "scroll up one line"
 msgstr "lerro bat igo"
 
-#: ../keymap_alldefs.h:146
+#: ../keymap_alldefs.h:147
 msgid "move to the previous page"
-msgstr "Aurreko orrialdera joan"
+msgstr "aurreko orrialdera joan"
 
-#: ../keymap_alldefs.h:147
+#: ../keymap_alldefs.h:148
 msgid "print the current entry"
 msgstr "uneko sarrera inprimatu"
 
-#: ../keymap_alldefs.h:148
+#: ../keymap_alldefs.h:149
 msgid "query external program for addresses"
 msgstr "galdetu kanpoko aplikazioari helbidea lortzeko"
 
-#: ../keymap_alldefs.h:149
+#: ../keymap_alldefs.h:150
 msgid "append new query results to current results"
 msgstr "emaitza hauei bilaketa berriaren emaitzak gehitu"
 
-#: ../keymap_alldefs.h:150
+#: ../keymap_alldefs.h:151
 msgid "save changes to mailbox and quit"
 msgstr "aldaketak postakutxan gorde eta utzi"
 
-#: ../keymap_alldefs.h:151
+#: ../keymap_alldefs.h:152
 msgid "recall a postponed message"
-msgstr "atzeratutako mezua berriz eskuratu"
+msgstr "atzeratiutako mezua berriz hartu"
 
-#: ../keymap_alldefs.h:152
+#: ../keymap_alldefs.h:153
 msgid "clear and redraw the screen"
 msgstr "pantaila garbitu eta berriz marraztu"
 
-#: ../keymap_alldefs.h:153
+#: ../keymap_alldefs.h:154
 msgid "{internal}"
-msgstr "(barnekoa)"
+msgstr "{barnekoa}"
 
-#: ../keymap_alldefs.h:154
+#: ../keymap_alldefs.h:155
 msgid "rename the current mailbox (IMAP only)"
 msgstr "uneko postakutxa berrizendatu (IMAP soilik)"
 
-#: ../keymap_alldefs.h:155
+#: ../keymap_alldefs.h:156
 msgid "reply to a message"
 msgstr "mezuari erantzuna"
 
-#: ../keymap_alldefs.h:156
+#: ../keymap_alldefs.h:157
 msgid "use the current message as a template for a new one"
-msgstr "Unekoa mezu berri bat egiteko txantiloi gisa erabili."
+msgstr "unekoa mezu berri bat egiteko txantiloi gisa erabili"
 
-#: ../keymap_alldefs.h:157
-msgid "save message/attachment to a file"
+#: ../keymap_alldefs.h:158
+#, fuzzy
+msgid "save message/attachment to a mailbox/file"
 msgstr "mezua/gehigarria fitxategi batetan gorde"
 
-#: ../keymap_alldefs.h:158
+#: ../keymap_alldefs.h:159
 msgid "search for a regular expression"
 msgstr "espresio erregular bat bilatu"
 
-#: ../keymap_alldefs.h:159
+#: ../keymap_alldefs.h:160
 msgid "search backwards for a regular expression"
 msgstr "espresio erregular baten bidez atzeraka bilatu"
 
-#: ../keymap_alldefs.h:160
+#: ../keymap_alldefs.h:161
 msgid "search for next match"
 msgstr "hurrengo parekatzera joan"
 
-#: ../keymap_alldefs.h:161
+#: ../keymap_alldefs.h:162
 msgid "search for next match in opposite direction"
-msgstr "Beste zentzuan hurrengoa parekatzea bilatu"
+msgstr "beste zentzuan hurrengoa parekatzea bilatu"
 
-#: ../keymap_alldefs.h:162
+#: ../keymap_alldefs.h:163
 msgid "toggle search pattern coloring"
 msgstr "bilaketa patroiaren kolorea txandakatu"
 
-#: ../keymap_alldefs.h:163
+#: ../keymap_alldefs.h:164
 msgid "invoke a command in a subshell"
-msgstr "Komando bat subshell batetan deitu"
+msgstr "komando bat subshell batetan deitu"
 
-#: ../keymap_alldefs.h:164
+#: ../keymap_alldefs.h:165
 msgid "sort messages"
 msgstr "mezuak ordenatu"
 
-#: ../keymap_alldefs.h:165
+#: ../keymap_alldefs.h:166
 msgid "sort messages in reverse order"
 msgstr "mezuak atzekoz aurrera ordenatu"
 
-#: ../keymap_alldefs.h:166
+#: ../keymap_alldefs.h:167
 msgid "tag the current entry"
 msgstr "uneko sarrera markatu"
 
-#: ../keymap_alldefs.h:167
+#: ../keymap_alldefs.h:168
 msgid "apply next function to tagged messages"
 msgstr "markatutako mezuei funtzio hau aplikatu"
 
-#: ../keymap_alldefs.h:168
+#: ../keymap_alldefs.h:169
 msgid "apply next function ONLY to tagged messages"
 msgstr "hurrengo funtzioa BAKARRIK markaturiko mezuetan erabili"
 
-#: ../keymap_alldefs.h:169
+#: ../keymap_alldefs.h:170
 msgid "tag the current subthread"
-msgstr "Uneko hariazpia markatu"
+msgstr "uneko azpiharia markatu"
 
-#: ../keymap_alldefs.h:170
+#: ../keymap_alldefs.h:171
 msgid "tag the current thread"
 msgstr "uneko haria markatu"
 
-#: ../keymap_alldefs.h:171
+#: ../keymap_alldefs.h:172
 msgid "toggle a message's 'new' flag"
-msgstr "Mezuaren 'berria' bandera aldatu"
+msgstr "mezuaren 'berria' bandera aldatu"
 
-#: ../keymap_alldefs.h:172
+#: ../keymap_alldefs.h:173
 msgid "toggle whether the mailbox will be rewritten"
-msgstr "Postakutxaren datuak berritzen direnean aldatu"
+msgstr "posta-kutxaren datuak berritzen direnean aldatu"
 
-#: ../keymap_alldefs.h:173
+#: ../keymap_alldefs.h:174
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "postakutxak eta artxibo guztien ikustaldia aldatu"
 
-#: ../keymap_alldefs.h:174
+#: ../keymap_alldefs.h:175
 msgid "move to the top of the page"
 msgstr "orriaren goikaldera joan"
 
-#: ../keymap_alldefs.h:175
+#: ../keymap_alldefs.h:176
 msgid "undelete the current entry"
-msgstr "Uneko sarrera berreskuratu"
+msgstr "uneko sarrera berreskuratu"
 
-#: ../keymap_alldefs.h:176
+#: ../keymap_alldefs.h:177
 msgid "undelete all messages in thread"
-msgstr "Hariko mezu guztiak berreskuratu."
+msgstr "hariko mezu guztiak berreskuratu"
 
-#: ../keymap_alldefs.h:177
+#: ../keymap_alldefs.h:178
 msgid "undelete all messages in subthread"
-msgstr "Hariazpiko mezu guztiak berreskuratu"
+msgstr "azpihariko mezu guztiak berreskuratu"
 
-#: ../keymap_alldefs.h:178
+#: ../keymap_alldefs.h:179
 msgid "show the Mutt version number and date"
 msgstr "Mutt bertsio zenbakia eta data erakutsi"
 
-#: ../keymap_alldefs.h:179
+#: ../keymap_alldefs.h:180
 msgid "view attachment using mailcap entry if necessary"
-msgstr "Gehigarria erakutsi beharrezkoa balitz mailcap sarrera erabiliaz"
+msgstr "gehigarria erakutsi beharrezkoa balitz mailcap sarrera erabiliaz"
 
-#: ../keymap_alldefs.h:180
+#: ../keymap_alldefs.h:181
 msgid "show MIME attachments"
 msgstr "MIME gehigarriak ikusi"
 
-#: ../keymap_alldefs.h:181
+#: ../keymap_alldefs.h:182
 msgid "display the keycode for a key press"
 msgstr "zanpatutako teklaren tekla-kodea erakutsi"
 
-#: ../keymap_alldefs.h:182
+#: ../keymap_alldefs.h:183
 msgid "show currently active limit pattern"
 msgstr "unean gaitutako patroiaren muga erakutsi"
 
-#: ../keymap_alldefs.h:183
+#: ../keymap_alldefs.h:184
 msgid "collapse/uncollapse current thread"
 msgstr "uneko haria zabaldu/trinkotu"
 
-#: ../keymap_alldefs.h:184
+#: ../keymap_alldefs.h:185
 msgid "collapse/uncollapse all threads"
 msgstr "hari guztiak zabaldu/trinkotu"
 
-#: ../keymap_alldefs.h:185
+#: ../keymap_alldefs.h:186
 msgid "attach a PGP public key"
 msgstr "PGP gako publikoa gehitu"
 
-#: ../keymap_alldefs.h:186
+#: ../keymap_alldefs.h:187
 msgid "show PGP options"
 msgstr "PGP aukerak ikusi"
 
-#: ../keymap_alldefs.h:187
+#: ../keymap_alldefs.h:188
 msgid "mail a PGP public key"
-msgstr "PGP gako publikoa ePostaz bidali"
+msgstr "PGP gako publikoa epostaz bidali"
 
-#: ../keymap_alldefs.h:188
+#: ../keymap_alldefs.h:189
 msgid "verify a PGP public key"
 msgstr "PGP gako publikoa egiaztatu"
 
-#: ../keymap_alldefs.h:189
+#: ../keymap_alldefs.h:190
 msgid "view the key's user id"
 msgstr "gakoaren erabiltzaile id-a erakutsi"
 
-#: ../keymap_alldefs.h:190
+#: ../keymap_alldefs.h:191
 msgid "check for classic PGP"
 msgstr "PGP klasiko bila arakatu"
 
-#: ../keymap_alldefs.h:191
+#: ../keymap_alldefs.h:192
 msgid "Accept the chain constructed"
-msgstr "Eratutako katea onartu."
+msgstr "Eratutako katea onartu"
 
-#: ../keymap_alldefs.h:192
+#: ../keymap_alldefs.h:193
 msgid "Append a remailer to the chain"
-msgstr "kateari berbidaltze bat gehitu"
+msgstr "Kateari berbidaltze bat gehitu"
 
-#: ../keymap_alldefs.h:193
+#: ../keymap_alldefs.h:194
 msgid "Insert a remailer into the chain"
-msgstr "kateari berbidaltze bat gehitu"
+msgstr "Kateari berbidaltze bat gehitu"
 
-#: ../keymap_alldefs.h:194
+#: ../keymap_alldefs.h:195
 msgid "Delete a remailer from the chain"
-msgstr "kateari berbidaltze bat ezabatu"
+msgstr "Kateari berbidaltze bat ezabatu"
 
-#: ../keymap_alldefs.h:195
+#: ../keymap_alldefs.h:196
 msgid "Select the previous element of the chain"
 msgstr "Katearen aurreko elementua aukeratu"
 
-#: ../keymap_alldefs.h:196
+#: ../keymap_alldefs.h:197
 msgid "Select the next element of the chain"
 msgstr "Katearen hurrengo elementua aukeratu"
 
-#: ../keymap_alldefs.h:197
+#: ../keymap_alldefs.h:198
 msgid "send the message through a mixmaster remailer chain"
 msgstr "mixmaster berbidalketa katearen bidez bidali mezua"
 
-#: ../keymap_alldefs.h:198
+#: ../keymap_alldefs.h:199
 msgid "make decrypted copy and delete"
 msgstr "enkriptatu gabeko kopia egin eta ezabatu"
 
-#: ../keymap_alldefs.h:199
+#: ../keymap_alldefs.h:200
 msgid "make decrypted copy"
 msgstr "enkriptatu gabeko kopia egin"
 
-#: ../keymap_alldefs.h:200
+#: ../keymap_alldefs.h:201
 msgid "wipe passphrase(s) from memory"
-msgstr "Pasahitza(k) memoriatik ezabatu"
+msgstr "pasahitza(k) memoriatik ezabatu"
 
-#: ../keymap_alldefs.h:201
+#: ../keymap_alldefs.h:202
 msgid "extract supported public keys"
-msgstr "Onartutako gako publikoak atera"
+msgstr "onartutako gako publikoak atera"
 
-#: ../keymap_alldefs.h:202
+#: ../keymap_alldefs.h:203
 msgid "show S/MIME options"
 msgstr "S/MIME aukerak ikusi"
 
-#~ msgid "Can't change 'important' flag on POP server."
-#~ msgstr "Ezin da POP zerbitzarian bandera garrantzitsua aldatu."
+#~ msgid "Clear"
+#~ msgstr "Garbitu"
 
-#~ msgid "Can't edit message on POP server."
-#~ msgstr "Ezin da POP zerbitzarian mezurik editatu."
+#~ msgid ""
+#~ "  --\t\ttreat remaining arguments as addr even if starting with a dash\n"
+#~ "\t\twhen using -a with multiple filenames using -- is mandatory"
+#~ msgstr ""
+#~ "  --\t\terabili geratzen diren argumentuak helbidea bezala nahiz '-' "
+#~ "batez hasi\n"
+#~ "\t\t-a fitxategi-izen anitzez erabiltzean -- erabiltzea beharrezkoa da"
 
-#~ msgid "Getting namespaces..."
-#~ msgstr "Izena eskuratzen..."
+#~ msgid "esabifc"
+#~ msgstr "esabifg"
 
-#~ msgid "Evaluating cache... [%d/%d]"
-#~ msgstr "Katxea ebaluatzen... [%d/%d]"
+#~ msgid "No search pattern."
+#~ msgstr "Ez da bilaketa patroia aurkitu."
 
-#~ msgid "Fetching message headers... [%d/%d]"
-#~ msgstr "Mezu burukoak eskuratzen... [%d/%d]"
+#~ msgid "Reverse search: "
+#~ msgstr "Bilatu atzetik aurrera: "
 
-#~ msgid "unsubscribe to current mailbox (IMAP only)"
-#~ msgstr "Une honetako postakutxan harpidetza ezabatu (IMAP bakarrik)"
+#~ msgid "Search: "
+#~ msgstr "Bilatu: "
 
-#~ msgid "attach a file(s) to this message"
-#~ msgstr "fitxategia(k) gehitu mezu honetara"
+#~ msgid "            created: "
+#~ msgstr "            sortua: "
 
-#~ msgid "check for classic pgp"
-#~ msgstr "pgp klasiko bila arakatu"
+#~ msgid "*BAD* signature claimed to be from: "
+#~ msgstr "*OKERREKO* sinadurak hemengoa dela dio: "
 
-#~ msgid ""
-#~ "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
-#~ "<file> ]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -Q <query> [ -Q <query> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -A <alias> [ -A <alias> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <cmd> ] [ -F <file> ] -D\n"
-#~ "       mutt [ -nx ] [ -e <cmd> ] [ -a <file> ] [ -F <file> ] [ -H "
-#~ "<file> ] [ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> "
-#~ "[ ... ]\n"
-#~ "       mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
-#~ "       mutt -v[v]\n"
-#~ msgstr ""
-#~ "erabilera: mutt [ -nRyzZ ] [ -e <kom> ] [ -F <fitx> ] [ -m <mota> ] [ -f "
-#~ "<fitx> ]\n"
-#~ "       mutt [ -nR ] [ -e <kom> ] [ -F <fitx> ] -Q <galde> [ -Q <galde> ] "
-#~ "[...]\n"
-#~ "       mutt [ -nR ] [ -e <kom> ] [ -F <fitx> ] -A <ezizena> [ -A "
-#~ "<ezizena> ] [...]\n"
-#~ "       mutt [ -nR ] [ -e <kom> ] [ -F <fitx> ] -D       mutt [ -nx ] [ -e "
-#~ "<kom> ] [ -a <fitx> ] [ -F <fitx> ] [ -H <fitx> ] [ -i <fitx> ] [ -s "
-#~ "<subj> ] [ -b <helb> ] [ -c <helb> ] <helb> [ ... ]\n"
-#~ "       mutt [ -n ] [ -e <kom> ] [ -F <fitx> ] -p\n"
-#~ "       mutt -v[v]\n"
-
-#~ msgid "Reading %s... %d (%d%%)"
-#~ msgstr "%s irakurtzen... %d (%d%%)"
-
-#~ msgid "Writing messages... %d (%d%%)"
-#~ msgstr "Mezuak idazten... %d (%d%%)"
-
-#~ msgid "Reading %s... %d"
-#~ msgstr "%s irakurtzen ... %d"
-
-#~ msgid "Invoking pgp..."
-#~ msgstr "pgp deitzen..."
+#~ msgid "Error checking signature"
+#~ msgstr "Errorea sinadura egiaztatzerakoan"
+
+#~ msgid "SSL Certificate check"
+#~ msgstr "SSL Ziurtagiri arakatzea"
+
+#~ msgid "TLS/SSL Certificate check"
+#~ msgstr "TLS/SSL Ziurtagiria egiaztapena"