+Index: mutt/ChangeLog
+===================================================================
+RCS file: /home/roessler/cvs/mutt/ChangeLog,v
+retrieving revision 3.612
+retrieving revision 3.635
+diff -u -p -r3.612 -r3.635
+--- mutt/ChangeLog 29 Sep 2005 23:06:56 -0000 3.612
++++ mutt/ChangeLog 1 Nov 2005 08:43:14 -0000 3.635
+@@ -1,3 +1,136 @@
++2005-11-01 08:42:00 Thomas Roessler <roessler@does-not-exist.org> (roessler)
++
++ * menu.c: This should be a better patch for the menu break
++ dance. (#2019)
++
++2005-10-31 11:56:58 Thomas Glanzmann <sithglan@stud.uni-erlangen.de> (roessler)
++
++ * imap/message.c: Fix 2119.
++
++2005-10-31 10:51:54 Thomas Roessler <roessler@does-not-exist.org> (roessler)
++
++ * mutt_idna.c: Fix the underlying problem behind mutt/2107.
++
++ * menu.c: Fixing #2019.
++
++ * flags.c: Fix #2123.
++
++2005-10-21 04:35:38 Brendan Cully <brendan@kublai.com> (brendan)
++
++ * smime.c, attach.c, buffy.c, copy.c, copy.h, crypt-gpgme.c,
++ crypt.c, edit.c, handler.c, mbox.c, mutt.h, pager.c, parse.c,
++ pattern.c, pgp.c, pgpmicalg.c, pgppacket.c, pgppubring.c, pop.c,
++ postpone.c, protos.h, sendlib.c: Full large file support. Keep a
++ close watch on your mailboxes everyone!
++
++2005-10-18 07:04:50 Vincent Lefevre <vincent@vinc17.org> (roessler)
++
++ * po/fr.po: update
++
++2005-10-17 09:14:58 TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp> (roessler)
++
++ * smime.c: Fix S/MIME algorithm choice.
++
++2005-10-14 09:30:11 Thomas Roessler <roessler@does-not-exist.org> (roessler)
++
++ * imap/imap.c: Fix imap/2112.
++
++2005-10-10 18:26:31 Brendan Cully <brendan@kublai.com> (brendan)
++
++ * pgp.c: Make PGP decode failure non-fatal when displaying
++ messages (as opposed to decode-saving them). I think it would be
++ nicer to include the original text when decryption fails
++ though...
++
++ * imap/command.c, setenv.c: Accept + as IMAP continuation, not
++ just + . May close #2106. Feed check_sec candy in setenv.c.
++
++2005-10-09 20:53:21 Brendan Cully <brendan@kublai.com> (brendan)
++
++ * configure.in: Now that we always check for ncurses/ncurses.h,
++ remove /usr special case.
++
++ * configure.in, mutt_curses.h: Tweak ncurses autoconflation to
++ check for ncurses/ncurses.h everywhere, not just in /usr. With
++ --with-curses=/usr/local, should Close: #2095.
++
++ * configure.in, setenv.c: Add Russ Allbery's setenv replacement
++ function.
++
++ * init.h: Correct doc nit for $meta_key, noted by Mark
++ Weyer. Closes: #2105.
++
++2005-10-06 06:15:00 Brendan Cully <brendan@kublai.com> (brendan)
++
++ * browser.c: Sort browser entries after every IMAP browsing
++ operation instead of just when explicitly requested. Closes:
++ #2089.
++
++2005-10-06 05:13:55 Jeff Ito <jeffi@rcn.com> (brendan)
++
++ * smime.c: Add AES ciphers to S/MIME encryption options. Closes:
++ #2103.
++
++2005-10-05 19:24:40 David Champion <dgc@uchicago.edu> (brendan)
++
++ * doc/manual.xml.head, init.c: Fix 'unattachments'. Closes: #2102.
++
++2005-10-05 19:20:22 Jeff Ito <jeffi@rcn.com> (brendan)
++
++ * smime.c: S/MIME key selection truncates the last character of
++ the selected key for no apparent reason. Removed until someone
++ can justify it. Closes: #2081.
++
++2005-10-04 19:00:05 Brendan Cully <brendan@kublai.com> (brendan)
++
++ * init.h: Tweak description of pop_checkinterval slightly. Closes:
++ #2074.
++
++ * hcache.c: Bump hcache Id for attachment counting patch.
++
++2005-10-04 06:05:39 David Champion <dgc@uchicago.edu> (brendan)
++
++ * Muttrc.head.in, doc/manual.xml.head, doc/muttrc.man.head,
++ globals.h, hdrline.c, init.c, init.h, mime.h, mutt.h, parse.c,
++ pattern.c, protos.h, recvattach.c: Attachment counting for index
++ display (patch-1.5.11.dgc.attach.6). Modifications: attach_recurse
++ and attach_ignore_fundamental stripped, some debugging code
++ removed, some bones thrown to check_sec.sh.
++
++2005-10-04 05:24:00 Sebastien Hinderer <Sebastien.Hinderer@libertysurf.fr> (brendan)
++
++ * pager.c: The following patch has an effect only when the
++ braille_friendly variable is set. When this is the case, the
++ cursor is put on the first line of the message body, when viewing
++ it with the pager.
++
++2005-10-04 04:29:09 Alain Bench <veronatif@free.fr> (brendan)
++
++ * curs_main.c: Piping and printing in IMAP folder index with
++ imap_peek=no marks message read immediately.
++
++2005-10-03 07:52:00 TAKAHASHI Tamotsu <ttakah@lapis.plala.or.jp> (roessler)
++
++ * curs_lib.c, send.c: fix a problem that appears with signatures
++ without newline.
++
++2005-09-30 18:24:17 Brendan Cully <brendan@kublai.com> (brendan)
++
++ * doc/devel-notes.txt: Change manual.sgml to manual.xml (noted
++ by Alain Bench).
++
++2005-09-30 01:42:50 Roland Rosenfeld <roland@spinnaker.de> (brendan)
++
++ * po/de.po: Update.
++
++2005-09-29 23:57:07 Vincent Lefevre <vincent@vinc17.org> (brendan)
++
++ * po/fr.po: Update.
++
++2005-09-29 23:52:16 pi <pi@beobide.net> (brendan)
++
++ * configure.in, po/eu.po: Basque translation.
++
+ 2005-09-29 23:02:49 Brendan Cully <brendan@kublai.com> (brendan)
+
+ * configure.in, copy.c, sendlib.c: Ensure that Content-Length
+Index: mutt/Muttrc.head.in
+===================================================================
+RCS file: /home/roessler/cvs/mutt/Muttrc.head.in,v
+retrieving revision 3.1
+retrieving revision 3.2
+diff -u -p -r3.1 -r3.2
+--- mutt/Muttrc.head.in 17 Sep 2005 17:39:18 -0000 3.1
++++ mutt/Muttrc.head.in 4 Oct 2005 06:05:39 -0000 3.2
+@@ -30,6 +30,60 @@ bind browser y exit
+ # set use_8bitmime
+
+ ##
++## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH ***
++##
++
++##
++## Please see the manual (section "attachments") for detailed
++## documentation of the "attachments" command.
++##
++## Removing a pattern from a list removes that pattern literally. It
++## does not remove any type matching the pattern.
++##
++## attachments +A */.*
++## attachments +A image/jpeg
++## unattachments +A */.*
++##
++## This leaves "attached" image/jpeg files on the allowed attachments
++## list. It does not remove all items, as you might expect, because the
++## second */.* is not a matching expression at this time.
++##
++## Remember: "unattachments" only undoes what "attachments" has done!
++## It does not trigger any matching on actual messages.
++
++## Qualify any MIME part with an "attachment" disposition, EXCEPT for
++## text/x-vcard and application/pgp parts. (PGP parts are already known
++## to mutt, and can be searched for with ~g, ~G, and ~k.)
++##
++## I've added x-pkcs7 to this, since it functions (for S/MIME)
++## analogously to PGP signature attachments. S/MIME isn't supported
++## in a stock mutt build, but we can still treat it specially here.
++##
++attachments +A */.*
++attachments -A text/x-vcard application/pgp.*
++attachments -A application/x-pkcs7-.*
++
++## Discount all MIME parts with an "inline" disposition, unless they're
++## text/plain. (Why inline a text/plain part unless it's external to the
++## message flow?)
++##
++attachments +I text/plain
++
++## These two lines make Mutt qualify MIME containers. (So, for example,
++## a message/rfc822 forward will count as an attachment.) The first
++## line is unnecessary if you already have "attach-allow */.*", of
++## course. These are off by default! The MIME elements contained
++## within a message/* or multipart/* are still examined, even if the
++## containers themseves don't qualify.
++##
++#attachments +A message/.* multipart/.*
++#attachments +I message/.* multipart/.*
++
++## You probably don't really care to know about deleted attachments.
++attachments -A message/external-body
++attachments -I message/external-body
++
++##
+ ## More settings
+ ##
+
+Index: mutt/attach.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/attach.c,v
+retrieving revision 3.19
+retrieving revision 3.20
+diff -u -p -r3.19 -r3.20
+--- mutt/attach.c 17 Sep 2005 20:46:09 -0000 3.19
++++ mutt/attach.c 21 Oct 2005 04:35:37 -0000 3.20
+@@ -168,7 +168,7 @@ int mutt_compose_attachment (BODY *a)
+
+ /* Remove headers by copying out data to another file, then
+ * copying the file back */
+- fseek (fp, b->offset, 0);
++ fseeko (fp, b->offset, 0);
+ mutt_mktemp (tempfile);
+ if ((tfp = safe_fopen (tempfile, "w")) == NULL)
+ {
+@@ -771,7 +771,7 @@ int mutt_save_attachment (FILE *fp, BODY
+ hn->msgno = hdr->msgno; /* required for MH/maildir */
+ hn->read = 1;
+
+- fseek (fp, m->offset, 0);
++ fseeko (fp, m->offset, 0);
+ if (fgets (buf, sizeof (buf), fp) == NULL)
+ return -1;
+ if (mx_open_mailbox(path, M_APPEND | M_QUIET, &ctx) == NULL)
+@@ -806,7 +806,7 @@ int mutt_save_attachment (FILE *fp, BODY
+ mutt_perror ("fopen");
+ return (-1);
+ }
+- fseek ((s.fpin = fp), m->offset, 0);
++ fseeko ((s.fpin = fp), m->offset, 0);
+ mutt_decode_attachment (m, &s);
+
+ if (fclose (s.fpout) != 0)
+Index: mutt/browser.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/browser.c,v
+retrieving revision 3.18
+retrieving revision 3.19
+diff -u -p -r3.18 -r3.19
+--- mutt/browser.c 17 Sep 2005 20:46:09 -0000 3.18
++++ mutt/browser.c 6 Oct 2005 06:15:00 -0000 3.19
+@@ -613,6 +613,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ }
+ #endif
+ }
+@@ -757,6 +758,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ menu->data = state.entry;
+ }
+ else
+@@ -868,6 +870,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ menu->data = state.entry;
+ menu->current = 0;
+ menu->top = 0;
+@@ -888,6 +891,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ menu->data = state.entry;
+ menu->current = 0;
+ menu->top = 0;
+@@ -959,6 +963,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ menu->data = state.entry;
+ menu->current = 0;
+ menu->top = 0;
+@@ -1038,6 +1043,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ menu->data = state.entry;
+ init_menu (&state, menu, title, sizeof (title), buffy);
+ }
+@@ -1123,6 +1129,7 @@ void _mutt_select_file (char *f, size_t
+ init_state (&state, NULL);
+ state.imap_browse = 1;
+ imap_browse (LastDir, &state);
++ browser_sort (&state);
+ menu->data = state.entry;
+ }
+ #endif
+Index: mutt/buffy.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/buffy.c,v
+retrieving revision 3.13
+retrieving revision 3.14
+diff -u -p -r3.13 -r3.14
+--- mutt/buffy.c 17 Sep 2005 20:46:10 -0000 3.13
++++ mutt/buffy.c 21 Oct 2005 04:35:37 -0000 3.14
+@@ -52,14 +52,14 @@ static short BuffyNotify = 0; /* # of un
+
+ int fseek_last_message (FILE * f)
+ {
+- long int pos;
++ LOFF_T pos;
+ char buffer[BUFSIZ + 9]; /* 7 for "\n\nFrom " */
+ int bytes_read;
+ int i; /* Index into `buffer' for scanning. */
+
+ memset (buffer, 0, sizeof(buffer));
+ fseek (f, 0, SEEK_END);
+- pos = ftell (f);
++ pos = ftello (f);
+
+ /* Set `bytes_read' to the size of the last, probably partial, buffer; 0 <
+ * `bytes_read' <= `BUFSIZ'. */
+@@ -72,14 +72,14 @@ int fseek_last_message (FILE * f)
+ {
+ /* we save in the buffer at the end the first 7 chars from the last read */
+ strncpy (buffer + BUFSIZ, buffer, 5+2); /* 2 == 2 * mutt_strlen(CRLF) */
+- fseek (f, pos, SEEK_SET);
++ fseeko (f, pos, SEEK_SET);
+ bytes_read = fread (buffer, sizeof (char), bytes_read, f);
+ if (bytes_read == -1)
+ return -1;
+ for (i = bytes_read; --i >= 0;)
+ if (!mutt_strncmp (buffer + i, "\n\nFrom ", mutt_strlen ("\n\nFrom ")))
+ { /* found it - go to the beginning of the From */
+- fseek (f, pos + i + 2, SEEK_SET);
++ fseeko (f, pos + i + 2, SEEK_SET);
+ return 0;
+ }
+ bytes_read = BUFSIZ;
+Index: mutt/configure.in
+===================================================================
+RCS file: /home/roessler/cvs/mutt/configure.in,v
+retrieving revision 3.40
+retrieving revision 3.44
+diff -u -p -r3.40 -r3.44
+--- mutt/configure.in 29 Sep 2005 23:02:49 -0000 3.40
++++ mutt/configure.in 9 Oct 2005 20:53:21 -0000 3.44
+@@ -13,7 +13,7 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], [
+
+ AC_GNU_SOURCE
+
+-ALL_LINGUAS="de ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg ga"
++ALL_LINGUAS="de eu ru it es uk fr pl nl cs id sk ko el zh_TW zh_CN pt_BR eo gl sv da lt tr ja hu et ca bg ga"
+
+ AC_CANONICAL_HOST
+
+@@ -262,14 +262,12 @@ main ()
+ done
+ AC_CHECK_LIB($cf_ncurses, initscr,
+ [MUTTLIBS="$MUTTLIBS -l$cf_ncurses"
+- if test x$mutt_cv_curses = x/usr -a -d /usr/include/ncurses; then
+- CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses"
+- fi
+
+ if test "$cf_ncurses" = ncursesw; then
+ AC_CHECK_HEADERS(ncursesw/ncurses.h,[cf_cv_ncurses_header="ncursesw/ncurses.h"])
+ else
+- AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])
++ AC_CHECK_HEADERS(ncurses/ncurses.h,[cf_cv_ncurses_header="ncurses/ncurses.h"],
++ [AC_CHECK_HEADERS(ncurses.h,[cf_cv_ncurses_header="ncurses.h"])])
+ fi],
+
+ [CF_CURSES_LIBS])
+@@ -332,7 +330,7 @@ AC_CHECK_TYPE(ssize_t, int)
+
+ AC_CHECK_FUNCS(fgetpos memmove setegid srand48 strerror)
+
+-AC_REPLACE_FUNCS(strcasecmp strdup)
++AC_REPLACE_FUNCS([setenv strcasecmp strdup])
+
+ AC_CHECK_FUNC(getopt)
+ if test $ac_cv_func_getopt = yes; then
+Index: mutt/copy.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/copy.c,v
+retrieving revision 3.26
+retrieving revision 3.27
+diff -u -p -r3.26 -r3.27
+--- mutt/copy.c 29 Sep 2005 23:02:49 -0000 3.26
++++ mutt/copy.c 21 Oct 2005 04:35:37 -0000 3.27
+@@ -41,7 +41,7 @@ static int copy_delete_attach (BODY *b,
+ * below is to avoid creating a HEADER structure in message_handler().
+ */
+ int
+-mutt_copy_hdr (FILE *in, FILE *out, long off_start, long off_end, int flags,
++mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
+ const char *prefix)
+ {
+ int from = 0;
+@@ -56,8 +56,8 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ char *this_one = NULL;
+ int error;
+
+- if (ftell (in) != off_start)
+- fseek (in, off_start, 0);
++ if (ftello (in) != off_start)
++ fseeko (in, off_start, 0);
+
+ buf[0] = '\n';
+ buf[1] = 0;
+@@ -67,7 +67,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ /* Without these flags to complicate things
+ * we can do a more efficient line to line copying
+ */
+- while (ftell (in) < off_end)
++ while (ftello (in) < off_end)
+ {
+ nl = strchr (buf, '\n');
+
+@@ -136,7 +136,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ headers = safe_calloc (hdr_count, sizeof (char *));
+
+ /* Read all the headers into the array */
+- while (ftell (in) < off_end)
++ while (ftello (in) < off_end)
+ {
+ nl = strchr (buf, '\n');
+
+@@ -165,10 +165,10 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
+ FREE (&this_one);
+ }
+-
++
+ this_one = NULL;
+ }
+-
++
+ ignore = 1;
+ this_is_from = 0;
+ if (!from && mutt_strncmp ("From ", buf, 5) == 0)
+@@ -222,7 +222,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ }
+ }
+ }
+-
++
+ ignore = 0;
+ } /* If beginning of header */
+
+@@ -238,7 +238,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ strcat (this_one, buf); /* __STRCAT_CHECKED__ */
+ }
+ }
+- } /* while (ftell (in) < off_end) */
++ } /* while (ftello (in) < off_end) */
+
+ /* Do we have anything pending? -- XXX, same code as in above in the loop. */
+ if (this_one)
+@@ -258,7 +258,7 @@ mutt_copy_hdr (FILE *in, FILE *out, long
+ strcat (headers[x], this_one); /* __STRCAT_CHECKED__ */
+ FREE (&this_one);
+ }
+-
++
+ this_one = NULL;
+ }
+
+@@ -571,7 +571,7 @@ _mutt_copy_message (FILE *fpout, FILE *f
+ date[5] = date[mutt_strlen (date) - 1] = '\"';
+
+ /* Count the number of lines and bytes to be deleted */
+- fseek (fpin, body->offset, SEEK_SET);
++ fseeko (fpin, body->offset, SEEK_SET);
+ new_lines = hdr->lines -
+ count_delete_lines (fpin, body, &new_length, mutt_strlen (date));
+
+@@ -586,10 +586,10 @@ _mutt_copy_message (FILE *fpout, FILE *f
+ fprintf (fpout, "Lines: %d\n\n", new_lines);
+ if (ferror (fpout) || feof (fpout))
+ return -1;
+- new_offset = ftell (fpout);
++ new_offset = ftello (fpout);
+
+ /* Copy the body */
+- fseek (fpin, body->offset, SEEK_SET);
++ fseeko (fpin, body->offset, SEEK_SET);
+ if (copy_delete_attach (body, fpin, fpout, date))
+ return -1;
+
+@@ -686,7 +686,7 @@ _mutt_copy_message (FILE *fpout, FILE *f
+ mutt_write_mime_header (cur, fpout);
+ fputc ('\n', fpout);
+
+- fseek (fp, cur->offset, 0);
++ fseeko (fp, cur->offset, 0);
+ if (mutt_copy_bytes (fp, fpout, cur->length) == -1)
+ {
+ fclose (fp);
+@@ -698,7 +698,7 @@ _mutt_copy_message (FILE *fpout, FILE *f
+ }
+ else
+ {
+- fseek (fpin, body->offset, 0);
++ fseeko (fpin, body->offset, 0);
+ if (flags & M_CM_PREFIX)
+ {
+ int c;
+@@ -767,7 +767,7 @@ _mutt_append_message (CONTEXT *dest, FIL
+ MESSAGE *msg;
+ int r;
+
+- fseek(fpin, hdr->offset, 0);
++ fseeko (fpin, hdr->offset, 0);
+ if (fgets (buf, sizeof (buf), fpin) == NULL)
+ return -1;
+
+@@ -814,7 +814,7 @@ static int copy_delete_attach (BODY *b,
+ if (part->deleted || part->parts)
+ {
+ /* Copy till start of this part */
+- if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftell (fpin)))
++ if (mutt_copy_bytes (fpin, fpout, part->hdr_offset - ftello (fpin)))
+ return -1;
+
+ if (part->deleted)
+@@ -827,11 +827,11 @@ static int copy_delete_attach (BODY *b,
+ return -1;
+
+ /* Copy the original mime headers */
+- if (mutt_copy_bytes (fpin, fpout, part->offset - ftell (fpin)))
++ if (mutt_copy_bytes (fpin, fpout, part->offset - ftello (fpin)))
+ return -1;
+
+ /* Skip the deleted body */
+- fseek (fpin, part->offset + part->length, SEEK_SET);
++ fseeko (fpin, part->offset + part->length, SEEK_SET);
+ }
+ else
+ {
+@@ -842,7 +842,7 @@ static int copy_delete_attach (BODY *b,
+ }
+
+ /* Copy the last parts */
+- if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftell (fpin)))
++ if (mutt_copy_bytes (fpin, fpout, b->offset + b->length - ftello (fpin)))
+ return -1;
+
+ return 0;
+Index: mutt/copy.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/copy.h,v
+retrieving revision 3.9
+retrieving revision 3.10
+diff -u -p -r3.9 -r3.10
+--- mutt/copy.h 17 Sep 2005 20:46:10 -0000 3.9
++++ mutt/copy.h 21 Oct 2005 04:35:37 -0000 3.10
+@@ -37,7 +37,7 @@
+
+
+
+-int mutt_copy_hdr (FILE *, FILE *, long, long, int, const char *);
++int mutt_copy_hdr (FILE *, FILE *, LOFF_T, LOFF_T, int, const char *);
+
+ int mutt_copy_header (FILE *, HEADER *, FILE *, int, const char *);
+
+Index: mutt/crypt-gpgme.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/crypt-gpgme.c,v
+retrieving revision 3.9
+retrieving revision 3.10
+diff -u -p -r3.9 -r3.10
+--- mutt/crypt-gpgme.c 17 Sep 2005 20:46:10 -0000 3.9
++++ mutt/crypt-gpgme.c 21 Oct 2005 04:35:37 -0000 3.10
+@@ -1621,7 +1621,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin
+ STATE s;
+ FILE *tmpfp=NULL;
+ int is_signed;
+- long saved_b_offset;
++ LOFF_T saved_b_offset;
+ size_t saved_b_length;
+ int saved_b_type;
+
+@@ -1640,7 +1640,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin
+ saved_b_length = b->length;
+ memset (&s, 0, sizeof (s));
+ s.fpin = fpin;
+- fseek (s.fpin, b->offset, 0);
++ fseeko (s.fpin, b->offset, 0);
+ mutt_mktemp (tempfile);
+ if (!(tmpfp = safe_fopen (tempfile, "w+")))
+ {
+@@ -1652,7 +1652,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin
+ s.fpout = tmpfp;
+ mutt_decode_attachment (b, &s);
+ fflush (tmpfp);
+- b->length = ftell (s.fpout);
++ b->length = ftello (s.fpout);
+ b->offset = 0;
+ rewind (tmpfp);
+
+@@ -1694,7 +1694,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin
+ saved_b_length = bb->length;
+ memset (&s, 0, sizeof (s));
+ s.fpin = *fpout;
+- fseek (s.fpin, bb->offset, 0);
++ fseeko (s.fpin, bb->offset, 0);
+ mutt_mktemp (tempfile);
+ if (!(tmpfp = safe_fopen (tempfile, "w+")))
+ {
+@@ -1706,7 +1706,7 @@ int smime_gpgme_decrypt_mime (FILE *fpin
+ s.fpout = tmpfp;
+ mutt_decode_attachment (bb, &s);
+ fflush (tmpfp);
+- bb->length = ftell (s.fpout);
++ bb->length = ftello (s.fpout);
+ bb->offset = 0;
+ rewind (tmpfp);
+ fclose (*fpout);
+@@ -1887,7 +1887,8 @@ int pgp_gpgme_application_handler (BODY
+ int needpass = -1, pgp_keyblock = 0;
+ int clearsign = 0;
+ long start_pos = 0;
+- long bytes, last_pos, offset;
++ long bytes;
++ LOFF_T last_pos, offset;
+ char buf[HUGE_STRING];
+ FILE *pgpout = NULL;
+
+@@ -1907,7 +1908,7 @@ int pgp_gpgme_application_handler (BODY
+ if (!mutt_get_body_charset (body_charset, sizeof (body_charset), m))
+ strfcpy (body_charset, "iso-8859-1", sizeof body_charset);
+
+- fseek (s->fpin, m->offset, 0);
++ fseeko (s->fpin, m->offset, 0);
+ last_pos = m->offset;
+
+ for (bytes = m->length; bytes > 0;)
+@@ -1915,7 +1916,7 @@ int pgp_gpgme_application_handler (BODY
+ if (fgets (buf, sizeof (buf), s->fpin) == NULL)
+ break;
+
+- offset = ftell (s->fpin);
++ offset = ftello (s->fpin);
+ bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */
+ last_pos = offset;
+
+@@ -1954,7 +1955,7 @@ int pgp_gpgme_application_handler (BODY
+ gpgme_data_write (armored_data, buf, strlen (buf));
+ while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL)
+ {
+- offset = ftell (s->fpin);
++ offset = ftello (s->fpin);
+ bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf)*/
+ last_pos = offset;
+
+Index: mutt/crypt.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/crypt.c,v
+retrieving revision 3.31
+retrieving revision 3.32
+diff -u -p -r3.31 -r3.32
+--- mutt/crypt.c 17 Sep 2005 20:46:10 -0000 3.31
++++ mutt/crypt.c 21 Oct 2005 04:35:37 -0000 3.32
+@@ -504,7 +504,7 @@ int crypt_write_signed(BODY *a, STATE *s
+ return -1;
+ }
+
+- fseek (s->fpin, a->hdr_offset, 0);
++ fseeko (s->fpin, a->hdr_offset, 0);
+ bytes = a->length + a->offset - a->hdr_offset;
+ hadcr = 0;
+ while (bytes > 0)
+Index: mutt/curs_lib.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/curs_lib.c,v
+retrieving revision 3.23
+retrieving revision 3.24
+diff -u -p -r3.23 -r3.24
+--- mutt/curs_lib.c 17 Sep 2005 20:46:10 -0000 3.23
++++ mutt/curs_lib.c 3 Oct 2005 07:52:00 -0000 3.24
+@@ -156,19 +156,6 @@ void mutt_clear_error (void)
+ CLEARLINE (LINES-1);
+ }
+
+-static void fix_end_of_file (const char *data)
+-{
+- FILE *fp;
+- int c;
+-
+- if ((fp = safe_fopen (data, "a+")) == NULL)
+- return;
+- fseek (fp,-1,SEEK_END);
+- if ((c = fgetc(fp)) != '\n')
+- fputc ('\n', fp);
+- safe_fclose (&fp);
+-}
+-
+ void mutt_edit_file (const char *editor, const char *data)
+ {
+ char cmd[LONG_STRING];
+@@ -177,7 +164,6 @@ void mutt_edit_file (const char *editor,
+ mutt_expand_file_fmt (cmd, sizeof (cmd), editor, data);
+ if (mutt_system (cmd) == -1)
+ mutt_error (_("Error running \"%s\"!"), cmd);
+- fix_end_of_file (data);
+ keypad (stdscr, TRUE);
+ clearok (stdscr, TRUE);
+ }
+Index: mutt/curs_main.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/curs_main.c,v
+retrieving revision 3.33
+retrieving revision 3.34
+diff -u -p -r3.33 -r3.34
+--- mutt/curs_main.c 21 Sep 2005 14:17:14 -0000 3.33
++++ mutt/curs_main.c 4 Oct 2005 04:29:09 -0000 3.34
+@@ -1996,27 +1996,49 @@ CHECK_IMAP_ACL(IMAP_ACL_INSERT);
+ continue;
+ }
+ break;
+-
++
+ case OP_PIPE:
+
+ CHECK_MSGCOUNT;
+- CHECK_VISIBLE;
++ CHECK_VISIBLE;
+ mutt_pipe_message (tag ? NULL : CURHDR);
++
++#ifdef USE_IMAP
++ /* in an IMAP folder index with imap_peek=no, piping could change
++ * new or old messages status to read. Redraw what's needed.
++ */
++ if (Context->magic == M_IMAP && !option (OPTIMAPPEEK))
++ {
++ menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
++ }
++#endif
++
+ MAYBE_REDRAW (menu->redraw);
+ break;
+
+ case OP_PRINT:
+
+ CHECK_MSGCOUNT;
+- CHECK_VISIBLE;
++ CHECK_VISIBLE;
+ mutt_print_message (tag ? NULL : CURHDR);
++
++#ifdef USE_IMAP
++ /* in an IMAP folder index with imap_peek=no, printing could change
++ * new or old messages status to read. Redraw what's needed.
++ */
++ if (Context->magic == M_IMAP && !option (OPTIMAPPEEK))
++ {
++ menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
++ }
++#endif
++
+ break;
+
+ case OP_MAIN_READ_THREAD:
+ case OP_MAIN_READ_SUBTHREAD:
+
+ CHECK_MSGCOUNT;
+- CHECK_VISIBLE;
++ CHECK_VISIBLE;
+ CHECK_READONLY;
+
+ #ifdef USE_IMAP
+Index: mutt/edit.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/edit.c,v
+retrieving revision 3.8
+retrieving revision 3.9
+diff -u -p -r3.8 -r3.9
+--- mutt/edit.c 24 Sep 2005 20:03:04 -0000 3.8
++++ mutt/edit.c 21 Oct 2005 04:35:37 -0000 3.9
+@@ -61,7 +61,7 @@ static char* EditorHelp2 = N_("\
+ . on a line by itself ends input\n");
+
+ static char **
+-be_snarf_data (FILE *f, char **buf, int *bufmax, int *buflen, int offset,
++be_snarf_data (FILE *f, char **buf, int *bufmax, int *buflen, LOFF_T offset,
+ int bytes, int prefix)
+ {
+ char tmp[HUGE_STRING];
+@@ -77,7 +77,7 @@ be_snarf_data (FILE *f, char **buf, int
+ tmplen = sizeof (tmp) - tmplen;
+ }
+
+- fseek (f, offset, 0);
++ fseeko (f, offset, 0);
+ while (bytes > 0)
+ {
+ if (fgets (p, tmplen - 1, f) == NULL) break;
+Index: mutt/flags.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/flags.c,v
+retrieving revision 3.6
+retrieving revision 3.7
+diff -u -p -r3.6 -r3.7
+--- mutt/flags.c 17 Sep 2005 20:46:10 -0000 3.6
++++ mutt/flags.c 31 Oct 2005 10:03:55 -0000 3.7
+@@ -34,6 +34,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+ int changed = h->changed;
+ int deleted = ctx->deleted;
+ int tagged = ctx->tagged;
++ int flagged = ctx->flagged;
+
+ if (ctx->readonly && flag != M_TAG)
+ return; /* don't modify anything if we are read-only */
+@@ -272,7 +273,7 @@ void _mutt_set_flag (CONTEXT *ctx, HEADE
+ * search results so that any future search will match the current status
+ * of this message and not what it was at the time it was last searched.
+ */
+- if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged))
++ if (h->searched && (changed != h->changed || deleted != ctx->deleted || tagged != ctx->tagged || flagged != ctx->flagged))
+ h->searched = 0;
+ }
+
+Index: mutt/globals.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/globals.h,v
+retrieving revision 3.25
+retrieving revision 3.26
+diff -u -p -r3.25 -r3.26
+--- mutt/globals.h 22 Sep 2005 16:38:08 -0000 3.25
++++ mutt/globals.h 4 Oct 2005 06:05:39 -0000 3.26
+@@ -140,6 +140,10 @@ WHERE char *LastFolder;
+
+ WHERE LIST *AutoViewList INITVAL(0);
+ WHERE LIST *AlternativeOrderList INITVAL(0);
++WHERE LIST *AttachAllow INITVAL(0);
++WHERE LIST *AttachExclude INITVAL(0);
++WHERE LIST *InlineAllow INITVAL(0);
++WHERE LIST *InlineExclude INITVAL(0);
+ WHERE LIST *HeaderOrderList INITVAL(0);
+ WHERE LIST *Ignore INITVAL(0);
+ WHERE LIST *MimeLookupList INITVAL(0);
+Index: mutt/handler.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/handler.c,v
+retrieving revision 3.22
+retrieving revision 3.23
+diff -u -p -r3.22 -r3.23
+--- mutt/handler.c 17 Sep 2005 20:46:10 -0000 3.22
++++ mutt/handler.c 21 Oct 2005 04:35:37 -0000 3.23
+@@ -1340,7 +1340,7 @@ static int alternative_handler (BODY *a,
+ {
+ if (s->flags & M_DISPLAY && !option (OPTWEED))
+ {
+- fseek (s->fpin, choice->hdr_offset, 0);
++ fseeko (s->fpin, choice->hdr_offset, 0);
+ mutt_copy_bytes(s->fpin, s->fpout, choice->offset-choice->hdr_offset);
+ }
+ mutt_body_handler (choice, s);
+@@ -1364,16 +1364,16 @@ int message_handler (BODY *a, STATE *s)
+ {
+ struct stat st;
+ BODY *b;
+- long off_start;
++ LOFF_T off_start;
+ int rc = 0;
+
+- off_start = ftell (s->fpin);
++ off_start = ftello (s->fpin);
+ if (a->encoding == ENCBASE64 || a->encoding == ENCQUOTEDPRINTABLE ||
+ a->encoding == ENCUUENCODED)
+ {
+ fstat (fileno (s->fpin), &st);
+ b = mutt_new_body ();
+- b->length = (long) st.st_size;
++ b->length = (LOFF_T) st.st_size;
+ b->parts = mutt_parse_messageRFC822 (s->fpin, b);
+ }
+ else
+@@ -1482,7 +1482,7 @@ int multipart_handler (BODY *a, STATE *s
+ TYPE (p), p->subtype, ENCODING (p->encoding), length);
+ if (!option (OPTWEED))
+ {
+- fseek (s->fpin, p->hdr_offset, 0);
++ fseeko (s->fpin, p->hdr_offset, 0);
+ mutt_copy_bytes(s->fpin, s->fpout, p->offset-p->hdr_offset);
+ }
+ else
+@@ -1697,7 +1697,7 @@ static int external_body_handler (BODY *
+ state_printf (s, _("[-- name: %s --]\n"), b->parts->filename);
+ }
+
+- mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
++ mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
+ (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
+ CH_DECODE , NULL);
+ }
+@@ -1712,7 +1712,7 @@ static int external_body_handler (BODY *
+ state_attach_puts (_("[-- and the indicated external source has --]\n"
+ "[-- expired. --]\n"), s);
+
+- mutt_copy_hdr(s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
++ mutt_copy_hdr(s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
+ (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
+ CH_DECODE, NULL);
+ }
+@@ -1729,7 +1729,7 @@ static int external_body_handler (BODY *
+ state_printf (s,
+ _("[-- and the indicated access-type %s is unsupported --]\n"),
+ access_type);
+- mutt_copy_hdr (s->fpin, s->fpout, ftell (s->fpin), b->parts->offset,
++ mutt_copy_hdr (s->fpin, s->fpout, ftello (s->fpin), b->parts->offset,
+ (option (OPTWEED) ? (CH_WEED | CH_REORDER) : 0) |
+ CH_DECODE , NULL);
+ }
+@@ -1750,7 +1750,7 @@ void mutt_decode_attachment (BODY *b, ST
+ cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
+ }
+
+- fseek (s->fpin, b->offset, 0);
++ fseeko (s->fpin, b->offset, 0);
+ switch (b->encoding)
+ {
+ case ENCQUOTEDPRINTABLE:
+@@ -1867,7 +1867,7 @@ int mutt_body_handler (BODY *b, STATE *s
+
+ if (plaintext || handler)
+ {
+- fseek (s->fpin, b->offset, 0);
++ fseeko (s->fpin, b->offset, 0);
+
+ /* see if we need to decode this part before processing it */
+ if (b->encoding == ENCBASE64 || b->encoding == ENCQUOTEDPRINTABLE ||
+@@ -1912,7 +1912,7 @@ int mutt_body_handler (BODY *b, STATE *s
+
+ if (decode)
+ {
+- b->length = ftell (s->fpout);
++ b->length = ftello (s->fpout);
+ b->offset = 0;
+ fclose (s->fpout);
+
+Index: mutt/hcache.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/hcache.c,v
+retrieving revision 3.11
+retrieving revision 3.12
+diff -u -p -r3.11 -r3.12
+--- mutt/hcache.c 22 Sep 2005 16:38:08 -0000 3.11
++++ mutt/hcache.c 4 Oct 2005 18:18:52 -0000 3.12
+@@ -18,6 +18,8 @@
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
++/* this comment bumps Id because of the attachment counting patch. */
++
+ #if HAVE_CONFIG_H
+ #include "config.h"
+ #endif /* HAVE_CONFIG_H */
+@@ -461,7 +463,7 @@ generate_crc32()
+ SPAM_LIST *sp = SpamList;
+ RX_LIST *rx = NoSpamList;
+
+- crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.11 2005/09/22 16:38:08 brendan Exp $", mutt_strlen("$Id: hcache.c,v 3.11 2005/09/22 16:38:08 brendan Exp $"));
++ crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.12 2005/10/04 18:18:52 brendan Exp $", mutt_strlen("$Id: hcache.c,v 3.12 2005/10/04 18:18:52 brendan Exp $"));
+
+ #if HAVE_LANGINFO_CODESET
+ crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset));
+Index: mutt/hdrline.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/hdrline.c,v
+retrieving revision 3.16
+retrieving revision 3.17
+diff -u -p -r3.16 -r3.17
+--- mutt/hdrline.c 17 Sep 2005 20:46:10 -0000 3.16
++++ mutt/hdrline.c 4 Oct 2005 06:05:39 -0000 3.17
+@@ -218,6 +218,7 @@ int mutt_user_is_recipient (HEADER *h)
+ * %T = $to_chars
+ * %u = user (login) name of author
+ * %v = first name of author, unless from self
++ * %X = number of MIME attachments
+ * %y = `x-label:' field (if present)
+ * %Y = `x-label:' field (if present, tree unfolded, and != parent's x-label)
+ * %Z = status flags */
+@@ -654,6 +655,28 @@ hdr_format_str (char *dest,
+ mutt_format_s (dest, destlen, prefix, buf2);
+ break;
+
++ case 'X':
++ {
++ int count, flags;
++
++ if (hdr->content->parts)
++ count = mutt_count_body_parts(hdr, flags);
++ else
++ {
++ mutt_parse_mime_message(ctx, hdr);
++ count = mutt_count_body_parts(hdr, flags);
++ mutt_free_body(&hdr->content->parts);
++ }
++
++ /* The recursion allows messages without depth to return 0. */
++ if (optional)
++ optional = count != 0;
++
++ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
++ snprintf (dest, destlen, fmt, count);
++ }
++ break;
++
+ case 'y':
+ if (optional)
+ optional = hdr->env->x_label ? 1 : 0;
+Index: mutt/init.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/init.c,v
+retrieving revision 3.44
+retrieving revision 3.46
+diff -u -p -r3.44 -r3.46
+--- mutt/init.c 22 Sep 2005 04:05:49 -0000 3.44
++++ mutt/init.c 5 Oct 2005 19:24:40 -0000 3.46
+@@ -793,6 +793,271 @@ static int parse_lists (BUFFER *buf, BUF
+ return 0;
+ }
+
++/* always wise to do what someone else did before */
++static void _attachments_clean (void)
++{
++ int i;
++ if (Context && Context->msgcount)
++ {
++ for (i = 0; i < Context->msgcount; i++)
++ Context->hdrs[i]->attach_valid = 0;
++ }
++}
++
++static int parse_attach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err)
++{
++ ATTACH_MATCH *a;
++ LIST *listp, *lastp;
++ char *p;
++ char *tmpminor;
++ int len;
++
++ /* Find the last item in the list that data points to. */
++ lastp = NULL;
++ dprint(5, (debugfile, "parse_attach_list: ldata = %08x, *ldata = %08x\n",
++ (unsigned int)ldata, (unsigned int)*ldata));
++ for (listp = *ldata; listp; listp = listp->next)
++ {
++ a = (ATTACH_MATCH *)listp->data;
++ dprint(5, (debugfile, "parse_attach_list: skipping %s/%s\n",
++ a->major, a->minor));
++ lastp = listp;
++ }
++
++ do
++ {
++ mutt_extract_token (buf, s, 0);
++
++ if (!buf->data || *buf->data == '\0')
++ continue;
++
++ a = safe_malloc(sizeof(ATTACH_MATCH));
++
++ /* some cheap hacks that I expect to remove */
++ if (!mutt_strcasecmp(buf->data, "any"))
++ a->major = safe_strdup("*/.*");
++ else if (!mutt_strcasecmp(buf->data, "none"))
++ a->major = safe_strdup("cheap_hack/this_should_never_match");
++ else
++ a->major = safe_strdup(buf->data);
++
++ if ((p = strchr(a->major, '/')))
++ {
++ *p = '\0';
++ ++p;
++ a->minor = p;
++ }
++ else
++ {
++ a->minor = "unknown";
++ }
++
++ len = strlen(a->minor);
++ tmpminor = safe_malloc(len+3);
++ strcpy(&tmpminor[1], a->minor); /* __STRCPY_CHECKED__ */
++ tmpminor[0] = '^';
++ tmpminor[len+1] = '$';
++ tmpminor[len+2] = '\0';
++
++ a->major_int = mutt_check_mime_type(a->major);
++ regcomp(&a->minor_rx, tmpminor, REG_ICASE|REG_EXTENDED);
++
++ safe_free(&tmpminor);
++
++ dprint(5, (debugfile, "parse_attach_list: added %s/%s [%d]\n",
++ a->major, a->minor, a->major_int));
++
++ listp = safe_malloc(sizeof(LIST));
++ listp->data = (char *)a;
++ listp->next = NULL;
++ if (lastp)
++ {
++ lastp->next = listp;
++ }
++ else
++ {
++ *ldata = listp;
++ }
++ lastp = listp;
++ }
++ while (MoreArgs (s));
++
++ _attachments_clean();
++ return 0;
++}
++
++static int parse_unattach_list (BUFFER *buf, BUFFER *s, LIST **ldata, BUFFER *err)
++{
++ ATTACH_MATCH *a;
++ LIST *lp, *lastp, *newlp;
++ char *tmp;
++ int major;
++ char *minor;
++
++ do
++ {
++ mutt_extract_token (buf, s, 0);
++
++ if (!mutt_strcasecmp(buf->data, "any"))
++ tmp = safe_strdup("*/.*");
++ else if (!mutt_strcasecmp(buf->data, "none"))
++ tmp = safe_strdup("cheap_hack/this_should_never_match");
++ else
++ tmp = safe_strdup(buf->data);
++
++ if ((minor = strchr(tmp, '/')))
++ {
++ *minor = '\0';
++ ++minor;
++ }
++ else
++ {
++ minor = "unknown";
++ }
++ major = mutt_check_mime_type(tmp);
++
++ /* We must do our own walk here because remove_from_list() will only
++ * remove the LIST->data, not anything pointed to by the LIST->data. */
++ lastp = NULL;
++ for(lp = *ldata; lp; )
++ {
++ a = (ATTACH_MATCH *)lp->data;
++ dprint(5, (debugfile, "parse_unattach_list: check %s/%s [%d] : %s/%s [%d]\n",
++ a->major, a->minor, a->major_int, tmp, minor, major));
++ if (a->major_int == major && !mutt_strcasecmp(minor, a->minor))
++ {
++ dprint(5, (debugfile, "parse_unattach_list: removed %s/%s [%d]\n",
++ a->major, a->minor, a->major_int));
++ regfree(&a->minor_rx);
++ FREE(&a->major);
++
++ /* Relink backward */
++ if (lastp)
++ lastp->next = lp->next;
++ else
++ *ldata = lp->next;
++
++ newlp = lp->next;
++ FREE(&lp->data); /* same as a */
++ FREE(&lp);
++ lp = newlp;
++ continue;
++ }
++
++ lastp = lp;
++ lp = lp->next;
++ }
++
++ }
++ while (MoreArgs (s));
++
++ FREE(&tmp);
++ _attachments_clean();
++ return 0;
++}
++
++static int print_attach_list (LIST *lp, char op, char *name)
++{
++ while (lp) {
++ printf("attachments %c%s %s/%s\n", op, name,
++ ((ATTACH_MATCH *)lp->data)->major,
++ ((ATTACH_MATCH *)lp->data)->minor);
++ lp = lp->next;
++ }
++
++ return 0;
++}
++
++
++static int parse_attachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
++{
++ char op, *category;
++ LIST **listp;
++
++ mutt_extract_token(buf, s, 0);
++ if (!buf->data || *buf->data == '\0') {
++ strfcpy(err->data, _("attachments: no disposition"), err->dsize);
++ return -1;
++ }
++
++ category = buf->data;
++ op = *category++;
++
++ if (op == '?') {
++ mutt_endwin (NULL);
++ fflush (stdout);
++ printf("\nCurrent attachments settings:\n\n");
++ print_attach_list(AttachAllow, '+', "A");
++ print_attach_list(AttachExclude, '-', "A");
++ print_attach_list(InlineAllow, '+', "I");
++ print_attach_list(InlineExclude, '-', "I");
++ set_option (OPTFORCEREDRAWINDEX);
++ set_option (OPTFORCEREDRAWPAGER);
++ mutt_any_key_to_continue (NULL);
++ return 0;
++ }
++
++ if (op != '+' && op != '-') {
++ op = '+';
++ category--;
++ }
++ if (!mutt_strncasecmp(category, "attachment", strlen(category))) {
++ if (op == '+')
++ listp = &AttachAllow;
++ else
++ listp = &AttachExclude;
++ }
++ else if (!mutt_strncasecmp(category, "inline", strlen(category))) {
++ if (op == '+')
++ listp = &InlineAllow;
++ else
++ listp = &InlineExclude;
++ }
++ else {
++ strfcpy(err->data, _("attachments: invalid disposition"), err->dsize);
++ return -1;
++ }
++
++ return parse_attach_list(buf, s, listp, err);
++}
++
++static int parse_unattachments (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
++{
++ char op, *p;
++ LIST **listp;
++
++ mutt_extract_token(buf, s, 0);
++ if (!buf->data || *buf->data == '\0') {
++ strfcpy(err->data, _("unattachments: no disposition"), err->dsize);
++ return -1;
++ }
++
++ p = buf->data;
++ op = *p++;
++ if (op != '+' && op != '-') {
++ op = '+';
++ p--;
++ }
++ if (!mutt_strncasecmp(p, "attachment", strlen(p))) {
++ if (op == '+')
++ listp = &AttachAllow;
++ else
++ listp = &AttachExclude;
++ }
++ else if (!mutt_strncasecmp(p, "inline", strlen(p))) {
++ if (op == '+')
++ listp = &InlineAllow;
++ else
++ listp = &InlineExclude;
++ }
++ else {
++ strfcpy(err->data, _("unattachments: invalid disposition"), err->dsize);
++ return -1;
++ }
++
++ return parse_unattach_list(buf, s, listp, err);
++}
++
+ static int parse_unlists (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
+ {
+ do
+Index: mutt/init.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/init.h,v
+retrieving revision 3.89
+retrieving revision 3.92
+diff -u -p -r3.89 -r3.92
+--- mutt/init.h 22 Sep 2005 16:38:08 -0000 3.89
++++ mutt/init.h 9 Oct 2005 06:43:43 -0000 3.92
+@@ -220,10 +220,12 @@ struct option_t MuttVars[] = {
+ ** .dt %m .dd major MIME type
+ ** .dt %M .dd MIME subtype
+ ** .dt %n .dd attachment number
++ ** .dt %Q .dd "Q", if MIME part qualifies for attachment counting
+ ** .dt %s .dd size
+ ** .dt %t .dd tagged flag
+ ** .dt %T .dd graphic tree characters
+ ** .dt %u .dd unlink (=to delete) flag
++ ** .dt %X .dd number of qualifying MIME parts in this part and its children
+ ** .dt %>X .dd right justify the rest of the string and pad with character "X"
+ ** .dt %|X .dd pad to the end of the line with character "X"
+ ** .de
+@@ -990,6 +992,7 @@ struct option_t MuttVars[] = {
+ ** .dt %T .dd the appropriate character from the $$to_chars string
+ ** .dt %u .dd user (login) name of the author
+ ** .dt %v .dd first name of the author, or the recipient if the message is from you
++ ** .dt %X .dd number of attachments
+ ** .dt %y .dd `x-label:' field, if present
+ ** .dt %Y .dd `x-label' field, if present, and (1) not at part of a thread tree,
+ ** (2) at the top of a thread, or (3) `x-label' is different from
+@@ -1165,9 +1168,9 @@ struct option_t MuttVars[] = {
+ ** If set, forces Mutt to interpret keystrokes with the high bit (bit 8)
+ ** set as if the user had pressed the ESC key and whatever key remains
+ ** after having the high bit removed. For example, if the key pressed
+- ** has an ASCII value of 0xf4, then this is treated as if the user had
++ ** has an ASCII value of 0xf8, then this is treated as if the user had
+ ** pressed ESC then ``x''. This is because the result of removing the
+- ** high bit from ``0xf4'' is ``0x74'', which is the ASCII character
++ ** high bit from ``0xf8'' is ``0x78'', which is the ASCII character
+ ** ``x''.
+ */
+ { "mh_purge", DT_BOOL, R_NONE, OPTMHPURGE, 0 },
+@@ -2037,8 +2040,8 @@ struct option_t MuttVars[] = {
+ { "pop_checkinterval", DT_NUM, R_NONE, UL &PopCheckTimeout, 60 },
+ /*
+ ** .pp
+- ** This variable configures how often (in seconds) POP should look for
+- ** new mail.
++ ** This variable configures how often (in seconds) mutt should look for
++ ** new mail in the currently selected mailbox if it is a POP mailbox.
+ */
+ { "pop_delete", DT_QUAD, R_NONE, OPT_POPDELETE, M_ASKNO },
+ /*
+@@ -2065,8 +2068,8 @@ struct option_t MuttVars[] = {
+ { "pop_reconnect", DT_QUAD, R_NONE, OPT_POPRECONNECT, M_ASKYES },
+ /*
+ ** .pp
+- ** Controls whether or not Mutt will try to reconnect to POP server when
+- ** connection lost.
++ ** Controls whether or not Mutt will try to reconnect to POP server if
++ ** the connection is lost.
+ */
+ { "pop_user", DT_STR, R_NONE, UL &PopUser, 0 },
+ /*
+@@ -2982,6 +2985,9 @@ static int parse_my_hdr (BUFFER *, BUFFE
+ static int parse_unmy_hdr (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+ static int parse_subscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+ static int parse_unsubscribe (BUFFER *, BUFFER *, unsigned long, BUFFER *);
++static int parse_attachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
++static int parse_unattachments (BUFFER *, BUFFER *, unsigned long, BUFFER *);
++
+
+ static int parse_alternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+ static int parse_unalternates (BUFFER *, BUFFER *, unsigned long, BUFFER *);
+@@ -3001,6 +3007,8 @@ struct command_t Commands[] = {
+ { "account-hook", mutt_parse_hook, M_ACCOUNTHOOK },
+ #endif
+ { "alias", parse_alias, 0 },
++ { "attachments", parse_attachments, 0 },
++ { "unattachments",parse_unattachments,0 },
+ { "auto_view", parse_list, UL &AutoViewList },
+ { "alternative_order", parse_list, UL &AlternativeOrderList},
+ { "bind", mutt_parse_bind, 0 },
+Index: mutt/mbox.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/mbox.c,v
+retrieving revision 3.10
+retrieving revision 3.11
+diff -u -p -r3.10 -r3.11
+--- mutt/mbox.c 24 Sep 2005 19:45:23 -0000 3.10
++++ mutt/mbox.c 21 Oct 2005 04:35:37 -0000 3.11
+@@ -41,10 +41,10 @@
+ struct m_update_t
+ {
+ short valid;
+- long hdr;
+- long body;
++ LOFF_T hdr;
++ LOFF_T body;
+ long lines;
+- long length;
++ LOFF_T length;
+ };
+
+ /* parameters:
+@@ -147,7 +147,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
+
+ if (!is_from (buf, return_path, sizeof (return_path), &t))
+ {
+- if (fseek (ctx->fp, loc, SEEK_SET) != 0)
++ if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
+ {
+ dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+ mutt_error _("Mailbox is corrupt!");
+@@ -167,11 +167,11 @@ int mmdf_parse_mailbox (CONTEXT *ctx)
+
+ if (0 < tmploc && tmploc < ctx->size)
+ {
+- if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 ||
++ if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 ||
+ fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL ||
+ mutt_strcmp (MMDF_SEP, buf) != 0)
+ {
+- if (fseek (ctx->fp, loc, SEEK_SET) != 0)
++ if (fseeko (ctx->fp, loc, SEEK_SET) != 0)
+ dprint (1, (debugfile, "mmdf_parse_mailbox: fseek() failed\n"));
+ hdr->content->length = -1;
+ }
+@@ -319,7 +319,7 @@ int mbox_parse_mailbox (CONTEXT *ctx)
+ fgets (buf, sizeof (buf), ctx->fp) == NULL ||
+ mutt_strncmp ("From ", buf, 5) != 0)
+ {
+- dprint (1, (debugfile, "mbox_parse_mailbox: bad content-length in message %d (cl=%ld)\n", curhdr->index, curhdr->content->length));
++ dprint (1, (debugfile, "mbox_parse_mailbox: bad content-length in message %d (cl=" OFF_T_FMT ")\n", curhdr->index, curhdr->content->length));
+ dprint (1, (debugfile, "\tLINE: %s", buf));
+ if (fseeko (ctx->fp, loc, SEEK_SET) != 0) /* nope, return the previous position */
+ {
+@@ -601,14 +601,14 @@ int mbox_check_mailbox (CONTEXT *ctx, in
+ * see the message separator at *exactly* what used to be the end of the
+ * folder.
+ */
+- if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
++ if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
+ dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
+ if (fgets (buffer, sizeof (buffer), ctx->fp) != NULL)
+ {
+ if ((ctx->magic == M_MBOX && mutt_strncmp ("From ", buffer, 5) == 0) ||
+ (ctx->magic == M_MMDF && mutt_strcmp (MMDF_SEP, buffer) == 0))
+ {
+- if (fseek (ctx->fp, ctx->size, SEEK_SET) != 0)
++ if (fseeko (ctx->fp, ctx->size, SEEK_SET) != 0)
+ dprint (1, (debugfile, "mbox_check_mailbox: fseek() failed\n"));
+ if (ctx->magic == M_MBOX)
+ mbox_parse_mailbox (ctx);
+@@ -675,7 +675,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+ int rc = -1;
+ int need_sort = 0; /* flag to resort mailbox if new mail arrives */
+ int first = -1; /* first message to be written */
+- long offset; /* location in mailbox to write changed messages */
++ LOFF_T offset; /* location in mailbox to write changed messages */
+ struct stat statbuf;
+ struct utimbuf utimebuf;
+ struct m_update_t *newOffset = NULL;
+@@ -808,7 +808,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+ * temporary file only contains saved message which are located after
+ * `offset' in the real mailbox
+ */
+- newOffset[i - first].hdr = ftell (fp) + offset;
++ newOffset[i - first].hdr = ftello (fp) + offset;
+
+ if (mutt_copy_message (fp, ctx, ctx->hdrs[i], M_CM_UPDATE, CH_FROM | CH_UPDATE | CH_UPDATE_LEN) == -1)
+ {
+@@ -824,7 +824,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+ * we just flush the in memory cache so that the message will be reparsed
+ * if the user accesses it later.
+ */
+- newOffset[i - first].body = ftell (fp) - ctx->hdrs[i]->content->length + offset;
++ newOffset[i - first].body = ftello (fp) - ctx->hdrs[i]->content->length + offset;
+ mutt_free_body (&ctx->hdrs[i]->content->parts);
+
+ switch(ctx->magic)
+@@ -880,7 +880,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+ return (-1);
+ }
+
+- if (fseek (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
++ if (fseeko (ctx->fp, offset, SEEK_SET) != 0 || /* seek the append location */
+ /* do a sanity check to make sure the mailbox looks ok */
+ fgets (buf, sizeof (buf), ctx->fp) == NULL ||
+ (ctx->magic == M_MBOX && mutt_strncmp ("From ", buf, 5) != 0) ||
+@@ -892,7 +892,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+ }
+ else
+ {
+- if (fseek (ctx->fp, offset, SEEK_SET) != 0) /* return to proper offset */
++ if (fseeko (ctx->fp, offset, SEEK_SET) != 0) /* return to proper offset */
+ {
+ i = -1;
+ dprint (1, (debugfile, "mbox_sync_mailbox: fseek() failed\n"));
+@@ -910,7 +910,7 @@ int mbox_sync_mailbox (CONTEXT *ctx, int
+ }
+ if (i == 0)
+ {
+- ctx->size = ftell (ctx->fp); /* update the size of the mailbox */
++ ctx->size = ftello (ctx->fp); /* update the size of the mailbox */
+ ftruncate (fileno (ctx->fp), ctx->size);
+ }
+ }
+Index: mutt/menu.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/menu.c,v
+retrieving revision 3.21
+retrieving revision 3.23
+diff -u -p -r3.21 -r3.23
+--- mutt/menu.c 17 Sep 2005 20:46:10 -0000 3.21
++++ mutt/menu.c 1 Nov 2005 08:42:00 -0000 3.23
+@@ -384,19 +384,32 @@ void menu_check_recenter (MUTTMENU *menu
+ set_option (OPTNEEDREDRAW);
+ }
+ }
+- else if (menu->current >= menu->top + menu->pagelen - c) /* indicator below bottom threshold */
+- {
+- if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
+- menu->top = menu->current - menu->pagelen + c + 1;
+- else
+- menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
+- }
+- else if (menu->current < menu->top + c) /* indicator above top threshold */
++ else
+ {
+- if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
+- menu->top = menu->current - c;
+- else
+- menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
++ /*
++ * If c = menu->pagelen / 2 and menu->pagelen is even, then (obviously):
++ *
++ * menu->top + menu->pagelen - c == menu->top + c
++ *
++ * In that case, having an "else if" below leads to what has become known as the
++ * indicator break dance effect. Instead of special-casing, we just forget the
++ * "else".
++ */
++
++ if (menu->current < menu->top + c) /* indicator above top threshold */
++ {
++ if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
++ menu->top = menu->current - c;
++ else
++ menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c;
++ }
++ if (menu->current >= menu->top + menu->pagelen - c) /* indicator below bottom threshold */
++ {
++ if (option (OPTMENUSCROLL) || (menu->pagelen <= 0))
++ menu->top = menu->current - menu->pagelen + c + 1;
++ else
++ menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c;
++ }
+ }
+
+ if (!option (OPTMENUMOVEOFF)) /* make entries stick to bottom */
+Index: mutt/mime.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/mime.h,v
+retrieving revision 3.3
+retrieving revision 3.4
+diff -u -p -r3.3 -r3.4
+--- mutt/mime.h 17 Sep 2005 20:46:10 -0000 3.3
++++ mutt/mime.h 4 Oct 2005 06:05:39 -0000 3.4
+@@ -27,7 +27,8 @@ enum
+ TYPEMODEL,
+ TYPEMULTIPART,
+ TYPETEXT,
+- TYPEVIDEO
++ TYPEVIDEO,
++ TYPEANY
+ };
+
+ /* Content-Transfer-Encoding */
+Index: mutt/mutt.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/mutt.h,v
+retrieving revision 3.59
+retrieving revision 3.61
+diff -u -p -r3.59 -r3.61
+--- mutt/mutt.h 24 Sep 2005 19:45:23 -0000 3.59
++++ mutt/mutt.h 21 Oct 2005 04:35:37 -0000 3.61
+@@ -238,6 +238,7 @@ enum
+ M_CRYPT_ENCRYPT,
+ M_PGP_KEY,
+ M_XLABEL,
++ M_MIMEATTACH,
+
+ /* Options for Mailcap lookup */
+ M_EDIT,
+@@ -626,8 +627,8 @@ typedef struct body
+ * where we need to send the headers of the
+ * attachment
+ */
+- long offset; /* offset where the actual data begins */
+- LOFF_T length; /* length (in bytes) of attachment */
++ LOFF_T offset; /* offset where the actual data begins */
++ LOFF_T length; /* length (in bytes) of attachment */
+ char *filename; /* when sending a message, this is the file
+ * to which this structure refers
+ */
+@@ -646,7 +647,9 @@ typedef struct body
+ struct header *hdr; /* header information for message/rfc822 */
+
+ struct attachptr *aptr; /* Menu information, used in recvattach.c */
+-
++
++ signed short attach_count;
++
+ time_t stamp; /* time stamp of last
+ * encoding update.
+ */
+@@ -684,6 +687,7 @@ typedef struct body
+ unsigned int badsig : 1; /* bad cryptographic signature (needed to check encrypted s/mime-signatures) */
+
+ unsigned int collapsed : 1; /* used by recvattach */
++ unsigned int attach_qualifies : 1;
+
+ } BODY;
+
+@@ -722,6 +726,9 @@ typedef struct header
+ unsigned int searched : 1;
+ unsigned int matched : 1;
+
++ /* tells whether the attachment count is valid */
++ unsigned int attach_valid : 1;
++
+ /* the following are used to support collapsing threads */
+ unsigned int collapsed : 1; /* is this message part of a collapsed thread? */
+ unsigned int limited : 1; /* is this message in a limited view? */
+@@ -733,7 +740,7 @@ typedef struct header
+
+ time_t date_sent; /* time when the message was sent (UTC) */
+ time_t received; /* time when the message was placed in the mailbox */
+- long offset; /* where in the stream does this message begin? */
++ LOFF_T offset; /* where in the stream does this message begin? */
+ int lines; /* how many lines in the body of this message? */
+ int index; /* the absolute (unsorted) message number */
+ int msgno; /* number displayed to the user */
+@@ -746,6 +753,9 @@ typedef struct header
+ char *tree; /* character string to print thread tree */
+ struct thread *thread;
+
++ /* Number of qualifying attachments in message, if attach_valid */
++ short attach_total;
++
+ #ifdef MIXMASTER
+ LIST *chain;
+ #endif
+@@ -883,6 +893,19 @@ void state_attach_puts (const char *, ST
+ void state_prefix_putc (char, STATE *);
+ int state_printf(STATE *, const char *, ...);
+
++/* for attachment counter */
++typedef struct
++{
++ char *major;
++ int major_int;
++ char *minor;
++ regex_t minor_rx;
++} ATTACH_MATCH;
++
++/* Flags for mutt_count_body_parts() */
++#define M_PARTS_TOPLEVEL (1<<0) /* is the top-level part */
++#define M_PARTS_RECOUNT (1<<1) /* force recount */
++
+ #include "ascii.h"
+ #include "protos.h"
+ #include "lib.h"
+Index: mutt/mutt_curses.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/mutt_curses.h,v
+retrieving revision 3.8
+retrieving revision 3.9
+diff -u -p -r3.8 -r3.9
+--- mutt/mutt_curses.h 17 Sep 2005 20:46:10 -0000 3.8
++++ mutt/mutt_curses.h 9 Oct 2005 20:21:33 -0000 3.9
+@@ -38,16 +38,16 @@
+ #define M_ENTER_C '\r'
+ #define M_ENTER_S "\r"
+
+-#else
++#else /* USE_SLANG_CURSES */
+
+-#ifdef HAVE_NCURSESW_NCURSES_H
+-#include <ncursesw/ncurses.h>
+-#else
+-#ifdef HAVE_NCURSES_H
+-#include <ncurses.h>
++#if HAVE_NCURSESW_NCURSES_H
++# include <ncursesw/ncurses.h>
++#elif HAVE_NCURSES_NCURSES_H
++# include <ncurses/ncurses.h>
++#elif HAVE_NCURSES_H
++# include <ncurses.h>
+ #else
+-#include <curses.h>
+-#endif
++# include <curses.h>
+ #endif
+
+ #define M_ENTER_C '\n'
+Index: mutt/mutt_idna.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/mutt_idna.c,v
+retrieving revision 3.12
+retrieving revision 3.13
+diff -u -p -r3.12 -r3.13
+--- mutt/mutt_idna.c 17 Sep 2005 20:46:10 -0000 3.12
++++ mutt/mutt_idna.c 31 Oct 2005 10:51:54 -0000 3.13
+@@ -132,7 +132,7 @@ static int mbox_to_udomain (const char *
+ *domain = NULL;
+
+ p = strchr (mbx, '@');
+- if (!p)
++ if (!p || !p[1])
+ return -1;
+ *user = safe_calloc((p - mbx + 1), sizeof(mbx[0]));
+ strfcpy (*user, mbx, (p - mbx + 1));
+Index: mutt/pager.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pager.c,v
+retrieving revision 3.28
+retrieving revision 3.30
+diff -u -p -r3.28 -r3.30
+--- mutt/pager.c 17 Sep 2005 20:46:10 -0000 3.28
++++ mutt/pager.c 21 Oct 2005 04:35:37 -0000 3.30
+@@ -113,7 +113,7 @@ struct syntax_t
+
+ struct line_t
+ {
+- long offset;
++ LOFF_T offset;
+ short type;
+ short continuation;
+ short chunks;
+@@ -707,6 +707,9 @@ classify_quote (struct q_class_t **Quote
+ return class;
+ }
+
++static int brailleLine = -1;
++static int brailleCol = -1;
++
+ static int check_attachment_marker (char *);
+
+ static void
+@@ -720,9 +723,10 @@ resolve_types (char *buf, char *raw, str
+
+ if (n == 0 || ISHEADER (lineInfo[n-1].type))
+ {
+- if (buf[0] == '\n')
++ if (buf[0] == '\n') {
+ lineInfo[n].type = MT_COLOR_NORMAL;
+- else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t'))
++ getyx(stdscr, brailleLine, brailleCol);
++ } else if (n > 0 && (buf[0] == ' ' || buf[0] == '\t'))
+ {
+ lineInfo[n].type = lineInfo[n-1].type; /* wrapped line */
+ (lineInfo[n].syntax)[0].color = (lineInfo[n-1].syntax)[0].color;
+@@ -995,7 +999,7 @@ trim_incomplete_mbyte(unsigned char *buf
+ }
+
+ static int
+-fill_buffer (FILE *f, long *last_pos, long offset, unsigned char *buf,
++fill_buffer (FILE *f, LOFF_T *last_pos, LOFF_T offset, unsigned char *buf,
+ unsigned char *fmt, size_t blen, int *buf_ready)
+ {
+ unsigned char *p;
+@@ -1005,13 +1009,13 @@ fill_buffer (FILE *f, long *last_pos, lo
+ {
+ buf[blen - 1] = 0;
+ if (offset != *last_pos)
+- fseek (f, offset, 0);
++ fseeko (f, offset, 0);
+ if (fgets ((char *) buf, blen - 1, f) == NULL)
+ {
+ fmt[0] = 0;
+ return (-1);
+ }
+- *last_pos = ftell (f);
++ *last_pos = ftello (f);
+ b_read = (int) (*last_pos - offset);
+ *buf_ready = 1;
+
+@@ -1228,7 +1232,7 @@ static int format_line (struct line_t **
+ */
+
+ static int
+-display_line (FILE *f, long *last_pos, struct line_t **lineInfo, int n,
++display_line (FILE *f, LOFF_T *last_pos, struct line_t **lineInfo, int n,
+ int *last, int *max, int flags, struct q_class_t **QuoteList,
+ int *q_level, int *force_redraw, regex_t *SearchRE)
+ {
+@@ -1515,7 +1519,7 @@ mutt_pager (const char *banner, const ch
+ int r = -1;
+ int redraw = REDRAW_FULL;
+ FILE *fp = NULL;
+- long last_pos = 0, last_offset = 0;
++ LOFF_T last_pos = 0, last_offset = 0;
+ int old_smart_wrap, old_markers;
+ struct stat sb;
+ regex_t SearchRE;
+@@ -1786,7 +1790,12 @@ mutt_pager (const char *banner, const ch
+
+ redraw = 0;
+
+- move (statusoffset, COLS-1);
++ if (option(OPTBRAILLEFRIENDLY)) {
++ if (brailleLine!=-1) {
++ move(brailleLine+1, 0);
++ brailleLine = -1;
++ }
++ } else move (statusoffset, COLS-1);
+ mutt_refresh ();
+
+ if (IsHeader (extra) && OldHdr == extra->hdr && TopLine != topline
+Index: mutt/parse.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/parse.c,v
+retrieving revision 3.19
+retrieving revision 3.21
+diff -u -p -r3.19 -r3.21
+--- mutt/parse.c 24 Sep 2005 19:36:35 -0000 3.19
++++ mutt/parse.c 21 Oct 2005 04:35:37 -0000 3.21
+@@ -300,6 +300,10 @@ int mutt_check_mime_type (const char *s)
+ return TYPEVIDEO;
+ else if (ascii_strcasecmp ("model", s) == 0)
+ return TYPEMODEL;
++ else if (ascii_strcasecmp ("*", s) == 0)
++ return TYPEANY;
++ else if (ascii_strcasecmp (".*", s) == 0)
++ return TYPEANY;
+ else
+ return TYPEOTHER;
+ }
+@@ -427,7 +431,7 @@ BODY *mutt_read_mime_header (FILE *fp, i
+ char *line = safe_malloc (LONG_STRING);
+ size_t linelen = LONG_STRING;
+
+- p->hdr_offset = ftell(fp);
++ p->hdr_offset = ftello (fp);
+
+ p->encoding = ENC7BIT; /* default from RFC1521 */
+ p->type = digest ? TYPEMESSAGE : TYPETEXT;
+@@ -484,7 +488,7 @@ BODY *mutt_read_mime_header (FILE *fp, i
+ }
+ #endif
+ }
+- p->offset = ftell (fp); /* Mark the start of the real data */
++ p->offset = ftello (fp); /* Mark the start of the real data */
+ if (p->type == TYPETEXT && !p->subtype)
+ p->subtype = safe_strdup ("plain");
+ else if (p->type == TYPEMESSAGE && !p->subtype)
+@@ -509,7 +513,7 @@ void mutt_parse_part (FILE *fp, BODY *b)
+ #endif
+ bound = mutt_get_parameter ("boundary", b->parameter);
+
+- fseek (fp, b->offset, SEEK_SET);
++ fseeko (fp, b->offset, SEEK_SET);
+ b->parts = mutt_parse_multipart (fp, bound,
+ b->offset + b->length,
+ ascii_strcasecmp ("digest", b->subtype) == 0);
+@@ -518,7 +522,7 @@ void mutt_parse_part (FILE *fp, BODY *b)
+ case TYPEMESSAGE:
+ if (b->subtype)
+ {
+- fseek (fp, b->offset, SEEK_SET);
++ fseeko (fp, b->offset, SEEK_SET);
+ if (mutt_is_message_type(b->type, b->subtype))
+ b->parts = mutt_parse_messageRFC822 (fp, b);
+ else if (ascii_strcasecmp (b->subtype, "external-body") == 0)
+@@ -556,7 +560,7 @@ BODY *mutt_parse_messageRFC822 (FILE *fp
+ BODY *msg;
+
+ parent->hdr = mutt_new_header ();
+- parent->hdr->offset = ftell (fp);
++ parent->hdr->offset = ftello (fp);
+ parent->hdr->env = mutt_read_rfc822_header (fp, parent->hdr, 0, 0);
+ msg = parent->hdr->content;
+
+@@ -586,7 +590,7 @@ BODY *mutt_parse_messageRFC822 (FILE *fp
+ * digest 1 if reading a multipart/digest, 0 otherwise
+ */
+
+-BODY *mutt_parse_multipart (FILE *fp, const char *boundary, long end_off, int digest)
++BODY *mutt_parse_multipart (FILE *fp, const char *boundary, LOFF_T end_off, int digest)
+ {
+ #ifdef SUN_ATTACHMENT
+ int lines;
+@@ -604,7 +608,7 @@ BODY *mutt_parse_multipart (FILE *fp, co
+ }
+
+ blen = mutt_strlen (boundary);
+- while (ftell (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL)
++ while (ftello (fp) < end_off && fgets (buffer, LONG_STRING, fp) != NULL)
+ {
+ len = mutt_strlen (buffer);
+
+@@ -615,9 +619,9 @@ BODY *mutt_parse_multipart (FILE *fp, co
+ {
+ if (last)
+ {
+- last->length = ftell (fp) - last->offset - len - 1 - crlf;
++ last->length = ftello (fp) - last->offset - len - 1 - crlf;
+ if (last->parts && last->parts->length == 0)
+- last->parts->length = ftell (fp) - last->parts->offset - len - 1 - crlf;
++ last->parts->length = ftello (fp) - last->parts->offset - len - 1 - crlf;
+ /* if the body is empty, we can end up with a -1 length */
+ if (last->length < 0)
+ last->length = 0;
+@@ -641,7 +645,7 @@ BODY *mutt_parse_multipart (FILE *fp, co
+ if (mutt_get_parameter ("content-lines", new->parameter)) {
+ for (lines = atoi(mutt_get_parameter ("content-lines", new->parameter));
+ lines; lines-- )
+- if (ftell (fp) >= end_off || fgets (buffer, LONG_STRING, fp) == NULL)
++ if (ftello (fp) >= end_off || fgets (buffer, LONG_STRING, fp) == NULL)
+ break;
+ }
+ #endif
+@@ -924,22 +928,28 @@ static char *extract_message_id (const c
+ void mutt_parse_mime_message (CONTEXT *ctx, HEADER *cur)
+ {
+ MESSAGE *msg;
++ int flags = 0;
+
+- if (cur->content->type != TYPEMESSAGE && cur->content->type != TYPEMULTIPART)
+- return; /* nothing to do */
++ do {
++ if (cur->content->type != TYPEMESSAGE &&
++ cur->content->type != TYPEMULTIPART)
++ break; /* nothing to do */
+
+- if (cur->content->parts)
+- return; /* The message was parsed earlier. */
++ if (cur->content->parts)
++ break; /* The message was parsed earlier. */
+
+- if ((msg = mx_open_message (ctx, cur->msgno)))
+- {
+- mutt_parse_part (msg->fp, cur->content);
++ if ((msg = mx_open_message (ctx, cur->msgno)))
++ {
++ mutt_parse_part (msg->fp, cur->content);
+
+- if (WithCrypto)
+- cur->security = crypt_query (cur->content);
++ if (WithCrypto)
++ cur->security = crypt_query (cur->content);
+
+- mx_close_message (&msg);
+- }
++ mx_close_message (&msg);
++ }
++ } while (0);
++
++ mutt_count_body_parts(cur, flags|M_PARTS_RECOUNT);
+ }
+
+ int mutt_parse_rfc822_line (ENVELOPE *e, HEADER *hdr, char *line, char *p, short user_hdrs, short weed,
+@@ -1294,7 +1304,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE
+ LIST *last = NULL;
+ char *line = safe_malloc (LONG_STRING);
+ char *p;
+- long loc;
++ LOFF_T loc;
+ int matched;
+ size_t linelen = LONG_STRING;
+ char buf[LONG_STRING+1];
+@@ -1316,7 +1326,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE
+ }
+ }
+
+- while ((loc = ftell (f)),
++ while ((loc = ftello (f)),
+ *(line = mutt_read_rfc822_line (f, line, &linelen)) != 0)
+ {
+ matched = 0;
+@@ -1337,7 +1347,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE
+ continue;
+ }
+
+- fseek (f, loc, 0);
++ fseeko (f, loc, 0);
+ break; /* end of header */
+ }
+
+@@ -1399,7 +1409,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE
+ if (hdr)
+ {
+ hdr->content->hdr_offset = hdr->offset;
+- hdr->content->offset = ftell (f);
++ hdr->content->offset = ftello (f);
+
+ /* do RFC2047 decoding */
+ rfc2047_decode_adrlist (e->from);
+@@ -1457,3 +1467,148 @@ ADDRESS *mutt_parse_adrlist (ADDRESS *p,
+
+ return p;
+ }
++
++/* Compares mime types to the ok and except lists */
++int count_body_parts_check(LIST **checklist, BODY *b, int dflt)
++{
++ LIST *type;
++ ATTACH_MATCH *a;
++
++ /* If list is null, use default behavior. */
++ if (! *checklist)
++ {
++ /*return dflt;*/
++ return 0;
++ }
++
++ for (type = *checklist; type; type = type->next)
++ {
++ a = (ATTACH_MATCH *)type->data;
++ dprint(5, (debugfile, "cbpc: %s %d/%s ?? %s/%s [%d]... ",
++ dflt ? "[OK] " : "[EXCL] ",
++ b->type, b->subtype, a->major, a->minor, a->major_int));
++ if ((a->major_int == TYPEANY || a->major_int == b->type) &&
++ !regexec(&a->minor_rx, b->subtype, 0, NULL, 0))
++ {
++ dprint(5, (debugfile, "yes\n"));
++ return 1;
++ }
++ else
++ {
++ dprint(5, (debugfile, "no\n"));
++ }
++ }
++
++ return 0;
++}
++
++#define AT_COUNT(why) { shallcount = 1; }
++#define AT_NOCOUNT(why) { shallcount = 0; }
++
++int count_body_parts (BODY *body, int flags)
++{
++ int count = 0;
++ int shallcount, shallrecurse;
++ BODY *bp;
++
++ if (body == NULL)
++ return 0;
++
++ for (bp = body; bp != NULL; bp = bp->next)
++ {
++ /* Initial disposition is to count and not to recurse this part. */
++ AT_COUNT("default");
++ shallrecurse = 0;
++
++ dprint(5, (debugfile, "bp: desc=\"%s\"; fn=\"%s\", type=\"%d/%s\"\n",
++ bp->description ? bp->description : ("none"),
++ bp->filename ? bp->filename :
++ bp->d_filename ? bp->d_filename : "(none)",
++ bp->type, bp->subtype ? bp->subtype : "*"));
++
++ if (bp->type == TYPEMESSAGE)
++ {
++ shallrecurse = 1;
++
++ /* If it's an external body pointer, don't recurse it. */
++ if (!ascii_strcasecmp (bp->subtype, "external-body"))
++ shallrecurse = 0;
++
++ /* Don't count containers if they're top-level. */
++ if (flags & M_PARTS_TOPLEVEL)
++ AT_NOCOUNT("top-level message/*");
++ }
++ else if (bp->type == TYPEMULTIPART)
++ {
++ /* Always recurse multiparts, except multipart/alternative. */
++ shallrecurse = 1;
++ if (!mutt_strcasecmp(bp->subtype, "alternative"))
++ shallrecurse = 0;
++
++ /* Don't count containers if they're top-level. */
++ if (flags & M_PARTS_TOPLEVEL)
++ AT_NOCOUNT("top-level multipart");
++ }
++
++ if (bp->disposition == DISPINLINE &&
++ bp->type != TYPEMULTIPART && bp->type != TYPEMESSAGE && bp == body)
++ AT_NOCOUNT("ignore fundamental inlines");
++
++ /* If this body isn't scheduled for enumeration already, don't bother
++ * profiling it further.
++ */
++ if (shallcount)
++ {
++ /* Turn off shallcount if message type is not in ok list,
++ * or if it is in except list. Check is done separately for
++ * inlines vs. attachments.
++ */
++
++ if (bp->disposition == DISPATTACH)
++ {
++ if (!count_body_parts_check(&AttachAllow, bp, 1))
++ AT_NOCOUNT("attach not allowed");
++ if (count_body_parts_check(&AttachExclude, bp, 0))
++ AT_NOCOUNT("attach excluded");
++ }
++ else
++ {
++ if (!count_body_parts_check(&InlineAllow, bp, 1))
++ AT_NOCOUNT("inline not allowed");
++ if (count_body_parts_check(&InlineExclude, bp, 0))
++ AT_NOCOUNT("excluded");
++ }
++ }
++
++ if (shallcount)
++ count++;
++ bp->attach_qualifies = shallcount ? 1 : 0;
++
++ dprint(5, (debugfile, "cbp: %08x shallcount = %d\n", (unsigned int)bp, shallcount));
++
++ if (shallrecurse)
++ {
++ dprint(5, (debugfile, "cbp: %08x pre count = %d\n", (unsigned int)bp, count));
++ bp->attach_count = count_body_parts(bp->parts, flags & ~M_PARTS_TOPLEVEL);
++ count += bp->attach_count;
++ dprint(5, (debugfile, "cbp: %08x post count = %d\n", (unsigned int)bp, count));
++ }
++ }
++
++ dprint(5, (debugfile, "bp: return %d\n", count < 0 ? 0 : count));
++ return count < 0 ? 0 : count;
++}
++
++int mutt_count_body_parts (HEADER *hdr, int flags)
++{
++ if (hdr->attach_valid && !(flags & M_PARTS_RECOUNT))
++ return hdr->attach_total;
++
++ if (AttachAllow || AttachExclude || InlineAllow || InlineExclude)
++ hdr->attach_total = count_body_parts(hdr->content, flags | M_PARTS_TOPLEVEL);
++ else
++ hdr->attach_total = 0;
++
++ hdr->attach_valid = 1;
++ return hdr->attach_total;
++}
+Index: mutt/pattern.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pattern.c,v
+retrieving revision 3.24
+retrieving revision 3.26
+diff -u -p -r3.24 -r3.26
+--- mutt/pattern.c 21 Sep 2005 19:30:57 -0000 3.24
++++ mutt/pattern.c 21 Oct 2005 04:35:37 -0000 3.26
+@@ -91,6 +91,7 @@ Flags[] =
+ { 'v', M_COLLAPSED, 0, NULL },
+ { 'V', M_CRYPT_VERIFIED, 0, NULL },
+ { 'x', M_REFERENCE, 0, eat_regexp },
++ { 'X', M_MIMEATTACH, 0, eat_range },
+ { 'y', M_XLABEL, 0, eat_regexp },
+ { 'z', M_SIZE, 0, eat_range },
+ { '=', M_DUPLICATED, 0, NULL },
+@@ -189,7 +190,7 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ return (0);
+ }
+
+- fseek (msg->fp, h->offset, 0);
++ fseeko (msg->fp, h->offset, 0);
+ mutt_body_handler (h->content, &s);
+ }
+
+@@ -205,13 +206,13 @@ msg_search (CONTEXT *ctx, pattern_t* pat
+ fp = msg->fp;
+ if (pat->op != M_BODY)
+ {
+- fseek (fp, h->offset, 0);
++ fseeko (fp, h->offset, 0);
+ lng = h->content->offset - h->offset;
+ }
+ if (pat->op != M_HEADER)
+ {
+ if (pat->op == M_BODY)
+- fseek (fp, h->content->offset, 0);
++ fseeko (fp, h->content->offset, 0);
+ lng += h->content->length;
+ }
+ }
+@@ -1116,6 +1117,22 @@ mutt_pattern_exec (struct pattern_t *pat
+ return (pat->not ^ (h->env->spam && h->env->spam->data && patmatch (pat, h->env->spam->data) == 0));
+ case M_DUPLICATED:
+ return (pat->not ^ (h->thread && h->thread->duplicate_thread));
++ case M_MIMEATTACH:
++ {
++ int count;
++
++ if (h->content->parts)
++ count = mutt_count_body_parts(h, 0);
++ else
++ {
++ mutt_parse_mime_message(ctx, h);
++ count = mutt_count_body_parts(h, 0);
++ mutt_free_body(&h->content->parts);
++ }
++
++ return (pat->not ^ (count >= pat->min && (pat->max == M_MAXRANGE ||
++ count <= pat->max)));
++ }
+ case M_UNREFERENCED:
+ return (pat->not ^ (h->thread && !h->thread->child));
+ }
+Index: mutt/pgp.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pgp.c,v
+retrieving revision 3.58
+retrieving revision 3.60
+diff -u -p -r3.58 -r3.60
+--- mutt/pgp.c 21 Sep 2005 04:50:31 -0000 3.58
++++ mutt/pgp.c 21 Oct 2005 04:35:37 -0000 3.60
+@@ -247,7 +247,8 @@ int pgp_application_pgp_handler (BODY *m
+ int clearsign = 0, rv, rc;
+ int c = 1; /* silence GCC warning */
+ long start_pos = 0;
+- long bytes, last_pos, offset;
++ long bytes;
++ LOFF_T last_pos, offset;
+ char buf[HUGE_STRING];
+ char outfile[_POSIX_PATH_MAX];
+ char tmpfname[_POSIX_PATH_MAX];
+@@ -263,7 +264,7 @@ int pgp_application_pgp_handler (BODY *m
+
+ rc = 0; /* silence false compiler warning if (s->flags & M_DISPLAY) */
+
+- fseek (s->fpin, m->offset, 0);
++ fseeko (s->fpin, m->offset, 0);
+ last_pos = m->offset;
+
+ for (bytes = m->length; bytes > 0;)
+@@ -271,7 +272,7 @@ int pgp_application_pgp_handler (BODY *m
+ if (fgets (buf, sizeof (buf), s->fpin) == NULL)
+ break;
+
+- offset = ftell (s->fpin);
++ offset = ftello (s->fpin);
+ bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */
+ last_pos = offset;
+
+@@ -315,7 +316,7 @@ int pgp_application_pgp_handler (BODY *m
+ fputs (buf, tmpfp);
+ while (bytes > 0 && fgets (buf, sizeof (buf) - 1, s->fpin) != NULL)
+ {
+- offset = ftell (s->fpin);
++ offset = ftello (s->fpin);
+ bytes -= (offset - last_pos); /* don't rely on mutt_strlen(buf) */
+ last_pos = offset;
+
+@@ -330,8 +331,7 @@ int pgp_application_pgp_handler (BODY *m
+
+ /* leave tmpfp open in case we still need it - but flush it! */
+ fflush (tmpfp);
+-
+-
++
+ /* Invoke PGP if needed */
+ if (!clearsign || (s->flags & M_VERIFY))
+ {
+@@ -389,6 +389,7 @@ int pgp_application_pgp_handler (BODY *m
+ }
+
+ /* treat empty result as sign of failure */
++ /* TODO: maybe on failure mutt should include the original undecoded text. */
+ if (pgpout)
+ {
+ rewind (pgpout);
+@@ -400,9 +401,12 @@ int pgp_application_pgp_handler (BODY *m
+ mutt_error _("Could not decrypt PGP message");
+ mutt_sleep (1);
+ pgp_void_passphrase ();
+- rc = -1;
+-
+- goto out;
++
++ if (!(s->flags & M_DISPLAY))
++ {
++ rc = -1;
++ goto out;
++ }
+ }
+ }
+
+@@ -588,7 +592,7 @@ int pgp_verify_one (BODY *sigbdy, STATE
+ return -1;
+ }
+
+- fseek (s->fpin, sigbdy->offset, 0);
++ fseeko (s->fpin, sigbdy->offset, 0);
+ mutt_copy_bytes (s->fpin, fp, sigbdy->length);
+ fclose (fp);
+
+@@ -784,7 +788,7 @@ BODY *pgp_decrypt_part (BODY *a, STATE *
+ * the temporary file.
+ */
+
+- fseek (s->fpin, a->offset, 0);
++ fseeko (s->fpin, a->offset, 0);
+ mutt_copy_bytes (s->fpin, pgptmp, a->length);
+ fclose (pgptmp);
+
+Index: mutt/pgpmicalg.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pgpmicalg.c,v
+retrieving revision 3.4
+retrieving revision 3.5
+diff -u -p -r3.4 -r3.5
+--- mutt/pgpmicalg.c 17 Sep 2005 20:46:11 -0000 3.4
++++ mutt/pgpmicalg.c 21 Oct 2005 04:35:37 -0000 3.5
+@@ -68,8 +68,8 @@ static const char *pgp_hash_to_micalg (s
+ static void pgp_dearmor (FILE *in, FILE *out)
+ {
+ char line[HUGE_STRING];
+- long start;
+- long end;
++ LOFF_T start;
++ LOFF_T end;
+ char *r;
+
+ STATE state;
+@@ -105,7 +105,7 @@ static void pgp_dearmor (FILE *in, FILE
+ }
+
+ /* actual data starts here */
+- start = ftell (in);
++ start = ftello (in);
+
+ /* find the checksum */
+
+@@ -120,13 +120,13 @@ static void pgp_dearmor (FILE *in, FILE
+ return;
+ }
+
+- if ((end = ftell (in) - strlen (line)) < start)
++ if ((end = ftello (in) - strlen (line)) < start)
+ {
+ dprint (1, (debugfile, "pgp_dearmor: end < start???\n"));
+ return;
+ }
+
+- if (fseek (in, start, SEEK_SET) == -1)
++ if (fseeko (in, start, SEEK_SET) == -1)
+ {
+ dprint (1, (debugfile, "pgp_dearmor: Can't seekto start.\n"));
+ return;
+Index: mutt/pgppacket.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pgppacket.c,v
+retrieving revision 3.4
+retrieving revision 3.5
+diff -u -p -r3.4 -r3.5
+--- mutt/pgppacket.c 17 Sep 2005 20:46:11 -0000 3.4
++++ mutt/pgppacket.c 21 Oct 2005 04:35:37 -0000 3.5
+@@ -68,12 +68,12 @@ static int read_material (size_t materia
+ unsigned char *pgp_read_packet (FILE * fp, size_t * len)
+ {
+ size_t used = 0;
+- long startpos;
++ LOFF_T startpos;
+ unsigned char ctb;
+ unsigned char b;
+ size_t material;
+
+- startpos = ftell (fp);
++ startpos = ftello (fp);
+
+ if (!plen)
+ {
+@@ -216,7 +216,7 @@ unsigned char *pgp_read_packet (FILE * f
+
+ bail:
+
+- fseek (fp, startpos, SEEK_SET);
++ fseeko (fp, startpos, SEEK_SET);
+ return NULL;
+ }
+
+Index: mutt/pgppubring.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pgppubring.c,v
+retrieving revision 3.13
+retrieving revision 3.14
+diff -u -p -r3.13 -r3.14
+--- mutt/pgppubring.c 17 Sep 2005 20:46:11 -0000 3.13
++++ mutt/pgppubring.c 21 Oct 2005 04:35:37 -0000 3.14
+@@ -63,8 +63,8 @@ extern int optind;
+ #define FGETPOS(fp,pos) fgetpos((fp),&(pos))
+ #define FSETPOS(fp,pos) fsetpos((fp),&(pos))
+ #else
+-#define FGETPOS(fp,pos) pos=ftell((fp));
+-#define FSETPOS(fp,pos) fseek((fp),(pos),SEEK_SET)
++#define FGETPOS(fp,pos) pos=ftello((fp));
++#define FSETPOS(fp,pos) fseeko((fp),(pos),SEEK_SET)
+ #endif
+
+
+@@ -595,7 +595,7 @@ static pgp_key_t pgp_parse_keyblock (FIL
+ #ifdef HAVE_FGETPOS
+ fpos_t pos;
+ #else
+- long pos;
++ LOFF_T pos;
+ #endif
+
+ pgp_key_t root = NULL;
+@@ -752,7 +752,7 @@ static void pgpring_find_candidates (cha
+ #ifdef HAVE_FGETPOS
+ fpos_t pos, keypos;
+ #else
+- long pos, keypos;
++ LOFF_T pos, keypos;
+ #endif
+
+ unsigned char *buff = NULL;
+Index: mutt/pop.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/pop.c,v
+retrieving revision 3.8
+retrieving revision 3.9
+diff -u -p -r3.8 -r3.9
+--- mutt/pop.c 17 Sep 2005 20:46:11 -0000 3.8
++++ mutt/pop.c 21 Oct 2005 04:35:37 -0000 3.9
+@@ -439,7 +439,7 @@ int pop_fetch_message (MESSAGE* msg, CON
+ fgets (buf, sizeof (buf), msg->fp);
+ }
+
+- h->content->length = ftell (msg->fp) - h->content->offset;
++ h->content->length = ftello (msg->fp) - h->content->offset;
+
+ /* This needs to be done in case this is a multipart message */
+ if (!WithCrypto)
+Index: mutt/postpone.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/postpone.c,v
+retrieving revision 3.14
+retrieving revision 3.15
+diff -u -p -r3.14 -r3.15
+--- mutt/postpone.c 17 Sep 2005 20:46:11 -0000 3.14
++++ mutt/postpone.c 21 Oct 2005 04:35:37 -0000 3.15
+@@ -534,7 +534,7 @@ int mutt_prepare_template (FILE *fp, CON
+
+ /* parse the message header and MIME structure */
+
+- fseek (fp, hdr->offset, 0);
++ fseeko (fp, hdr->offset, 0);
+ newhdr->offset = hdr->offset;
+ newhdr->env = mutt_read_rfc822_header (fp, newhdr, 1, weed);
+ newhdr->content->length = hdr->content->length;
+Index: mutt/protos.h
+===================================================================
+RCS file: /home/roessler/cvs/mutt/protos.h,v
+retrieving revision 3.38
+retrieving revision 3.40
+diff -u -p -r3.38 -r3.40
+--- mutt/protos.h 17 Sep 2005 20:46:11 -0000 3.38
++++ mutt/protos.h 21 Oct 2005 04:35:37 -0000 3.40
+@@ -93,7 +93,7 @@ BODY *mutt_make_message_attach (CONTEXT
+ BODY *mutt_remove_multipart (BODY *);
+ BODY *mutt_make_multipart (BODY *);
+ BODY *mutt_new_body (void);
+-BODY *mutt_parse_multipart (FILE *, const char *, long, int);
++BODY *mutt_parse_multipart (FILE *, const char *, LOFF_T, int);
+ BODY *mutt_parse_messageRFC822 (FILE *, BODY *);
+ BODY *mutt_read_mime_header (FILE *, int);
+
+@@ -169,6 +169,7 @@ void mutt_break_thread (HEADER *);
+ void mutt_buffy (char *, size_t);
+ int mutt_buffy_list (void);
+ void mutt_canonical_charset (char *, size_t, const char *);
++int mutt_count_body_parts (HEADER *hdr, int flags);
+ void mutt_check_rescore (CONTEXT *);
+ void mutt_clear_error (void);
+ void mutt_create_alias (ENVELOPE *, ADDRESS *);
+Index: mutt/recvattach.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/recvattach.c,v
+retrieving revision 3.19
+retrieving revision 3.20
+diff -u -p -r3.19 -r3.20
+--- mutt/recvattach.c 17 Sep 2005 20:46:11 -0000 3.19
++++ mutt/recvattach.c 4 Oct 2005 06:05:39 -0000 3.20
+@@ -297,6 +297,14 @@ const char *mutt_attach_fmt (char *dest,
+ snprintf (dest, destlen, fmt, aptr->num + 1);
+ }
+ break;
++ case 'Q':
++ if (optional)
++ optional = aptr->content->attach_qualifies;
++ else {
++ snprintf (fmt, sizeof (fmt), "%%%sc", prefix);
++ mutt_format_s (dest, destlen, fmt, "Q");
++ }
++ break;
+ case 's':
+ if (flags & M_FORMAT_STAT_FILE)
+ {
+@@ -334,6 +342,15 @@ const char *mutt_attach_fmt (char *dest,
+ else if (!aptr->content->unlink)
+ optional = 0;
+ break;
++ case 'X':
++ if (optional)
++ optional = (aptr->content->attach_count + aptr->content->attach_qualifies) != 0;
++ else
++ {
++ snprintf (fmt, sizeof (fmt), "%%%sd", prefix);
++ snprintf (dest, destlen, fmt, aptr->content->attach_count + aptr->content->attach_qualifies);
++ }
++ break;
+ default:
+ *dest = 0;
+ }
+Index: mutt/send.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/send.c,v
+retrieving revision 3.43
+retrieving revision 3.44
+diff -u -p -r3.43 -r3.44
+--- mutt/send.c 22 Sep 2005 09:06:13 -0000 3.43
++++ mutt/send.c 3 Oct 2005 07:52:00 -0000 3.44
+@@ -1033,6 +1033,19 @@ static void decode_descriptions (BODY *b
+ }
+ }
+
++static void fix_end_of_file (const char *data)
++{
++ FILE *fp;
++ int c;
++
++ if ((fp = safe_fopen (data, "a+")) == NULL)
++ return;
++ fseek (fp,-1,SEEK_END);
++ if ((c = fgetc(fp)) != '\n')
++ fputc ('\n', fp);
++ safe_fclose (&fp);
++}
++
+ int mutt_resend_message (FILE *fp, CONTEXT *ctx, HEADER *cur)
+ {
+ HEADER *msg = mutt_new_header ();
+@@ -1393,7 +1406,16 @@ ci_send_message (int flags, /* send mod
+ mutt_env_to_idna (msg->env, NULL, NULL);
+ }
+ else
++ {
+ mutt_edit_file (Editor, msg->content->filename);
++ if (stat (msg->content->filename, &st) == 0)
++ {
++ if (mtime != st.st_mtime)
++ fix_end_of_file (msg->content->filename);
++ }
++ else
++ mutt_perror (msg->content->filename);
++ }
+
+ mutt_message_hook (NULL, msg, M_SEND2HOOK);
+ }
+Index: mutt/sendlib.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/sendlib.c,v
+retrieving revision 3.36
+retrieving revision 3.37
+diff -u -p -r3.36 -r3.37
+--- mutt/sendlib.c 29 Sep 2005 23:02:49 -0000 3.36
++++ mutt/sendlib.c 21 Oct 2005 04:35:37 -0000 3.37
+@@ -1049,7 +1049,7 @@ void mutt_message_to_7bit (BODY *a, FILE
+ goto cleanup;
+ }
+
+- fseek (fpin, a->offset, 0);
++ fseeko (fpin, a->offset, 0);
+ a->parts = mutt_parse_messageRFC822 (fpin, a);
+
+ transform_to_7bit (a->parts, fpin);
+@@ -2167,7 +2167,7 @@ static int _mutt_bounce_message (FILE *f
+ if (!option (OPTBOUNCEDELIVERED))
+ ch_flags |= CH_WEED_DELIVERED;
+
+- fseek (fp, h->offset, 0);
++ fseeko (fp, h->offset, 0);
+ fprintf (f, "Resent-From: %s", resent_from);
+ fprintf (f, "\nResent-%s", mutt_make_date (date, sizeof(date)));
+ fprintf (f, "Resent-Message-ID: %s\n", mutt_gen_msgid());
+@@ -2428,7 +2428,7 @@ int mutt_write_fcc (const char *path, HE
+ rewind (tempfp);
+ while (fgets (sasha, sizeof (sasha), tempfp) != NULL)
+ lines++;
+- fprintf (msg->fp, "Content-Length: " OFF_T_FMT "\n", (LOFF_T) ftell (tempfp));
++ fprintf (msg->fp, "Content-Length: " OFF_T_FMT "\n", ftello (tempfp));
+ fprintf (msg->fp, "Lines: %d\n\n", lines);
+
+ /* copy the body and clean up */
+Index: mutt/setenv.c
+===================================================================
+RCS file: mutt/setenv.c
+diff -N mutt/setenv.c
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ mutt/setenv.c 10 Oct 2005 17:17:24 -0000 3.2
+@@ -0,0 +1,47 @@
++/* $Id: setenv.c,v 3.2 2005/10/10 17:17:24 brendan Exp $
++**
++** Replacement for a missing setenv.
++**
++** Written by Russ Allbery <rra@stanford.edu>
++** This work is hereby placed in the public domain by its author.
++**
++** Provides the same functionality as the standard library routine setenv
++** for those platforms that don't have it.
++*/
++
++#include "config.h"
++
++#include <stdlib.h>
++#include <string.h>
++
++int
++setenv(const char *name, const char *value, int overwrite)
++{
++ char *envstring;
++
++ if (!overwrite && getenv(name) != NULL)
++ return 0;
++
++ /* Allocate memory for the environment string. We intentionally don't
++ use concat here, or the xmalloc family of allocation routines, since
++ the intention is to provide a replacement for the standard library
++ function which sets errno and returns in the event of a memory
++ allocation failure. */
++ envstring = malloc(strlen(name) + 1 + strlen(value) + 1); /* __MEM_CHECKED__ */
++ if (envstring == NULL)
++ return -1;
++
++ /* Build the environment string and add it to the environment using
++ putenv. Systems without putenv lose, but XPG4 requires it. */
++ strcpy(envstring, name); /* __STRCPY_CHECKED__ */
++ strcat(envstring, "="); /* __STRCAT_CHECKED__ */
++ strcat(envstring, value); /* __STRCAT_CHECKED__ */
++ return putenv(envstring);
++
++ /* Note that the memory allocated is not freed. This is intentional;
++ many implementations of putenv assume that the string passed to
++ putenv will never be freed and don't make a copy of it. Repeated use
++ of this function will therefore leak memory, since most
++ implementations of putenv also don't free strings removed from the
++ environment (due to being overwritten). */
++}
+Index: mutt/smime.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/smime.c,v
+retrieving revision 3.43
+retrieving revision 3.47
+diff -u -p -r3.43 -r3.47
+--- mutt/smime.c 17 Sep 2005 20:46:11 -0000 3.43
++++ mutt/smime.c 21 Oct 2005 04:35:38 -0000 3.47
+@@ -1577,7 +1577,7 @@ int smime_verify_one (BODY *sigbdy, STAT
+
+ mutt_decode_attachment (sigbdy, s);
+
+- sigbdy->length = ftell (s->fpout);
++ sigbdy->length = ftello (s->fpout);
+ sigbdy->offset = 0;
+ fclose (s->fpout);
+
+@@ -1702,7 +1702,7 @@ static BODY *smime_handle_entity (BODY *
+ return NULL;
+ }
+
+- fseek (s->fpin, m->offset, 0);
++ fseeko (s->fpin, m->offset, 0);
+ last_pos = m->offset;
+
+ mutt_copy_bytes (s->fpin, tmpfp, m->length);
+@@ -1880,7 +1880,7 @@ int smime_decrypt_mime (FILE *fpin, FILE
+
+ memset (&s, 0, sizeof (s));
+ s.fpin = fpin;
+- fseek (s.fpin, b->offset, 0);
++ fseeko (s.fpin, b->offset, 0);
+
+ mutt_mktemp (tempfile);
+ if ((tmpfp = safe_fopen (tempfile, "w+")) == NULL)
+@@ -1893,7 +1893,7 @@ int smime_decrypt_mime (FILE *fpin, FILE
+ s.fpout = tmpfp;
+ mutt_decode_attachment (b, &s);
+ fflush (tmpfp);
+- b->length = ftell (s.fpout);
++ b->length = ftello (s.fpout);
+ b->offset = 0;
+ rewind (tmpfp);
+ s.fpin = tmpfp;
+@@ -1950,27 +1950,71 @@ int smime_send_menu (HEADER *msg, int *r
+ break;
+
+ case 3: /* encrypt (w)ith */
+- msg->security |= ENCRYPT;
+- switch (mutt_multi_choice (_("1: DES, 2: Triple-DES, 3: RC2-40,"
+- " 4: RC2-64, 5: RC2-128, or (f)orget it? "),
+- _("12345f"))) {
+- case 1:
+- mutt_str_replace (&SmimeCryptAlg, "des");
+- break;
+- case 2:
+- mutt_str_replace (&SmimeCryptAlg, "des3");
+- break;
+- case 3:
+- mutt_str_replace (&SmimeCryptAlg, "rc2-40");
+- break;
+- case 4:
+- mutt_str_replace (&SmimeCryptAlg, "rc2-64");
+- break;
+- case 5:
+- mutt_str_replace (&SmimeCryptAlg, "rc2-128");
+- break;
+- case 6: /* forget it */
+- break;
++ {
++ int choice = 0;
++
++ msg->security |= ENCRYPT;
++ do
++ {
++ /* I use "dra" because "123" is recognized anyway */
++ switch (mutt_multi_choice (_("Choose algorithm family:"
++ " 1: DES, 2: RC2, 3: AES,"
++ " or (c)lear? "),
++ _("drac")))
++ {
++ case 1:
++ switch (choice = mutt_multi_choice (_("1: DES, 2: Triple-DES "),
++ _("dt")))
++ {
++ case 1:
++ mutt_str_replace (&SmimeCryptAlg, "des");
++ break;
++ case 2:
++ mutt_str_replace (&SmimeCryptAlg, "des3");
++ break;
++ }
++ break;
++
++ case 2:
++ switch (choice = mutt_multi_choice (_("1: RC2-40, 2: RC2-64, 3: RC2-128 "),
++ _("468")))
++ {
++ case 1:
++ mutt_str_replace (&SmimeCryptAlg, "rc2-40");
++ break;
++ case 2:
++ mutt_str_replace (&SmimeCryptAlg, "rc2-64");
++ break;
++ case 3:
++ mutt_str_replace (&SmimeCryptAlg, "rc2-128");
++ break;
++ }
++ break;
++
++ case 3:
++ switch (choice = mutt_multi_choice (_("1: AES128, 2: AES192, 3: AES256 "),
++ _("895")))
++ {
++ case 1:
++ mutt_str_replace (&SmimeCryptAlg, "aes128");
++ break;
++ case 2:
++ mutt_str_replace (&SmimeCryptAlg, "aes192");
++ break;
++ case 3:
++ mutt_str_replace (&SmimeCryptAlg, "aes256");
++ break;
++ }
++ break;
++
++ case 4: /* (c)lear */
++ FREE (&SmimeCryptAlg);
++ /* fallback */
++ case -1: /* Ctrl-G or Enter */
++ choice = 0;
++ break;
++ }
++ } while (choice == -1);
+ }
+ break;
+
+@@ -1989,7 +2033,6 @@ int smime_send_menu (HEADER *msg, int *r
+
+ if ((p = smime_ask_for_key (_("Sign as: "), NULL, 0)))
+ {
+- p[mutt_strlen (p)-1] = '\0';
+ mutt_str_replace (&SmimeDefaultKey, p);
+
+ msg->security |= SIGN;
+Index: mutt/doc/devel-notes.txt
+===================================================================
+RCS file: /home/roessler/cvs/mutt/doc/devel-notes.txt,v
+retrieving revision 3.1
+retrieving revision 3.2
+diff -u -p -r3.1 -r3.2
+--- mutt/doc/devel-notes.txt 22 Jun 2005 01:46:49 -0000 3.1
++++ mutt/doc/devel-notes.txt 30 Sep 2005 18:24:17 -0000 3.2
+@@ -108,7 +108,7 @@ Documentation
+ Please document your changes. Note that there are several places
+ where you may have to add documentation:
+
+-- doc/manual.sgml.{head,tail} contain The Manual.
++- doc/manual.xml.{head,tail} contain The Manual.
+
+ - doc/muttrc.man.{head,tail} contain an abriged version of The
+ Manual in nroff format (see man(7)), which deals with
+@@ -175,4 +175,4 @@ similar to [ntg]roff:
+
+ Do _not_ use any other SGML or nroff formatting instructions here!
+
+-$Id: devel-notes.txt,v 3.1 2005/06/22 01:46:49 brendan Exp $
++$Id: devel-notes.txt,v 3.2 2005/09/30 18:24:17 brendan Exp $
+Index: mutt/doc/manual.xml.head
+===================================================================
+RCS file: /home/roessler/cvs/mutt/doc/manual.xml.head,v
+retrieving revision 3.11
+retrieving revision 3.13
+diff -u -p -r3.11 -r3.13
+--- mutt/doc/manual.xml.head 19 Sep 2005 05:12:29 -0000 3.11
++++ mutt/doc/manual.xml.head 5 Oct 2005 19:24:40 -0000 3.13
+@@ -3307,6 +3307,7 @@ messages:
+ ~v message is part of a collapsed thread.
+ ~V cryptographically verified messages
+ ~x EXPR messages which contain EXPR in the `References' field
++~X [MIN]-[MAX] messages with MIN to MAX attachments *)
+ ~y EXPR messages which contain EXPR in the `X-Label' field
+ ~z [MIN]-[MAX] messages with a size in the range MIN to MAX *)
+ ~= duplicated messages (see $duplicate_threads)
+@@ -5146,6 +5147,120 @@ To remove a MIME type from the <literal>
+
+ </sect2>
+
++<sect2 id="attachments">
++<title>Attachment Searching and Counting</title>
++
++<para>
++If you ever lose track of attachments in your mailboxes, Mutt's
++attachment-counting and -searching support might be for you. You can
++make your message index display the number of qualifying attachments in
++each message, or search for messages by attachment count. You also can
++configure what kinds of attachments qualify for this feature with the
++attachments and unattachments commands.
++</para>
++
++<para>
++The syntax is:
++</para>
++<screen>
++attachments {+|-}disposition mime-type
++unattachments {+|-}disposition mime-type
++attachments ?
++</screen>
++
++<para>
++Disposition is the attachment's Content-disposition type -- either
++"inline" or "attachment". You can abbreviate this to I or A.
++</para>
++
++<para>
++Disposition is prefixed by either a + symbolor a - symbol. If it's
++a +, you're saying that you want to allow this disposition and MIME
++type to qualify. If it's a -, you're saying that this disposition
++and MIME type is an exception to previous + rules. There are examples
++below of how this is useful.
++</para>
++
++<para>
++Mime-type is, unsurprisingly, the MIME type of the attachment you want
++to affect. A MIME type is always of the format "major/minor", where
++"major" describes the broad category of document you're looking at, and
++"minor" describes the specific type within that category. The major
++part of mim-type must be literal text (or the special token "*"), but
++the minor part may be a regular expression. (Therefore, "*/.*" matches
++any MIME type.)
++</para>
++
++<para>
++The MIME types you give to the attachments directive are a kind of
++pattern. When you use the attachments directive, the patterns you
++specify are added to a list. When you use unattachments, the pattern
++is removed from the list. The patterns are not expanded and matched
++to specific MIME types at this time -- they're just text in a list.
++They're only matched when actually evaluating a message.
++</para>
++
++<para>
++Some examples might help to illustrate. The examples that are not
++commented out define the default configuration of the lists.
++</para>
++
++<screen>
++## Removing a pattern from a list removes that pattern literally. It
++## does not remove any type matching the pattern.
++##
++## attachments +A */.*
++## attachments +A image/jpeg
++## unattachments +A */.*
++##
++## This leaves "attached" image/jpeg files on the allowed attachments
++## list. It does not remove all items, as you might expect, because the
++## second */.* is not a matching expression at this time.
++##
++## Remember: "unattachments" only undoes what "attachments" has done!
++## It does not trigger any matching on actual messages.
++
++
++## Qualify any MIME part with an "attachment" disposition, EXCEPT for
++## text/x-vcard and application/pgp parts. (PGP parts are already known
++## to mutt, and can be searched for with ~g, ~G, and ~k.)
++##
++## I've added x-pkcs7 to this, since it functions (for S/MIME)
++## analogously to PGP signature attachments. S/MIME isn't supported
++## in a stock mutt build, but we can still treat it specially here.
++##
++attachments +A */.*
++attachments -A text/x-vcard application/pgp.*
++attachments -A application/x-pkcs7-.*
++
++## Discount all MIME parts with an "inline" disposition, unless they're
++## text/plain. (Why inline a text/plain part unless it's external to the
++## message flow?)
++##
++attachments +I text/plain
++
++## These two lines make Mutt qualify MIME containers. (So, for example,
++## a message/rfc822 forward will count as an attachment.) The first
++## line is unnecessary if you already have "attach-allow */.*", of
++## course. These are off by default! The MIME elements contained
++## within a message/* or multipart/* are still examined, even if the
++## containers themseves don't qualify.
++##
++#attachments +A message/.* multipart/.*
++#attachments +I message/.* multipart/.*
++
++## You probably don't really care to know about deleted attachments.
++attachments -A message/external-body
++attachments -I message/external-body
++</screen>
++
++<para>
++"attachments ?" will list your current settings in Muttrc format, so
++that it can be pasted elsewhere.
++</para>
++
++</sect2>
++
+ <sect2 id="mime-lookup">
+ <title>MIME Lookup</title>
+
+Index: mutt/doc/muttrc.man.head
+===================================================================
+RCS file: /home/roessler/cvs/mutt/doc/muttrc.man.head,v
+retrieving revision 3.18
+retrieving revision 3.19
+diff -u -p -r3.18 -r3.19
+--- mutt/doc/muttrc.man.head 17 Sep 2005 20:46:11 -0000 3.18
++++ mutt/doc/muttrc.man.head 4 Oct 2005 06:05:39 -0000 3.19
+@@ -437,6 +437,7 @@ l l.
+ ~v message is part of a collapsed thread.
+ ~V cryptographically verified messages
+ ~x \fIEXPR\fP messages which contain \fIEXPR\fP in the \(lqReferences\(rq field
++~X \fIMIN\fP-\fIMAX\fP messages with MIN - MAX attachments
+ ~y \fIEXPR\fP messages which contain \fIEXPR\fP in the \(lqX-Label\(rq field
+ ~z \fIMIN\fP-\fIMAX\fP messages with a size in the range \fIMIN\fP to \fIMAX\fP
+ ~= duplicated messages (see $duplicate_threads)
+@@ -445,7 +446,7 @@ l l.
+ .PP
+ In the above, \fIEXPR\fP is a regular expression.
+ .PP
+-With the \fB~m\fP, \fB~n\fP, and \fB~z\fP operators, you can also
++With the \fB~m\fP, \fB~n\fP, \fB~X\fP, and \fB~z\fP operators, you can also
+ specify ranges in the forms \fB<\fP\fIMAX\fP, \fB>\fP\fIMIN\fP,
+ \fIMIN\fP\fB-\fP, and \fB-\fP\fIMAX\fP.
+ .SS Matching dates
+Index: mutt/imap/command.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/imap/command.c,v
+retrieving revision 3.18
+retrieving revision 3.19
+diff -u -p -r3.18 -r3.19
+--- mutt/imap/command.c 17 Sep 2005 20:46:11 -0000 3.18
++++ mutt/imap/command.c 10 Oct 2005 17:17:24 -0000 3.19
+@@ -151,10 +151,8 @@ int imap_cmd_step (IMAP_DATA* idata)
+ return IMAP_CMD_BAD;
+
+ /* server demands a continuation response from us */
+- if (!ascii_strncmp (cmd->buf, "+ ", 2))
+- {
++ if (cmd->buf[0] == '+')
+ return IMAP_CMD_RESPOND;
+- }
+
+ /* tagged completion code */
+ if (!ascii_strncmp (cmd->buf, cmd->seq, SEQLEN))
+Index: mutt/imap/imap.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/imap/imap.c,v
+retrieving revision 3.44
+retrieving revision 3.45
+diff -u -p -r3.44 -r3.45
+--- mutt/imap/imap.c 22 Sep 2005 03:09:49 -0000 3.44
++++ mutt/imap/imap.c 14 Oct 2005 09:30:11 -0000 3.45
+@@ -1598,7 +1598,7 @@ imap_complete_hosts (char *dest, size_t
+ int matchlen;
+
+ matchlen = mutt_strlen (dest);
+- for (mailbox = Incoming; mailbox->next; mailbox = mailbox->next)
++ for (mailbox = Incoming; mailbox && mailbox->next; mailbox = mailbox->next)
+ {
+ if (!mutt_strncmp (dest, mailbox->path, matchlen))
+ {
+Index: mutt/imap/message.c
+===================================================================
+RCS file: /home/roessler/cvs/mutt/imap/message.c,v
+retrieving revision 3.29
+retrieving revision 3.30
+diff -u -p -r3.29 -r3.30
+--- mutt/imap/message.c 17 Sep 2005 20:46:11 -0000 3.29
++++ mutt/imap/message.c 31 Oct 2005 11:56:58 -0000 3.30
+@@ -16,7 +16,7 @@
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+- * $Id: message.c,v 3.29 2005/09/17 20:46:11 brendan Exp $
++ * $Id: message.c,v 3.30 2005/10/31 11:56:58 roessler Exp $
+ */
+
+ /* message parsing/updating functions */
+@@ -115,78 +115,80 @@ int imap_read_headers (IMAP_DATA* idata,
+ #if USE_HCACHE
+ hc = mutt_hcache_open (HeaderCache, ctx->path);
+
+- snprintf (buf, sizeof (buf),
+- "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
+- fetchlast = msgend + 1;
+-
+- imap_cmd_start (idata, buf);
+-
+- for (msgno = msgbegin; msgno <= msgend ; msgno++)
+- {
+- if (ReadInc && (!msgno || ((msgno+1) % ReadInc == 0)))
+- mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1,
+- msgend + 1);
+-
+- rewind (fp);
+- memset (&h, 0, sizeof (h));
+- h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
+- do
++ if (hc) {
++ snprintf (buf, sizeof (buf),
++ "FETCH %d:%d (UID FLAGS)", msgbegin + 1, msgend + 1);
++ fetchlast = msgend + 1;
++
++ imap_cmd_start (idata, buf);
++
++ for (msgno = msgbegin; msgno <= msgend ; msgno++)
+ {
+- mfhrc = 0;
+-
+- rc = imap_cmd_step (idata);
+- if (rc != IMAP_CMD_CONTINUE)
+- break;
+-
+- if ((mfhrc = msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1)
+- continue;
+- else if (mfhrc < 0)
+- break;
+-
+- /* make sure we don't get remnants from older larger message headers */
+- fputs ("\n\n", fp);
+-
+- sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
+- uid_validity = (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
+-
+- if (uid_validity != NULL && *uid_validity == idata->uid_validity)
++ if (ReadInc && (!msgno || ((msgno+1) % ReadInc == 0)))
++ mutt_message (_("Evaluating cache... [%d/%d]"), msgno + 1,
++ msgend + 1);
++
++ rewind (fp);
++ memset (&h, 0, sizeof (h));
++ h.data = safe_calloc (1, sizeof (IMAP_HEADER_DATA));
++ do
+ {
+- ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
+- ctx->hdrs[msgno]->index = h.sid - 1;
+- if (h.sid != ctx->msgcount + 1)
+- dprint (1, (debugfile, "imap_read_headers: msgcount and sequence ID are inconsistent!"));
+- /* messages which have not been expunged are ACTIVE (borrowed from mh
+- * folders) */
+- ctx->hdrs[msgno]->active = 1;
+- ctx->hdrs[msgno]->read = h.read;
+- ctx->hdrs[msgno]->old = h.old;
+- ctx->hdrs[msgno]->deleted = h.deleted;
+- ctx->hdrs[msgno]->flagged = h.flagged;
+- ctx->hdrs[msgno]->replied = h.replied;
+- ctx->hdrs[msgno]->changed = h.changed;
+- /* ctx->hdrs[msgno]->received is restored from mutt_hcache_restore */
+- ctx->hdrs[msgno]->data = (void *) (h.data);
+-
+- ctx->msgcount++;
++ mfhrc = 0;
++
++ rc = imap_cmd_step (idata);
++ if (rc != IMAP_CMD_CONTINUE)
++ break;
++
++ if ((mfhrc = msg_fetch_header_fetch (idata->ctx, &h, idata->cmd.buf, fp)) == -1)
++ continue;
++ else if (mfhrc < 0)
++ break;
++
++ /* make sure we don't get remnants from older larger message headers */
++ fputs ("\n\n", fp);
++
++ sprintf(uid_buf, "/%u", h.data->uid); /* XXX --tg 21:41 04-07-11 */
++ uid_validity = (unsigned long *) mutt_hcache_fetch (hc, uid_buf, &imap_hcache_keylen);
++
++ if (uid_validity != NULL && *uid_validity == idata->uid_validity)
++ {
++ ctx->hdrs[msgno] = mutt_hcache_restore((unsigned char *) uid_validity, 0);
++ ctx->hdrs[msgno]->index = h.sid - 1;
++ if (h.sid != ctx->msgcount + 1)
++ dprint (1, (debugfile, "imap_read_headers: msgcount and sequence ID are inconsistent!"));
++ /* messages which have not been expunged are ACTIVE (borrowed from mh
++ * folders) */
++ ctx->hdrs[msgno]->active = 1;
++ ctx->hdrs[msgno]->read = h.read;
++ ctx->hdrs[msgno]->old = h.old;
++ ctx->hdrs[msgno]->deleted = h.deleted;
++ ctx->hdrs[msgno]->flagged = h.flagged;
++ ctx->hdrs[msgno]->replied = h.replied;
++ ctx->hdrs[msgno]->changed = h.changed;
++ /* ctx->hdrs[msgno]->received is restored from mutt_hcache_restore */
++ ctx->hdrs[msgno]->data = (void *) (h.data);
++
++ ctx->msgcount++;
++ }
++ rewind (fp);
++
++ FREE(&uid_validity);
++
++ }
++ while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
++ ((msgno + 1) >= fetchlast)));
++
++ if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK)))
++ {
++ imap_free_header_data ((void**) &h.data);
++ fclose (fp);
++ mutt_hcache_close (hc);
++ return -1;
+ }
+- rewind (fp);
+-
+- FREE(&uid_validity);
+-
+- }
+- while ((rc != IMAP_CMD_OK) && ((mfhrc == -1) ||
+- ((msgno + 1) >= fetchlast)));
+-
+- if ((mfhrc < -1) || ((rc != IMAP_CMD_CONTINUE) && (rc != IMAP_CMD_OK)))
+- {
+- imap_free_header_data ((void**) &h.data);
+- fclose (fp);
+- mutt_hcache_close (hc);
+- return -1;
+ }
++
++ fetchlast = msgbegin;
+ }
+-
+- fetchlast = msgbegin;
+ #endif /* USE_HCACHE */
+
+ for (msgno = msgbegin; msgno <= msgend ; msgno++)
+Index: mutt/po/de.po
+===================================================================
+RCS file: /home/roessler/cvs/mutt/po/de.po,v
+retrieving revision 3.29
+retrieving revision 3.30
+diff -u -p -r3.29 -r3.30
+--- mutt/po/de.po 17 Sep 2005 20:46:12 -0000 3.29
++++ mutt/po/de.po 30 Sep 2005 01:42:50 -0000 3.30
+@@ -1,9 +1,9 @@
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: 1.5.10\n"
++"Project-Id-Version: 1.5.11\n"
+ "Report-Msgid-Bugs-To: \n"
+ "POT-Creation-Date: 2005-09-15 16:23+0200\n"
+-"PO-Revision-Date: 2005-08-14 13:26+0200\n"
++"PO-Revision-Date: 2005-09-27 12:20+0200\n"
+ "Last-Translator: Roland Rosenfeld <roland@spinnaker.de>\n"
+ "Language-Team: German <mutt-po@mutt.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -1361,9 +1361,8 @@ msgstr ""
+ "\"crypt_use_gpgme\" gesetzt, obwohl nicht mit GPGME Support compiliert."
+
+ #: cryptglue.c:112
+-#, fuzzy
+ msgid "Invoking S/MIME..."
+-msgstr "Rufe SMIME auf..."
++msgstr "Rufe S/MIME auf..."
+
+ #: curs_lib.c:188
+ msgid "yes"
+@@ -2069,7 +2068,7 @@ msgstr "CLOSE fehlgeschlagen"
+ #: imap/imap.c:1388
+ #, c-format
+ msgid "Header search without header name: %s"
+-msgstr ""
++msgstr "Suche im Nachrichtenkopf ohne Angabe des Feldes: %s"
+
+ #: imap/imap.c:1536
+ msgid "Bad mailbox name"
+@@ -2116,9 +2115,8 @@ msgstr ""
+ "Der Nachrichtenindex ist fehlerhaft. Versuche die Mailbox neu zu öffnen."
+
+ #: imap/message.c:548
+-#, fuzzy
+ msgid "Uploading message..."
+-msgstr "Lade Nachrichten auf den Server..."
++msgstr "Lade Nachricht auf den Server..."
+
+ #: imap/message.c:708
+ #, c-format
+@@ -3193,7 +3191,6 @@ msgstr ""
+ "02110-1301, USA.\n"
+
+ #: main.c:107
+-#, fuzzy
+ msgid ""
+ "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+ "<file> ]\n"
+@@ -3214,19 +3211,15 @@ msgid ""
+ " -c <address>\tspecify a carbon-copy (CC) address\n"
+ " -D\t\tprint the value of all variables to stdout"
+ msgstr ""
+-"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"
++"Aufruf: 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"
+ "\n"
+-"options:\n"
++"Optionen:\n"
+ " -A <alias>\tExpandiere den angegebenen Alias\n"
+ " -a <file>\tHängt Datei an die Message an\n"
+ " -b <address>\tEmpfänger einer unsichtbaren Kopie (Bcc:)\n"
+Index: mutt/po/eu.po
+===================================================================
+RCS file: mutt/po/eu.po
+diff -N mutt/po/eu.po
+--- /dev/null 1 Jan 1970 00:00:00 -0000
++++ mutt/po/eu.po 29 Sep 2005 23:52:16 -0000 1.1
+@@ -0,0 +1,4690 @@
++# translation of eu-berria2.po to librezale.org
++# translation of eu.po to librezale.org
++# translation of eu.po to Euskara
++# translation of es.po to Euskara
++# Spanish translation of mutt
++# Copyright (C) 1999-2001 Boris Wesslowski <Boris@Wesslowski.com>
++# Piarres Beobide Egaña <pi@beobide.net>, 2004, 2005.
++msgid ""
++msgstr ""
++"Project-Id-Version: eu-berria2\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2005-09-26 16:44+0200\n"
++"PO-Revision-Date: 2005-09-27 23:03+0200\n"
++"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
++"Language-Team: librezale.org <librezale@librezale.org>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=ISO-8859-1\n"
++"Content-Transfer-Encoding: 8bit\n"
++"X-Generator: KBabel 1.10.2\n"
++
++#: account.c:154
++#, c-format
++msgid "Username at %s: "
++msgstr " %s -n erabiltzaile izena: "
++
++#: account.c:209
++#, c-format
++msgid "Password for %s@%s: "
++msgstr "%s@%s-ren pasahitza: "
++
++#: addrbook.c:37 browser.c:45 pager.c:1483 postpone.c:43 query.c:48
++#: recvattach.c:54
++msgid "Exit"
++msgstr "Irten"
++
++#: addrbook.c:38 curs_main.c:407 pager.c:1490 postpone.c:44
++msgid "Del"
++msgstr "Ezab"
++
++#: addrbook.c:39 curs_main.c:408 postpone.c:45
++msgid "Undel"
++msgstr "Desezabatu"
++
++#: addrbook.c:40
++msgid "Select"
++msgstr "Hautatu"
++
++#. __STRCAT_CHECKED__
++#: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:413
++#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1582 pgpkey.c:521
++#: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
++msgid "Help"
++msgstr "Laguntza"
++
++#: addrbook.c:145
++msgid "You have no aliases!"
++msgstr "Ez duzu aliasik!"
++
++#: addrbook.c:156
++msgid "Aliases"
++msgstr "Aliasak"
++
++#. add a new alias
++#: alias.c:246
++msgid "Alias as: "
++msgstr "Aliasa sortu: "
++
++#: alias.c:252
++msgid "You already have an alias defined with that name!"
++msgstr "Izen honekin baduzu ezarritako alias bat!"
++
++#: alias.c:258
++msgid "Warning: This alias name may not work. Fix it?"
++msgstr "Kontuz: Alias izen honek ez du funtzionatuko. Kompondu?"
++
++#: alias.c:283
++msgid "Address: "
++msgstr "Helbidea:"
++
++#: alias.c:293 send.c:206
++#, c-format
++msgid "Error: '%s' is a bad IDN."
++msgstr "Errorea: '%s' IDN okerra da."
++
++#: alias.c:305
++msgid "Personal name: "
++msgstr "Pertsona izena: "
++
++#: alias.c:314
++#, c-format
++msgid "[%s = %s] Accept?"
++msgstr "[%s = %s] Onartu?"
++
++#: alias.c:331 recvattach.c:394 recvattach.c:417 recvattach.c:430
++#: recvattach.c:443 recvattach.c:471
++msgid "Save to file: "
++msgstr "Gorde fitxategian:"
++
++#: alias.c:346
++msgid "Alias added."
++msgstr "Aliasa gehiturik."
++
++#: attach.c:113 attach.c:245 attach.c:477 attach.c:968
++msgid "Can't match nametemplate, continue?"
++msgstr "Ezin da txantilloi izena aurkitu, jarraitu?"
++
++#. For now, editing requires a file, no piping
++#: attach.c:126
++#, c-format
++msgid "Mailcap compose entry requires %%s"
++msgstr "Mailacap konposaketa sarrerak hau behar du %%s"
++
++#: attach.c:134 attach.c:266 commands.c:221 compose.c:1183 curs_lib.c:179
++#: curs_lib.c:458
++#, c-format
++msgid "Error running \"%s\"!"
++msgstr "Errorea \"%s\" abiarazten!"
++
++#: attach.c:144
++msgid "Failure to open file to parse headers."
++msgstr "Huts buruak analizatzeko fitxategia irekitzerakoan."
++
++#: attach.c:175
++msgid "Failure to open file to strip headers."
++msgstr "Huts buruak kentzeko fitxategia irekitzerakoan."
++
++#: attach.c:184
++msgid "Failure to rename file."
++msgstr "Huts fitxategia berrizedatzerakoan."
++
++#: 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. "
++
++#. For now, editing requires a file, no piping
++#: attach.c:258
++#, c-format
++msgid "Mailcap Edit entry requires %%s"
++msgstr ""
++
++#: attach.c:280
++#, c-format
++msgid "No mailcap edit entry for %s"
++msgstr ""
++
++#: attach.c:443
++msgid "No matching mailcap entry found. Viewing as text."
++msgstr "Ez da pareko mailcap sarrerarik aurkitu. Testu bezaka bistarazten."
++
++#: attach.c:456
++msgid "MIME type not defined. Cannot view attachment."
++msgstr "MIME moeta ezarri gabe. Ezin da gehigarria erakutsi."
++
++#: attach.c:546
++msgid "Cannot create filter"
++msgstr "Ezin da iragazkia sortu"
++
++#: attach.c:676 attach.c:708 attach.c:1001 attach.c:1059 handler.c:1576
++#: pgpkey.c:570 pgpkey.c:759
++msgid "Can't create filter"
++msgstr "Ezin da iragazkia sortu"
++
++#: attach.c:840
++msgid "Write fault!"
++msgstr "Idaztean huts!"
++
++#: attach.c:1082
++msgid "I don't know how to print that!"
++msgstr "Ez dakit non imprimatu hau!"
++
++#: browser.c:46
++msgid "Chdir"
++msgstr "Karpetara joan: "
++
++#: browser.c:47
++msgid "Mask"
++msgstr "Maskara"
++
++#: browser.c:382 browser.c:990
++#, c-format
++msgid "%s is not a directory."
++msgstr "%s ez da karpeta bat."
++
++#: browser.c:502
++#, c-format
++msgid "Mailboxes [%d]"
++msgstr "Postakutxak [%d]"
++
++#: browser.c:509
++#, c-format
++msgid "Subscribed [%s], File mask: %s"
++msgstr "Harpidedun [%s], Fitxategi maskara: %s"
++
++#: browser.c:513
++#, c-format
++msgid "Directory [%s], File mask: %s"
++msgstr "Karpeta [%s], Fitxategi maskara: %s"
++
++#: browser.c:525
++msgid "Can't attach a directory!"
++msgstr "Ezin da karpeta bat gehitu!"
++
++#: browser.c:656 browser.c:1057 browser.c:1154
++msgid "No files match the file mask"
++msgstr "Ez da fitxategi maskara araberako fitxategirik aurkitu"
++
++#: browser.c:861
++msgid "Create is only supported for IMAP mailboxes"
++msgstr "\"Create\" IMAP posta kutxek bakarrik onartzen dute"
++
++#: browser.c:881
++msgid "Rename is only supported for IMAP mailboxes"
++msgstr "Berrizendaketa IMAP postakutxentzat bakarrik onartzen da"
++
++#: browser.c:902
++msgid "Delete is only supported for IMAP mailboxes"
++msgstr "\"Delete\" IMAP posta kutxek bakarrik onartzen dute"
++
++#: browser.c:910
++#, c-format
++msgid "Really delete mailbox \"%s\"?"
++msgstr "Benetean \"%s\" postakutxa ezabatu?"
++
++#: browser.c:924
++msgid "Mailbox deleted."
++msgstr "Postakutxa ezabatua."
++
++#: browser.c:930
++msgid "Mailbox not deleted."
++msgstr "Postakutxa ez da ezabatu."
++
++#: browser.c:949
++msgid "Chdir to: "
++msgstr "Karpetara joan: "
++
++#: browser.c:978 browser.c:1050
++msgid "Error scanning directory."
++msgstr "Errorea karpeta arakatzerakoan."
++
++#: browser.c:1001
++msgid "File Mask: "
++msgstr "Fitxategi maskara:"
++
++#: browser.c:1073
++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?"
++
++#: browser.c:1074
++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?"
++
++#: browser.c:1075
++msgid "dazn"
++msgstr "fats"
++
++#: browser.c:1141
++msgid "New file name: "
++msgstr "Fitxategi izen berria: "
++
++#: browser.c:1172
++msgid "Can't view a directory"
++msgstr "Ezin da karpeta ikusi"
++
++#: browser.c:1189
++msgid "Error trying to view file"
++msgstr "Errorea fitxategia ikusten saiatzerakoan"
++
++#: buffy.c:446
++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 onatrzen."
++
++#: color.c:332
++#, c-format
++msgid "%s: no such color"
++msgstr "%s:ez da kolorea aurkitu"
++
++#: color.c:378 color.c:579 color.c:590
++#, c-format
++msgid "%s: no such object"
++msgstr "%s:ez da objetua aurkitu"
++
++#: color.c:385
++#, c-format
++msgid "%s: command valid only for index object"
++msgstr "%s:komandoa sarrera objetutan bakarrik erabili daiteke"
++
++#: color.c:393
++#, c-format
++msgid "%s: too few arguments"
++msgstr "%s: argumento gutxiegi"
++
++#: color.c:567
++msgid "Missing arguments."
++msgstr "Ez dira argumentoak aurkitzen."
++
++#: color.c:606 color.c:617
++msgid "color: too few arguments"
++msgstr "kolorea:argumento gutxiegi"
++
++#: color.c:640
++msgid "mono: too few arguments"
++msgstr "mono: argumento gutxiegi"
++
++#: color.c:660
++#, c-format
++msgid "%s: no such attribute"
++msgstr "%s: Ez da atributua aurkitu"
++
++#: color.c:700 hook.c:69 hook.c:77 keymap.c:751
++msgid "too few arguments"
++msgstr "argumento gutxiegi"
++
++#: color.c:709 hook.c:83
++msgid "too many arguments"
++msgstr "argumento gehiegi"
++
++#: color.c:725
++msgid "default colors not supported"
++msgstr "lehenetsitako kolorea ez da onartzen"
++
++#. find out whether or not the verify signature
++#: commands.c:92
++msgid "Verify PGP signature?"
++msgstr "PGP sinadura egiaztatu?"
++
++#: commands.c:117 mbox.c:736
++msgid "Could not create temporary file!"
++msgstr "Ezin da fitxategi temporala sortu!"
++
++#: commands.c:130
++msgid "Cannot create display filter"
++msgstr "Ezin da bistaratze iragazkia sortu"
++
++#: commands.c:150
++msgid "Could not copy message"
++msgstr "Ezin da mezurik kopiatu"
++
++#: commands.c:187
++msgid "S/MIME signature successfully verified."
++msgstr "S/MIME sinadura arrakastatsuki egiaztaturik."
++
++#: commands.c:189
++msgid "S/MIME certificate owner does not match sender."
++msgstr "S/MIME zihurtagiriaren jabea ez da mezua bidali duena"
++
++#: commands.c:192 commands.c:203
++msgid "Warning: Part of this message has not been signed."
++msgstr "Abisua -.Mezu honen zati bat ezin izan da sinatu."
++
++#: commands.c:194
++msgid "S/MIME signature could NOT be verified."
++msgstr "S/MIME sinadura EZIN da egiaztatu."
++
++#: commands.c:201
++msgid "PGP signature successfully verified."
++msgstr "PGP sinadura arrakastatsuki egiaztaturik.."
++
++#: commands.c:205
++msgid "PGP signature could NOT be verified."
++msgstr "PGP sinadura EZIN da egiaztatu."
++
++#: commands.c:228
++msgid "Command: "
++msgstr "Komandoa: "
++
++#: commands.c:247 recvcmd.c:147
++msgid "Bounce message to: "
++msgstr "Mezuak hona errebotatu: "
++
++#: commands.c:249 recvcmd.c:149
++msgid "Bounce tagged messages to: "
++msgstr "Markatutako mezuak hona errebotatu: "
++
++#: commands.c:264 recvcmd.c:158
++msgid "Error parsing address!"
++msgstr "Errorea helbidea analizatzean!"
++
++#: commands.c:272 recvcmd.c:166
++#, c-format
++msgid "Bad IDN: '%s'"
++msgstr "IDN Okerra: '%s'"
++
++#: commands.c:283 recvcmd.c:180
++#, c-format
++msgid "Bounce message to %s"
++msgstr "Mezua %s-ra errebotatu"
++
++#: commands.c:283 recvcmd.c:180
++#, c-format
++msgid "Bounce messages to %s"
++msgstr "Mezuak %s-ra errebotatu"
++
++#: commands.c:299 recvcmd.c:196
++msgid "Message not bounced."
++msgstr "Mezua ez da errebotatu."
++
++#: commands.c:299 recvcmd.c:196
++msgid "Messages not bounced."
++msgstr "Mezuak ez dira errebotatu."
++
++#: commands.c:309 recvcmd.c:215
++msgid "Message bounced."
++msgstr "Mezua errebotaturik."
++
++#: commands.c:309 recvcmd.c:215
++msgid "Messages bounced."
++msgstr "Mezuak errebotaturik."
++
++#: commands.c:386 commands.c:420 commands.c:437
++msgid "Can't create filter process"
++msgstr "Ezin da iragazki prozesua sortu"
++
++#: commands.c:466
++msgid "Pipe to command: "
++msgstr "komandora hodia egin:"
++
++#: commands.c:483
++msgid "No printing command has been defined."
++msgstr "Ez da imprimatze komandorik ezarri."
++
++#: commands.c:488
++msgid "Print message?"
++msgstr "Mezua inprimatu?"
++
++#: commands.c:488
++msgid "Print tagged messages?"
++msgstr "Markatutako mezuak inprimatu?"
++
++#: commands.c:497
++msgid "Message printed"
++msgstr "Mezua inprimaturik"
++
++#: commands.c:497
++msgid "Messages printed"
++msgstr "Mezuak inprimaturik"
++
++#: commands.c:499
++msgid "Message could not be printed"
++msgstr "Ezin da mezua inprimatu"
++
++#: commands.c:500
++msgid "Messages could not be printed"
++msgstr "Ezin dira mezuak inprimatu"
++
++#: commands.c:509
++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?:"
++
++#: commands.c:510
++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?:"
++
++#: commands.c:511
++msgid "dfrsotuzcp"
++msgstr "djsgnhetpz"
++
++#: commands.c:568
++msgid "Shell command: "
++msgstr "Shell komandoa: "
++
++#: commands.c:716
++#, c-format
++msgid "Decode-save%s to mailbox"
++msgstr "deskodifikatu-gorde%s postakutxan"
++
++#: commands.c:717
++#, c-format
++msgid "Decode-copy%s to mailbox"
++msgstr "deskodifikatu-kopiatu%s postakutxan"
++
++#: commands.c:718
++#, c-format
++msgid "Decrypt-save%s to mailbox"
++msgstr "Desenkriptatu-gorde%s postakutxan"
++
++#: commands.c:719
++#, c-format
++msgid "Decrypt-copy%s to mailbox"
++msgstr "Desenkriptatu-kopiatu%s postakutxan"
++
++#: commands.c:720
++#, c-format
++msgid "Save%s to mailbox"
++msgstr "%s postakutxan gorde"
++
++#: commands.c:720
++#, c-format
++msgid "Copy%s to mailbox"
++msgstr "%s postakutxan kopiatu"
++
++#: commands.c:721
++msgid " tagged"
++msgstr " markatua"
++
++#: commands.c:794
++#, c-format
++msgid "Copying to %s..."
++msgstr "Hona kopiatzen %s..."
++
++#: commands.c:926
++#, c-format
++msgid "Convert to %s upon sending?"
++msgstr "Bidali aurretik %s-ra bihurtu?"
++
++#: commands.c:936
++#, c-format
++msgid "Content-Type changed to %s."
++msgstr "Eduki moeta %s-ra aldatzen."
++
++#: commands.c:941
++#, c-format
++msgid "Character set changed to %s; %s."
++msgstr "Karaktere ezarpena %s-ra aldaturik: %s."
++
++#: commands.c:943
++msgid "not converting"
++msgstr "Ez da bihurtzen"
++
++#: commands.c:943
++msgid "converting"
++msgstr "Bihurtzen"
++
++#: compose.c:47
++msgid "There are no attachments."
++msgstr "Ez dago gehigarririk."
++
++#: compose.c:89
++msgid "Send"
++msgstr "Bidali"
++
++#: compose.c:90 remailer.c:487
++msgid "Abort"
++msgstr "Ezeztatu"
++
++#: compose.c:94 compose.c:668
++msgid "Attach file"
++msgstr "Fitxategia gehitu"
++
++#: compose.c:95
++msgid "Descrip"
++msgstr "Deskrib"
++
++#: compose.c:132
++msgid "Sign, Encrypt"
++msgstr "Sinatu, Enkriptatu"
++
++#: compose.c:134
++msgid "Encrypt"
++msgstr "Enkriptatu"
++
++#: compose.c:136
++msgid "Sign"
++msgstr "Sinatu"
++
++#: compose.c:138
++msgid "Clear"
++msgstr "Garbitu"
++
++#: compose.c:145
++msgid " (inline)"
++msgstr " (barruan)"
++
++#: compose.c:147
++msgid " (PGP/MIME)"
++msgstr " (PGP/MIME)"
++
++#: compose.c:155 compose.c:159
++msgid " sign as: "
++msgstr " horrela sinatu: "
++
++#: compose.c:155 compose.c:159
++msgid "<default>"
++msgstr "<lehenetsia>"
++
++#: compose.c:167
++msgid "Encrypt with: "
++msgstr "honekin enkriptatu: "
++
++#: compose.c:221
++#, c-format
++msgid "%s [#%d] no longer exists!"
++msgstr "%s [#%d] ez da gehiago esistitzen!"
++
++#: compose.c:229
++#, c-format
++msgid "%s [#%d] modified. Update encoding?"
++msgstr "%s [#%d] aldaturik. kodeatzea eguneratu?"
++
++#: compose.c:272
++msgid "-- Attachments"
++msgstr "-- Gehigarriak"
++
++#: compose.c:302
++#, c-format
++msgid "Warning: '%s' is a bad IDN."
++msgstr "Kontuz: '%s' IDN okerra da."
++
++#: compose.c:325
++msgid "You may not delete the only attachment."
++msgstr "Ezin duzu gehigarri bakarra ezabatu."
++
++#: compose.c:601 send.c:1499
++#, c-format
++msgid "Bad IDN in \"%s\": '%s'"
++msgstr "IDN okerra \"%s\"-n: '%s'"
++
++#: compose.c:684
++msgid "Attaching selected files..."
++msgstr "Aukeratutako fitxategia gehitzen..."
++
++#: compose.c:696
++#, c-format
++msgid "Unable to attach %s!"
++msgstr "Ezin da %s gehitu!"
++
++#: compose.c:715
++msgid "Open mailbox to attach message from"
++msgstr "Bertatik mezu bat gehitzeko postakutxa ireki"
++
++#: compose.c:753
++msgid "No messages in that folder."
++msgstr "Ez dago mezurik karpeta honetan."
++
++#: compose.c:762
++msgid "Tag the messages you want to attach!"
++msgstr "Gehitu nahi dituzun mezuak markatu!"
++
++#: compose.c:794
++msgid "Unable to attach!"
++msgstr "Ezin da gehitu!"
++
++#: compose.c:845
++msgid "Recoding only affects text attachments."
++msgstr "Gordetzeak mezu gehigarriaei bakarrik eragiten die."
++
++#: compose.c:850
++msgid "The current attachment won't be converted."
++msgstr "Gehigarri hau ezin da bihurtu."
++
++#: compose.c:852
++msgid "The current attachment will be converted."
++msgstr "Gehigarri hau bihurtua izango da."
++
++#: compose.c:927
++msgid "Invalid encoding."
++msgstr "Baliogabeko kodifikazioa"
++
++#: compose.c:953
++msgid "Save a copy of this message?"
++msgstr "Mezu honen kopia gorde?"
++
++#: compose.c:1009
++msgid "Rename to: "
++msgstr "honetara izenaldatu: "
++
++#: compose.c:1014 editmsg.c:116 sendlib.c:856
++#, c-format
++msgid "Can't stat %s: %s"
++msgstr "Ezin egiaztatu %s egoera: %s"
++
++#: compose.c:1041
++msgid "New file: "
++msgstr "Fitxategi berria: "
++
++#: compose.c:1054
++msgid "Content-Type is of the form base/sub"
++msgstr ""
++
++#: compose.c:1060
++#, c-format
++msgid "Unknown Content-Type %s"
++msgstr "%s eduki mota ezezaguna"
++
++#: compose.c:1073
++#, c-format
++msgid "Can't create file %s"
++msgstr "%s fitxategia ezin da sortu"
++
++#: compose.c:1081
++msgid "What we have here is a failure to make an attachment"
++msgstr "Hemen duguna giehigarria sortzerakoan huts bat da."
++
++#: compose.c:1142
++msgid "Postpone this message?"
++msgstr "Mezu hau atzeratu?"
++
++#: compose.c:1201
++msgid "Write message to mailbox"
++msgstr "Mezuak postakutxan gorde"
++
++#: compose.c:1204
++#, c-format
++msgid "Writing message to %s ..."
++msgstr "mezuak %s-n gordetzen..."
++
++#: compose.c:1213
++msgid "Message written."
++msgstr "Mezua idazten."
++
++#: compose.c:1225
++msgid "S/MIME already selected. Clear & continue ? "
++msgstr "S/MIME dagoeneko aukeraturik. Garbitu era jarraitu ? "
++
++#: compose.c:1251
++msgid "PGP already selected. Clear & continue ? "
++msgstr "PGP dagoeneko aukeraturik. Garbitu eta jarraitu ? "
++
++#: crypt-gpgme.c:335
++#, c-format
++msgid "error creating gpgme context: %s\n"
++msgstr "errorea gpgme ingurunea sortzean: %s\n"
++
++#: crypt-gpgme.c:345
++#, c-format
++msgid "error enabling CMS protocol: %s\n"
++msgstr "errorea CMS protokoloa gaitzerakoan: %s\n"
++
++#: crypt-gpgme.c:365
++#, c-format
++msgid "error creating gpgme data object: %s\n"
++msgstr "errorea gpgme datu objetua sortzerakoan: %s\n"
++
++#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327
++#, c-format
++msgid "error allocating data object: %s\n"
++msgstr "errorea datu objetua esleitzerakoan: %s\n"
++
++#: crypt-gpgme.c:467
++#, c-format
++msgid "error rewinding data object: %s\n"
++msgstr "errorea datu objetua atzera eraman: %s\n"
++
++#: crypt-gpgme.c:489 crypt-gpgme.c:536
++#, c-format
++msgid "error reading data object: %s\n"
++msgstr "errorea datu objetua irakurtzerakoan: %s\n"
++
++#: crypt-gpgme.c:597
++#, c-format
++msgid "error adding recipient `%s': %s\n"
++msgstr "errorea `%s' hartzailea geitzerakoan: %s\n"
++
++#: crypt-gpgme.c:635
++#, c-format
++msgid "secret key `%s' not found: %s\n"
++msgstr "ez da `%s' gako sekretua aurkitu: %s\n"
++
++#: crypt-gpgme.c:645
++#, c-format
++msgid "ambiguous specification of secret key `%s'\n"
++msgstr "`%s' gako sekretu espezifikazio anbiguoa\n"
++
++#: crypt-gpgme.c:657
++#, c-format
++msgid "error setting secret key `%s': %s\n"
++msgstr "errorea`%s' gako sekretua ezartzerakoan: %s\n"
++
++#: crypt-gpgme.c:701
++#, c-format
++msgid "error encrypting data: %s\n"
++msgstr "errorea datuak enkriptatzerakoan: %s\n"
++
++#: crypt-gpgme.c:798
++#, c-format
++msgid "error signing data: %s\n"
++msgstr "errorea datuak sinatzerakoan: %s\n"
++
++#: crypt-gpgme.c:993
++msgid "Warning: One of the keys has been revoked\n"
++msgstr "Abisua: Gakoetako bat errebokatua izan da\n"
++
++#: crypt-gpgme.c:1002
++msgid "Warning: The key used to create the signature expired at: "
++msgstr "Abisua: sinadura sortzeko erabilitako gakoa iraungitze data: "
++
++#: crypt-gpgme.c:1008
++msgid "Warning: At least one certification key has expired\n"
++msgstr "Abisua: Ziurtagiri bat beintzat iraungi egin da\n"
++
++#: crypt-gpgme.c:1024
++msgid "Warning: The signature expired at: "
++msgstr "Abisua: Sinadura iraungitze data: "
++
++#: crypt-gpgme.c:1030
++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:1035
++msgid "The CRL is not available\n"
++msgstr "CRL ez da erabilgarri\n"
++
++#: crypt-gpgme.c:1041
++msgid "Available CRL is too old\n"
++msgstr "CRL erabilgarria zaharregia da\n"
++
++#: crypt-gpgme.c:1046
++msgid "A policy requirement was not met\n"
++msgstr "Politika behar bat ez da aurkitu\n"
++
++#: crypt-gpgme.c:1055
++msgid "A system error occurred"
++msgstr "Sistema errore bat gertatu da"
++
++#: crypt-gpgme.c:1092 crypt-gpgme.c:3036
++msgid "Fingerprint: "
++msgstr "Hatz-marka: "
++
++#: crypt-gpgme.c:1152
++msgid ""
++"WARNING: We have NO indication whether the key belongs to the person named "
++"as shown above\n"
++msgstr ""
++
++#: crypt-gpgme.c:1159
++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:1163
++msgid ""
++"WARNING: It is NOT certain that the key belongs to the person named as shown "
++"above\n"
++msgstr "ABISUA: Ez da egia gakoa aurrerantzean behean agertzen den pertsonarena dela\n"
++
++#: crypt-gpgme.c:1238
++msgid "Error getting key information: "
++msgstr "Errorea gako argibideak eskuratzen: "
++
++#. We can't decide (yellow) but this is a PGP key with a good
++#. 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:1245 crypt-gpgme.c:1278
++msgid "Good signature from: "
++msgstr "Hemendik ondo sinaturik: "
++
++#: crypt-gpgme.c:1255
++msgid " aka: "
++msgstr " aliasa: "
++
++#: crypt-gpgme.c:1259 crypt-gpgme.c:1281
++msgid " created: "
++msgstr " sortua: "
++
++#: crypt-gpgme.c:1268
++msgid "*BAD* signature claimed to be from: "
++msgstr "*OKERREKO* sinadurak hemendgoa dela dio: "
++
++#: crypt-gpgme.c:1291
++msgid "Error checking signature"
++msgstr "Errorea sinadura egiaztatzerakoan"
++
++#. 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:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031
++msgid "[-- Begin signature information --]\n"
++msgstr "[-- Sinadura argibide hasiera --]\n"
++
++#: crypt-gpgme.c:1344
++#, c-format
++msgid "Error: verification failed: %s\n"
++msgstr "Errorea: huts egiaztatzerakoan: %s\n"
++
++#: crypt-gpgme.c:1386
++#, c-format
++msgid "*** Begin Notation (signature by: %s) ***\n"
++msgstr ""
++
++#: crypt-gpgme.c:1405
++msgid "*** End Notation ***\n"
++msgstr "*** Amaiera Idazkera ***\n"
++
++#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046
++msgid ""
++"[-- End signature information --]\n"
++"\n"
++msgstr ""
++"[-- Sinadura Argibide Amaiera --] \n"
++"\n"
++
++#: crypt-gpgme.c:1507
++#, c-format
++msgid ""
++"[-- Error: decryption failed: %s --]\n"
++"\n"
++msgstr ""
++"[-- Errorea: Desenkriptatzerakoan huts: %s --]\n"
++"\n"
++
++#: crypt-gpgme.c:2006
++#, c-format
++msgid "Error: decryption/verification failed: %s\n"
++msgstr "Errorea: desenkriptazio/egiaztapenak huts egin du: %s\n"
++
++#: crypt-gpgme.c:2054
++msgid "Error: copy data failed\n"
++msgstr "Errorea: Huts datuak kopiatzerakoan\n"
++
++#: crypt-gpgme.c:2074 pgp.c:418
++msgid ""
++"[-- BEGIN PGP MESSAGE --]\n"
++"\n"
++msgstr ""
++"[-- PGP MEZU HASIERA --]\n"
++"\n"
++
++#: crypt-gpgme.c:2076 pgp.c:420
++msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
++msgstr "[-- PGP PUBLIKO GAKO BLOKE HASIERA --]\n"
++
++#: crypt-gpgme.c:2079 pgp.c:422
++msgid ""
++"[-- BEGIN PGP SIGNED MESSAGE --]\n"
++"\n"
++msgstr ""
++"[-- PGP SINATUTAKO MEZUAREN HASIERA --]\n"
++"\n"
++
++#: crypt-gpgme.c:2106 pgp.c:448
++msgid "[-- END PGP MESSAGE --]\n"
++msgstr "[-- PGP MEZU BUKAERA--]\n"
++
++#: crypt-gpgme.c:2108 pgp.c:452
++msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
++msgstr "[-- PGP PUBLIko GAKO BLOKE AMAIERA --]\n"
++
++#: crypt-gpgme.c:2110 pgp.c:454
++msgid "[-- END PGP SIGNED MESSAGE --]\n"
++msgstr "[-- PGP SINATUTAKO MEZU BUKAERA --]\n"
++
++#: crypt-gpgme.c:2131 pgp.c:484
++msgid ""
++"[-- Error: could not find beginning of PGP message! --]\n"
++"\n"
++msgstr ""
++"[-- Errorea: ezin da PGP mezuaren hasiera aurkitu! --]\n"
++"\n"
++
++#: crypt-gpgme.c:2162 pgp.c:913
++msgid ""
++"[-- Error: malformed PGP/MIME message! --]\n"
++"\n"
++msgstr ""
++"[-- Error: gaizki eratutako PGP/MIME mezua! --]\n"
++"\n"
++
++#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:926
++msgid "[-- Error: could not create temporary file! --]\n"
++msgstr "[-- Errorea:Ezind a fitxategi tenporala sortu! --]\n"
++
++#: crypt-gpgme.c:2186
++msgid ""
++"[-- The following data is PGP/MIME signed and encrypted --]\n"
++"\n"
++msgstr ""
++"[-- Hurrengo datuak PGP/MIME bidez sinatu eta enkriptaturik daude --]\n"
++"\n"
++
++#: crypt-gpgme.c:2187 pgp.c:935
++msgid ""
++"[-- The following data is PGP/MIME encrypted --]\n"
++"\n"
++msgstr ""
++"[-- Hurrengo datuak PGP/MIME bidez enkriptaturik daude --]\n"
++"\n"
++
++#: crypt-gpgme.c:2209
++msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
++msgstr "[-- PGP/MIME bidez sinatu eta enkriptaturiko datuen amaiera --]\n"
++
++#: crypt-gpgme.c:2210 pgp.c:955
++msgid "[-- End of PGP/MIME encrypted data --]\n"
++msgstr "[-- PGP/MIME bidez enkriptaturiko datuen amaiera --]\n"
++
++#: crypt-gpgme.c:2252
++msgid ""
++"[-- The following data is S/MIME signed --]\n"
++"\n"
++msgstr ""
++"[-- hurrengo datuak S/MIME bidez sinaturik daude --]\n"
++"\n"
++
++#: crypt-gpgme.c:2253
++msgid ""
++"[-- The following data is S/MIME encrypted --]\n"
++"\n"
++msgstr ""
++"[-- hurrengo datuak S/MIME bidez enkriptaturik daude --]\n"
++"\n"
++
++#: crypt-gpgme.c:2283
++msgid "[-- End of S/MIME signed data --]\n"
++msgstr "[-- S/MIME bidez sinaturiko datuen amaiera --]\n"
++
++#: crypt-gpgme.c:2284
++msgid "[-- End of S/MIME encrypted data --]\n"
++msgstr "[-- S/MIME bidez enkriptaturiko datuen amaiera --]\n"
++
++#: crypt-gpgme.c:2876
++msgid "[Can't display this user ID (unknown encoding)]"
++msgstr "[Ezin da erabiltzaile ID hau bistarazu (kodeketa ezezaguna)]"
++
++#: crypt-gpgme.c:2878
++msgid "[Can't display this user ID (invalid encoding)]"
++msgstr "[Ezin da erabiltzaile ID hau bistarazu (kodeketa baliogabea)]"
++
++#: crypt-gpgme.c:2883
++msgid "[Can't display this user ID (invalid DN)]"
++msgstr "[Ezin da erabiltzaile ID hau bistarazu (DN bliogabea)]"
++
++#: crypt-gpgme.c:2962
++msgid " aka ......: "
++msgstr ""
++
++#: crypt-gpgme.c:2962
++msgid "Name ......: "
++msgstr "Izena ......: "
++
++#: crypt-gpgme.c:2965 crypt-gpgme.c:3104
++msgid "[Invalid]"
++msgstr "[Baliogabea]"
++
++#: crypt-gpgme.c:2985 crypt-gpgme.c:3128
++#, c-format
++msgid "Valid From : %s\n"
++msgstr "Baliozkoa Nork: %s\n"
++
++#: crypt-gpgme.c:2998 crypt-gpgme.c:3141
++#, c-format
++msgid "Valid To ..: %s\n"
++msgstr "Baliozkoa Nori: %s\n"
++
++#: crypt-gpgme.c:3011 crypt-gpgme.c:3154
++#, c-format
++msgid "Key Type ..: %s, %lu bit %s\n"
++msgstr "Gako Mota ..: %s, %lu bit %s\n"
++
++#: crypt-gpgme.c:3013 crypt-gpgme.c:3156
++#, c-format
++msgid "Key Usage .: "
++msgstr "Tekla Erabilera .: "
++
++#: crypt-gpgme.c:3018 crypt-gpgme.c:3161
++msgid "encryption"
++msgstr "enkriptazioa"
++
++#: crypt-gpgme.c:3019 crypt-gpgme.c:3024 crypt-gpgme.c:3029 crypt-gpgme.c:3162
++#: crypt-gpgme.c:3167 crypt-gpgme.c:3172
++msgid ", "
++msgstr ", "
++
++#: crypt-gpgme.c:3023 crypt-gpgme.c:3166
++msgid "signing"
++msgstr "sinatzen"
++
++#: crypt-gpgme.c:3028 crypt-gpgme.c:3171
++msgid "certification"
++msgstr "ziurtapena"
++
++#: crypt-gpgme.c:3068
++#, c-format
++msgid "Serial-No .: 0x%s\n"
++msgstr "Serial-Zb .: 0x%s\n"
++
++#: crypt-gpgme.c:3076
++#, c-format
++msgid "Issued By .: "
++msgstr "Emana : "
++
++#. display only the short keyID
++#: crypt-gpgme.c:3095
++#, c-format
++msgid "Subkey ....: 0x%s"
++msgstr "Azpigakoa ....: 0x%s"
++
++#: crypt-gpgme.c:3099
++msgid "[Revoked]"
++msgstr "[Indargabetua]"
++
++#: crypt-gpgme.c:3109
++msgid "[Expired]"
++msgstr "[Iraungia]"
++
++#: crypt-gpgme.c:3114
++msgid "[Disabled]"
++msgstr "[Desgaitua]"
++
++#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739
++msgid "Can't create temporary file"
++msgstr "Ezin da aldiroko fitxategia sortu"
++
++#: crypt-gpgme.c:3201
++msgid "Collecting data..."
++msgstr "Datuak batzen..."
++
++#: crypt-gpgme.c:3227
++#, c-format
++msgid "Error finding issuer key: %s\n"
++msgstr ""
++
++#: crypt-gpgme.c:3237
++msgid "Error: certification chain to long - stopping here\n"
++msgstr ""
++
++#: crypt-gpgme.c:3248 pgpkey.c:580
++#, c-format
++msgid "Key ID: 0x%s"
++msgstr "Gako ID: 0x%s"
++
++#: crypt-gpgme.c:3331
++#, c-format
++msgid "gpgme_new failed: %s"
++msgstr "gpgme_new hutsa: %s"
++
++#: crypt-gpgme.c:3370 crypt-gpgme.c:3433
++#, c-format
++msgid "gpgme_op_keylist_start failed: %s"
++msgstr "gpgme_op_keylist_start hutsa: %s"
++
++#: crypt-gpgme.c:3420 crypt-gpgme.c:3461
++#, c-format
++msgid "gpgme_op_keylist_next failed: %s"
++msgstr "gpgme_op_keylist_next hutsa: %s"
++
++#: crypt-gpgme.c:3532
++msgid "All matching keys are marked expired/revoked."
++msgstr ""
++
++#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514
++#: smime.c:431
++msgid "Exit "
++msgstr "Irten "
++
++#. __STRCAT_CHECKED__
++#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433
++msgid "Select "
++msgstr "Aukeratu "
++
++#. __STRCAT_CHECKED__
++#: crypt-gpgme.c:3566 pgpkey.c:519
++msgid "Check key "
++msgstr "Gakoa egiaztatu "
++
++#: crypt-gpgme.c:3583
++msgid "PGP and S/MIME keys matching"
++msgstr "PGP eta S/MIME gako parekatzea"
++
++#: crypt-gpgme.c:3585
++msgid "PGP keys matching"
++msgstr "PGP gako parekatzea"
++
++#: crypt-gpgme.c:3587
++msgid "S/MIME keys matching"
++msgstr "S/MIME gako parekatzea"
++
++#: crypt-gpgme.c:3589
++msgid "keys matching"
++msgstr "gako parekatzea"
++
++#: crypt-gpgme.c:3592
++#, c-format
++msgid "%s <%s>."
++msgstr "%s <%s>."
++
++#: crypt-gpgme.c:3594
++#, c-format
++msgid "%s \"%s\"."
++msgstr "%s \"%s\"."
++
++#: crypt-gpgme.c:3621 pgpkey.c:600
++msgid "This key can't be used: expired/disabled/revoked."
++msgstr "Gako hau ezin da erabili: denboraz knapo/ezgaitua/Errebokatuta"
++
++#: crypt-gpgme.c:3635 pgpkey.c:612
++msgid "ID is expired/disabled/revoked."
++msgstr "ID-a denboraz kanpo/ezgaitua/ukatua dago."
++
++#: crypt-gpgme.c:3655 pgpkey.c:616
++msgid "ID has undefined validity."
++msgstr "ID-ak mugagabeko balioa du."
++
++#: crypt-gpgme.c:3658 pgpkey.c:619
++msgid "ID is not valid."
++msgstr "ID-a ez da baliozkoa"
++
++#: crypt-gpgme.c:3661 pgpkey.c:622
++msgid "ID is only marginally valid."
++msgstr "ID bakarrik marginalki erabilgarria da."
++
++#: crypt-gpgme.c:3669 pgpkey.c:626
++#, c-format
++msgid "%s Do you really want to use the key?"
++msgstr "%sZihur zaude gakoa erabili nahi duzula?"
++
++#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
++#, c-format
++msgid "Looking for keys matching \"%s\"..."
++msgstr "\"%s\" duten gakoen bila..."
++
++#: crypt-gpgme.c:4002 pgp.c:1162
++#, c-format
++msgid "Use keyID = \"%s\" for %s?"
++msgstr "ID-gakoa=\"%s\" %s-rako erabili?"
++
++#: crypt-gpgme.c:4038 pgp.c:1196 smime.c:665 smime.c:790
++#, c-format
++msgid "Enter keyID for %s: "
++msgstr "%s-rako ID-gakoa sartu: "
++
++#: crypt-gpgme.c:4103
++msgid ""
++"\n"
++"Using GPGME backend, although no gpg-agent is running"
++msgstr ""
++
++#: crypt-gpgme.c:4131
++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:4132
++msgid "esabpfc"
++msgstr "esabpfg"
++
++#: crypt-gpgme.c:4135
++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:4136
++msgid "esabmfc"
++msgstr "esabmfg"
++
++#. sign (a)s
++#. unset_option(OPTCRYPTCHECKTRUST);
++#. sign (a)s
++#: crypt-gpgme.c:4152 pgp.c:1571 smime.c:1990
++msgid "Sign as: "
++msgstr "Honela sinatu: "
++
++#: crypt-gpgme.c:4249
++msgid "Failed to verify sender"
++msgstr "Huts bidaltzailea egiaztatzerakoan"
++
++#: crypt-gpgme.c:4252
++msgid "Failed to figure out sender"
++msgstr ""
++
++#: crypt.c:69
++#, c-format
++msgid " (current time: %c)"
++msgstr " (uneko ordua:%c)"
++
++#: crypt.c:75
++#, c-format
++msgid "[-- %s output follows%s --]\n"
++msgstr "[-- %s irteera jarraian%s --]\n"
++
++#: crypt.c:90
++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:563
++msgid "Invoking PGP..."
++msgstr "PGP deitzen..."
++
++#. otherwise inline won't work...ask for revert
++#: crypt.c:156
++msgid "Message can't be sent inline. Revert to using PGP/MIME?"
++msgstr ""
++
++#. abort
++#: crypt.c:158 send.c:1451
++msgid "Mail not sent."
++msgstr "ePosta ez da bidali."
++
++#: crypt.c:397
++msgid "S/MIME messages with no hints on content are unsupported."
++msgstr ""
++
++#: crypt.c:616 crypt.c:660
++msgid "Trying to extract PGP keys...\n"
++msgstr "PGP-gakoak ateratzen saiatzen...\n"
++
++#: crypt.c:640 crypt.c:680
++msgid "Trying to extract S/MIME certificates...\n"
++msgstr "S/MIME zertifikatua ateratzen saiatzen...\n"
++
++#: crypt.c:802
++msgid ""
++"[-- Error: Inconsistent multipart/signed structure! --]\n"
++"\n"
++msgstr ""
++"[-- Errorea: konsistentzi gabeko zatianitz/sinaturiko estruktura! --]\n"
++"\n"
++
++#: crypt.c:823
++#, c-format
++msgid ""
++"[-- Error: Unknown multipart/signed protocol %s! --]\n"
++"\n"
++msgstr ""
++"[-- Errorea: zatianitz/sinatutako protokolo ezezaguna %s! --]\n"
++"\n"
++
++#: crypt.c:862
++#, c-format
++msgid ""
++"[-- Warning: We can't verify %s/%s signatures. --]\n"
++"\n"
++msgstr ""
++"[-- Kontuz: Ezin dira %s/%s sinadurak egiaztatu. --]\n"
++"\n"
++
++#. Now display the signed body
++#: crypt.c:874
++msgid ""
++"[-- The following data is signed --]\n"
++"\n"
++msgstr ""
++"[-- Hurrengo datuak sinaturik daude --]\n"
++"\n"
++
++#: crypt.c:880
++msgid ""
++"[-- Warning: Can't find any signatures. --]\n"
++"\n"
++msgstr ""
++"[-- Kontuz: Ez da sinadurarik aurkitu. --]\n"
++"\n"
++
++#: crypt.c:886
++msgid ""
++"\n"
++"[-- End of signed data --]\n"
++msgstr ""
++"\n"
++"[-- Sinatutako datuen amaiera --]\n"
++
++#: cryptglue.c:89
++msgid "\"crypt_use_gpgme\" set but not build with GPGME support."
++msgstr "\"crypt_use_gpgme\" ezarria bina ez dago GPGME onarpenaz konpilatua."
++
++#: cryptglue.c:112
++msgid "Invoking S/MIME..."
++msgstr "S/MIME deitzen..."
++
++#: curs_lib.c:188
++msgid "yes"
++msgstr "Bai"
++
++#: curs_lib.c:189
++msgid "no"
++msgstr "Ez"
++
++#. restore blocking operation
++#: curs_lib.c:285
++msgid "Exit Mutt?"
++msgstr "Mutt utzi?"
++
++#: curs_lib.c:410 mutt_socket.c:530 mutt_ssl.c:328
++msgid "unknown error"
++msgstr "Errore ezezaguna"
++
++#: curs_lib.c:430
++msgid "Press any key to continue..."
++msgstr "Edozein tekla jo jarraitzeko..."
++
++#: curs_lib.c:474
++msgid " ('?' for list): "
++msgstr " (? zerrendarako): "
++
++#: curs_main.c:52 curs_main.c:624 curs_main.c:654
++msgid "No mailbox is open."
++msgstr "Ez da postakutxarik irekirik."
++
++#: curs_main.c:53
++msgid "There are no messages."
++msgstr "Ez daude mezurik."
++
++#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44
++msgid "Mailbox is read-only."
++msgstr "Irakutzeko bakarrik Posta kutxa."
++
++#: curs_main.c:55 pager.c:59 recvattach.c:873
++msgid "Function not permitted in attach-message mode."
++msgstr "Mezu-gehitze moduan baimenik gabeko funtzioa."
++
++#: curs_main.c:56
++msgid "No visible messages."
++msgstr "Ez dago ikus daitekeen mezurik."
++
++#: curs_main.c:256
++msgid "Cannot toggle write on a readonly mailbox!"
++msgstr "Ezin da idatzitarikoa aldatu idaztezina den postakutxa batetan!"
++
++#: curs_main.c:263
++msgid "Changes to folder will be written on folder exit."
++msgstr "postakutxaren aldaketa bertatik irtetean gordeak izango dira."
++
++#: curs_main.c:268
++msgid "Changes to folder will not be written."
++msgstr "Karpetako aldaketak ezin dira gorde."
++
++#: curs_main.c:406
++msgid "Quit"
++msgstr "Irten"
++
++#: curs_main.c:409 recvattach.c:55
++msgid "Save"
++msgstr "Gorde"
++
++#: curs_main.c:410 query.c:49
++msgid "Mail"
++msgstr "Posta"
++
++#: curs_main.c:411 pager.c:1491
++msgid "Reply"
++msgstr "Erantzun"
++
++#: curs_main.c:412
++msgid "Group"
++msgstr "Taldea"
++
++#: curs_main.c:501
++msgid "Mailbox was externally modified. Flags may be wrong."
++msgstr "postakutxa kanpoaldetik aldaturik. Banderak gaizki egon liteke."
++
++#: curs_main.c:504
++msgid "New mail in this mailbox."
++msgstr "ePosta berria postakutxa honetan."
++
++#: curs_main.c:508
++msgid "Mailbox was externally modified."
++msgstr "Postakutxa kanpokoaldetik aldatua."
++
++#: curs_main.c:630
++msgid "No tagged messages."
++msgstr "Ez dago mezu markaturik."
++
++#: curs_main.c:666 menu.c:900
++msgid "Nothing to do."
++msgstr "Ez dago ezer egiterik."
++
++#: curs_main.c:752
++msgid "Jump to message: "
++msgstr "Mezura salto egin: "
++
++#: curs_main.c:758
++msgid "Argument must be a message number."
++msgstr "Argumentoa mezu zenbaki bat izan behar da."
++
++#: curs_main.c:791
++msgid "That message is not visible."
++msgstr "Mezu hau ez da ikusgarria."
++
++#: curs_main.c:794
++msgid "Invalid message number."
++msgstr "Mezu zenbaki okerra."
++
++#: curs_main.c:813
++msgid "Delete messages matching: "
++msgstr "Horrelako mezuak ezabatu: "
++
++#: curs_main.c:835
++msgid "No limit pattern is in effect."
++msgstr "Ez da muga patroirik funtzionamenduan."
++
++#. i18n: ask for a limit to apply
++#: curs_main.c:840
++#, c-format
++msgid "Limit: %s"
++msgstr "Muga: %s"
++
++#: curs_main.c:850
++msgid "Limit to messages matching: "
++msgstr "Hau duten mezuetara mugatu: "
++
++#: curs_main.c:882
++msgid "Quit Mutt?"
++msgstr "Mutt Itxi?"
++
++#: curs_main.c:966
++msgid "Tag messages matching: "
++msgstr "Horrelako mezuak markatu: "
++
++#: curs_main.c:980
++msgid "Undelete messages matching: "
++msgstr "Hau betetzen duten mezua desezabatu:"
++
++#: curs_main.c:988
++msgid "Untag messages matching: "
++msgstr "Horrelako mezuen marka ezabatzen: "
++
++#: curs_main.c:1067
++msgid "Open mailbox in read-only mode"
++msgstr "Postakutxa irakurtzeko bakarrik ireki"
++
++#: curs_main.c:1069
++msgid "Open mailbox"
++msgstr "Postakutxa ireki"
++
++#: curs_main.c:1093 mx.c:512 mx.c:658
++#, c-format
++msgid "%s is not a mailbox."
++msgstr "%s ez da postakutxa bat."
++
++#: curs_main.c:1188
++msgid "Exit Mutt without saving?"
++msgstr "Mutt gorde gabe itxi?"
++
++#: curs_main.c:1206 curs_main.c:1238 curs_main.c:1700 curs_main.c:1732
++#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
++msgid "Threading is not enabled."
++msgstr "Hari bihurketa ez dago gaiturik."
++
++#: curs_main.c:1218
++msgid "Thread broken"
++msgstr "Haria apurturik"
++
++#: curs_main.c:1240
++msgid "No Message-ID: header available to link thread"
++msgstr "Ez da Mezu-ID burua jaso harira lotzeko"
++
++#: curs_main.c:1242
++msgid "First, please tag a message to be linked here"
++msgstr "Lehenengo, markatu mezu bat hemen lotzeko"
++
++#: curs_main.c:1254
++msgid "Threads linked"
++msgstr "Hariak loturik"
++
++#: curs_main.c:1257
++msgid "No thread linked"
++msgstr "Hariak ez dira lotu"
++
++#: curs_main.c:1293 curs_main.c:1318
++msgid "You are on the last message."
++msgstr "Azkenengo mezuan zaude."
++
++#: curs_main.c:1300 curs_main.c:1344
++msgid "No undeleted messages."
++msgstr "Ez dago ezabatu gabeko mezurik"
++
++#: curs_main.c:1337 curs_main.c:1361
++msgid "You are on the first message."
++msgstr "Lehenengo mezuan zaude."
++
++#: curs_main.c:1436 pattern.c:1366
++msgid "Search wrapped to top."
++msgstr "Bilaketa berriz hasieratik hasi da."
++
++#: curs_main.c:1445 pattern.c:1377
++msgid "Search wrapped to bottom."
++msgstr "Bilaketa berriz amaieratik hasi da."
++
++#: curs_main.c:1486
++msgid "No new messages"
++msgstr "Ez dago mezu berririk"
++
++#: curs_main.c:1486
++msgid "No unread messages"
++msgstr "Ez dago irakurgabeko mezurik"
++
++#: curs_main.c:1487
++msgid " in this limited view"
++msgstr " Ikuspen mugatu honetan"
++
++#: curs_main.c:1508 pager.c:2403
++msgid "Can't change 'important' flag on POP server."
++msgstr "Ezind a POP zerbitzarian bandera garratzitsua aldatu."
++
++#: curs_main.c:1632
++msgid "No more threads."
++msgstr "Ez dago hari gehiagorik."
++
++#: curs_main.c:1634
++msgid "You are on the first thread."
++msgstr "Lehenengo harian zaude."
++
++#: curs_main.c:1718
++msgid "Thread contains unread messages."
++msgstr "Irakurgabeko mezuak dituen haria."
++
++#: curs_main.c:1905
++msgid "Can't edit message on POP server."
++msgstr "Ezin da POP zerbitzarian mezurik editatu."
++
++#.
++#. * SLcurses_waddnstr() can't take a "const char *", so this is only
++#. * declared "static" (sigh)
++#.
++#: edit.c:41
++msgid ""
++"~~\t\tinsert a line begining with a single ~\n"
++"~b users\tadd users to the Bcc: field\n"
++"~c users\tadd users to the Cc: field\n"
++"~f messages\tinclude messages\n"
++"~F messages\tsame as ~f, except also include headers\n"
++"~h\t\tedit the message header\n"
++"~m messages\tinclude and quote messages\n"
++"~M messages\tsame as ~m, except include headers\n"
++"~p\t\tprint the message\n"
++msgstr ""
++
++#: edit.c:52
++msgid ""
++"~q\t\twrite file and quit editor\n"
++"~r file\t\tread a file into the editor\n"
++"~t users\tadd users to the To: field\n"
++"~u\t\trecall the previous line\n"
++"~v\t\tedit message with the $visual editor\n"
++"~w file\t\twrite message to file\n"
++"~x\t\tabort changes and quit editor\n"
++"~?\t\tthis message\n"
++".\t\ton a line by itself ends input\n"
++msgstr ""
++
++#: edit.c:188
++#, c-format
++msgid "%d: invalid message number.\n"
++msgstr "%d: mezu zembaki okerra.\n"
++
++#: edit.c:330
++msgid "(End message with a . on a line by itself)\n"
++msgstr "(mezua . bakarreko lerro batekin amaitu)\n"
++
++#: edit.c:389
++msgid "No mailbox.\n"
++msgstr "Ez da Postakutxarik\n"
++
++#: edit.c:393
++msgid "Message contains:\n"
++msgstr "Mezuaren edukia:\n"
++
++#: edit.c:397 edit.c:454
++msgid "(continue)\n"
++msgstr "(jarraitu)\n"
++
++#: edit.c:410
++msgid "missing filename.\n"
++msgstr "fitxxategi izena ez da aurkitu.\n"
++
++#: edit.c:430
++msgid "No lines in message.\n"
++msgstr "Ez dago lerrorik mezuan\n"
++
++#: edit.c:447
++#, c-format
++msgid "Bad IDN in %s: '%s'\n"
++msgstr " %s: '%s' -n IDN okerra\n"
++
++#: edit.c:465
++#, c-format
++msgid "%s: unknown editor command (~? for help)\n"
++msgstr "%s: editore komando ezezaguna (~? laguntzarako)\n"
++
++#: editmsg.c:78
++#, c-format
++msgid "could not create temporary folder: %s"
++msgstr "Ezin karpeta temporala sortu: %s"
++
++#: editmsg.c:90
++#, c-format
++msgid "could not write temporary mail folder: %s"
++msgstr "Ezin da Posta karpeta temporalean idatzi: %s"
++
++#: editmsg.c:107
++#, c-format
++msgid "could not truncate temporary mail folder: %s"
++msgstr "Ezin da bein beineko ePosta karpeta ezabatu: %s"
++
++#: editmsg.c:122
++msgid "Message file is empty!"
++msgstr "Mezu fitxategia hutsik dago!"
++
++#: editmsg.c:129
++msgid "Message not modified!"
++msgstr "Mezua aldatu gabe!"
++
++#: editmsg.c:137
++#, c-format
++msgid "Can't open message file: %s"
++msgstr "Ezin da mezu fitxategia ireki: %s"
++
++#: editmsg.c:144 editmsg.c:172
++#, c-format
++msgid "Can't append to folder: %s"
++msgstr "Ezin karpetan gehitu: %s"
++
++#: editmsg.c:203
++#, c-format
++msgid "Error. Preserving temporary file: %s"
++msgstr "Errorea. Fitxategi temporala gordetzen: %s"
++
++#: flags.c:336
++msgid "Set flag"
++msgstr "Bandera ezarri"
++
++#: flags.c:336
++msgid "Clear flag"
++msgstr "Bandera ezabatu"
++
++#: handler.c:1352
++msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n"
++msgstr "[-- Errorea: Ezin da Multipart/Alternative zatirik bistarazi! --]\n"
++
++#: handler.c:1469
++#, c-format
++msgid "[-- Attachment #%d"
++msgstr "[-- Gehigarria #%d"
++
++#: handler.c:1481
++#, c-format
++msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
++msgstr "[-- Mota: %s/%s, Kodifikazioa: %s, Size: %s --]\n"
++
++#: handler.c:1547
++#, c-format
++msgid "[-- Autoview using %s --]\n"
++msgstr "[-- Autoerkutsi %s erabiliaz --]\n"
++
++#: handler.c:1548
++#, c-format
++msgid "Invoking autoview command: %s"
++msgstr "Autoikusketarako komandoa deitzen: %s"
++
++#: handler.c:1580
++#, c-format
++msgid "[-- Can't run %s. --]\n"
++msgstr "[-- %s. ezin da abiarazi--]\n"
++
++#: handler.c:1599 handler.c:1620
++#, c-format
++msgid "[-- Autoview stderr of %s --]\n"
++msgstr ""
++
++#: handler.c:1659
++msgid "[-- Error: message/external-body has no access-type parameter --]\n"
++msgstr "[-- Erroreak: mezu/kanpoko edukiak ez du access-type parametrorik --]\n"
++
++#: handler.c:1678
++#, c-format
++msgid "[-- This %s/%s attachment "
++msgstr "[-- %s/%s gehigarri hau "
++
++#: handler.c:1685
++#, c-format
++msgid "(size %s bytes) "
++msgstr "(tamaina %s byte) "
++
++#: handler.c:1687
++msgid "has been deleted --]\n"
++msgstr "ezabatua izan da --]\n"
++
++#: handler.c:1692
++#, c-format
++msgid "[-- on %s --]\n"
++msgstr "[-- %s-an --]\n"
++
++#: handler.c:1697
++#, c-format
++msgid "[-- name: %s --]\n"
++msgstr "[-- izena: %s --]\n"
++
++#: handler.c:1710 handler.c:1726
++#, c-format
++msgid "[-- This %s/%s attachment is not included, --]\n"
++msgstr "[-- %s/%s gehigarria ez da gehituko, --]\n"
++
++#: handler.c:1712
++msgid ""
++"[-- and the indicated external source has --]\n"
++"[-- expired. --]\n"
++msgstr ""
++"[-- ezarritako kanpoko jatorria denboraz --]\n"
++"[-- kanpo dago. --]\n"
++
++#: handler.c:1730
++#, c-format
++msgid "[-- and the indicated access-type %s is unsupported --]\n"
++msgstr "[-- eta ezarritako access type %s ez da onartzen --]\n"
++
++#: handler.c:1841
++msgid "Error: multipart/signed has no protocol."
++msgstr "Errorea: zati anitzeko sinadurak ez du protokolorik."
++
++#: handler.c:1851
++msgid "Error: multipart/encrypted has no protocol parameter!"
++msgstr "Errorea: zati anitzeko sinadurak ez du protokoloparametrorik."
++
++#: handler.c:1891
++msgid "Unable to open temporary file!"
++msgstr "Ezin da fitxategi temporala ireki!"
++
++#: handler.c:1952
++#, c-format
++msgid "[-- %s/%s is unsupported "
++msgstr "[-- %s/%s ez da onartzen "
++
++#: handler.c:1957
++#, c-format
++msgid "(use '%s' to view this part)"
++msgstr "('%s' erabili zati hau ikusteko)"
++
++#: handler.c:1959
++msgid "(need 'view-attachments' bound to key!)"
++msgstr ""
++
++#: headers.c:177
++#, c-format
++msgid "%s: unable to attach file"
++msgstr "%s: ezin gehigarria gehitu."
++
++#: help.c:282
++msgid "ERROR: please report this bug"
++msgstr "ERROREA: Mesedez zorri honetaz berri eman"
++
++#: help.c:324
++msgid "<UNKNOWN>"
++msgstr "<EZEZAGUNA>"
++
++#: help.c:336
++msgid ""
++"\n"
++"Generic bindings:\n"
++"\n"
++msgstr ""
++"\n"
++"Lotura Orokorrak:\n"
++"\n"
++
++#: help.c:340
++msgid ""
++"\n"
++"Unbound functions:\n"
++"\n"
++msgstr ""
++"\n"
++"Loturagabeko funtzioak:\n"
++"\n"
++
++#: help.c:348
++#, c-format
++msgid "Help for %s"
++msgstr "%s-rako laguntza"
++
++#: hook.c:246
++#, c-format
++msgid "unhook: Can't do unhook * from within a hook."
++msgstr "unhook: Ezin da gantxoaren barnekaldetik desengatxatu."
++
++#: hook.c:258
++#, c-format
++msgid "unhook: unknown hook type: %s"
++msgstr "unhook: gantxo moeta ezezaguna: %s"
++
++#: hook.c:264
++#, 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:390
++msgid "No authenticators available"
++msgstr "Ez da autentiakatzailerik aukeran"
++
++#: imap/auth_anon.c:43
++msgid "Authenticating (anonymous)..."
++msgstr "Autentifikatzen (anonimoki)..."
++
++#: imap/auth_anon.c:73
++msgid "Anonymous authentication failed."
++msgstr "Anonimoki autentifikatzeak huts egin du."
++
++#: imap/auth_cram.c:48
++msgid "Authenticating (CRAM-MD5)..."
++msgstr "(CRAM-MD5) autentifikatzen..."
++
++#: imap/auth_cram.c:128
++msgid "CRAM-MD5 authentication failed."
++msgstr "CRAM-MD5 autentifikazioak huts egin du."
++
++#. now begin login
++#: imap/auth_gss.c:105
++msgid "Authenticating (GSSAPI)..."
++msgstr "(GSSAPI) autentifikazioa..."
++
++#: imap/auth_gss.c:268
++msgid "GSSAPI authentication failed."
++msgstr "(GSSAPI) autentifikazioak huts egin du."
++
++#: imap/auth_login.c:38
++msgid "LOGIN disabled on this server."
++msgstr "Zerbitzari honetan saio astea ezgaitturik."
++
++#: imap/auth_login.c:47 pop_auth.c:223
++msgid "Logging in..."
++msgstr "Saio asten..."
++
++#: imap/auth_login.c:67 pop_auth.c:266
++msgid "Login failed."
++msgstr "Huts saioa asterakoan."
++
++#: imap/auth_sasl.c:97
++#, c-format
++msgid "Authenticating (%s)..."
++msgstr "Autentifikazioa (%s)..."
++
++#: imap/auth_sasl.c:185 pop_auth.c:151
++msgid "SASL authentication failed."
++msgstr "SASL egiaztapenak huts egin du."
++
++#: imap/browse.c:69 imap/imap.c:587
++#, c-format
++msgid "%s is an invalid IMAP path"
++msgstr "%s baliogabeko IMAP datu bidea da."
++
++#: imap/browse.c:87
++msgid "Getting namespaces..."
++msgstr "Izena eskuratzen..."
++
++#: imap/browse.c:96
++msgid "Getting folder list..."
++msgstr "Karpeta zerrenda eskuratzen..."
++
++#: imap/browse.c:225
++msgid "No such folder"
++msgstr "Ez da karpeta aurkitu"
++
++#: imap/browse.c:288
++msgid "Create mailbox: "
++msgstr "Postakutxa sortu:"
++
++#: imap/browse.c:293 imap/browse.c:339
++msgid "Mailbox must have a name."
++msgstr "Postakotxak izen bat eduki behar du."
++
++#: imap/browse.c:301
++msgid "Mailbox created."
++msgstr "Postakutxa sortua."
++
++#: imap/browse.c:332
++#, c-format
++msgid "Rename mailbox %s to: "
++msgstr "%s postakutxa honela berrizendatu: "
++
++#: imap/browse.c:345
++#, c-format
++msgid "Rename failed: %s"
++msgstr "Berrizendaketak huts egin du: %s"
++
++#: imap/browse.c:350
++msgid "Mailbox renamed."
++msgstr "Postakutxa berrizendaturik."
++
++#: imap/command.c:298
++msgid "Mailbox closed"
++msgstr "Postakutxa itxia"
++
++#. something is wrong because the server reported fewer messages
++#. * than we previously saw
++#.
++#: imap/command.c:341
++msgid "Fatal error. Message count is out of sync!"
++msgstr "Errore konponezina. Mezu kontaketa sinkronizatu gabe!"
++
++#: imap/imap.c:177
++#, c-format
++msgid "Closing connection to %s..."
++msgstr "%s-ra konexioak ixten..."
++
++#: imap/imap.c:340
++msgid "This IMAP server is ancient. Mutt does not work with it."
++msgstr "IMAP zerbitzaria aspaldikoa da. Muut-ek ezin du berarekin lan egin."
++
++#: imap/imap.c:422
++msgid "Checking mailbox subscriptions"
++msgstr "postakutxa harpidetzak arakatzen"
++
++#: imap/imap.c:460 pop_lib.c:286
++msgid "Secure connection with TLS?"
++msgstr "TLS-duen konexio zihurra?"
++
++#: imap/imap.c:473 pop_lib.c:310
++msgid "Could not negotiate TLS connection"
++msgstr "Ezin da TLS konexioa negoziatu"
++
++#: imap/imap.c:489 pop_lib.c:331
++msgid "Encrypted connection unavailable"
++msgstr "Enkriptaturiko konexioa ez da erabilgarria"
++
++#: imap/imap.c:618
++#, c-format
++msgid "Selecting %s..."
++msgstr "Aukeratzen %s..."
++
++#: imap/imap.c:754
++msgid "Error opening mailbox"
++msgstr "Postakutxa irekitzean errorea"
++
++#: imap/imap.c:803 imap/message.c:742 muttlib.c:1300
++#, c-format
++msgid "Create %s?"
++msgstr "Sortu %s?"
++
++#: imap/imap.c:1041 pop.c:468
++#, c-format
++msgid "Marking %d messages deleted..."
++msgstr "%d mezu ezabatuak markatzen..."
++
++#: imap/imap.c:1050
++msgid "Expunge failed"
++msgstr "Ezabatzea huts"
++
++#: imap/imap.c:1063
++#, c-format
++msgid "Saving message status flags... [%d/%d]"
++msgstr "Mezuen egoera banderak gordetzen... [%d/%d]"
++
++#: imap/imap.c:1096
++msgid "Expunging messages from server..."
++msgstr "Mezuak zerbitzaritik ezabatzen..."
++
++#: imap/imap.c:1101
++msgid "imap_sync_mailbox: EXPUNGE failed"
++msgstr "imap_sync_mailbox: EXPUNGE huts egin du"
++
++#: imap/imap.c:1110 imap/imap.c:1145
++msgid "CLOSE failed"
++msgstr "CLOSE huts egin du"
++
++#: imap/imap.c:1387
++#, c-format
++msgid "Header search without header name: %s"
++msgstr ""
++
++#: imap/imap.c:1535
++msgid "Bad mailbox name"
++msgstr "Postakutxa izen okerra"
++
++#: imap/imap.c:1558
++#, c-format
++msgid "Subscribing to %s..."
++msgstr "%s-ra harpidetzen..."
++
++#: imap/imap.c:1560
++#, c-format
++msgid "Unsubscribing to %s..."
++msgstr "%s-ra harpidetzaz ezabatzen..."
++
++#. Unable to fetch headers for lower versions
++#: imap/message.c:91
++msgid "Unable to fetch headers from this IMAP server version."
++msgstr "IMAP zerbitzari bertsio honetatik ezin dira mezuak eskuratu."
++
++#: imap/message.c:101
++#, c-format
++msgid "Could not create temporary file %s"
++msgstr "Ezin da %s fitxategi tenporala sortu"
++
++#: imap/message.c:127
++#, c-format
++msgid "Evaluating cache... [%d/%d]"
++msgstr "Katxea ebaluatzen... [%d/%d]"
++
++#: imap/message.c:195 pop.c:211
++#, c-format
++msgid "Fetching message headers... [%d/%d]"
++msgstr "Mezu burukoak eskuratzen... [%d/%d]"
++
++#: imap/message.c:358 imap/message.c:413 pop.c:388
++msgid "Fetching message..."
++msgstr "Mezua eskuratzen..."
++
++#: imap/message.c:401 pop.c:382
++msgid "The message index is incorrect. Try reopening the mailbox."
++msgstr "Mezu sarrera baliogabekoa. Saia zaitez postakutxa berrirekitzen."
++
++#: imap/message.c:548
++msgid "Uploading message..."
++msgstr "Mezua igotzeb..."
++
++#: imap/message.c:708
++#, c-format
++msgid "Copying %d messages to %s..."
++msgstr "%d mezuak %s-ra kopiatzen..."
++
++#: imap/message.c:712
++#, c-format
++msgid "Copying message %d to %s..."
++msgstr "%d mezua %s-ra kopiatzen..."
++
++#: imap/util.c:236
++msgid "Continue?"
++msgstr "Jarraitu?"
++
++#: init.c:57 init.c:1277 pager.c:57
++#, c-format
++msgid "Not available in this menu."
++msgstr "Menu honetan ezin da egin."
++
++#: init.c:438
++#, c-format
++msgid "Bad regexp: %s"
++msgstr "Okerrego espresio erregularra: %s"
++
++#: init.c:697
++msgid "spam: no matching pattern"
++msgstr "zabor-posta: ez da patroia aurkitu"
++
++#: init.c:699
++msgid "nospam: no matching pattern"
++msgstr "ez zabor-posta: ez da patroia aurkitu"
++
++#: init.c:902
++msgid "alias: no address"
++msgstr "alias: helbide gabea"
++
++#: init.c:947
++#, c-format
++msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
++msgstr "Kontuz: '%s' IDN okerra '%s' aliasean.\n"
++
++#: init.c:1026
++msgid "invalid header field"
++msgstr "baliogabeko mezu burua"
++
++#: init.c:1079
++#, c-format
++msgid "%s: unknown sorting method"
++msgstr "%s: sailkatze modu ezezaguna"
++
++#: init.c:1189
++#, c-format
++msgid "mutt_restore_default(%s): error in regexp: %s\n"
++msgstr "mutt_restore_default(%s): errorea espresio erregularrean: %s\n"
++
++#: init.c:1254
++#, c-format
++msgid "%s: unknown variable"
++msgstr "%s: Aldagai ezezaguna"
++
++#: init.c:1263
++#, c-format
++msgid "prefix is illegal with reset"
++msgstr "aurrizkia legezkanpokoa da reset-ekin"
++
++#: init.c:1269
++#, c-format
++msgid "value is illegal with reset"
++msgstr "balioa legezkanpokoa da reset-ekin"
++
++#: init.c:1322
++#, c-format
++msgid "%s is set"
++msgstr "%s ezarririk dago"
++
++#: init.c:1322
++#, c-format
++msgid "%s is unset"
++msgstr "%s ezarri gabe dago"
++
++#: init.c:1517
++#, c-format
++msgid "%s: invalid mailbox type"
++msgstr "%s: Postakutxa moeta okerra"
++
++#: init.c:1543 init.c:1589
++#, c-format
++msgid "%s: invalid value"
++msgstr "%s: balio okerra"
++
++#: init.c:1630
++#, c-format
++msgid "%s: Unknown type."
++msgstr "%s Mota ezezaguna."
++
++#: init.c:1657
++#, c-format
++msgid "%s: unknown type"
++msgstr "%s: mota ezezaguna"
++
++#: init.c:1716
++#, c-format
++msgid "Error in %s, line %d: %s"
++msgstr "Errorea %s-n, %d lerroan: %s"
++
++#. the muttrc source keyword
++#: init.c:1739
++#, c-format
++msgid "source: errors in %s"
++msgstr "jatorria: erroreak %s-n"
++
++#: init.c:1740
++#, c-format
++msgid "source: reading aborted due too many errors in %s"
++msgstr "jatorria: %s-n akats gehiegiengatik irakurketa ezeztatua"
++
++#: init.c:1754
++#, c-format
++msgid "source: error at %s"
++msgstr "jatorria: %s-n errorea"
++
++#: init.c:1759
++msgid "source: too many arguments"
++msgstr "jatorria : argumento gutxiegi"
++
++#: init.c:1810
++#, c-format
++msgid "%s: unknown command"
++msgstr "%s: komando ezezaguna"
++
++#: init.c:2258
++#, c-format
++msgid "Error in command line: %s\n"
++msgstr "komando lerroan errorea: %s\n"
++
++#: init.c:2308
++msgid "unable to determine home directory"
++msgstr "Ezin da \"home\" karpeta aukeratu"
++
++#: init.c:2316
++msgid "unable to determine username"
++msgstr "ezinda erbailtzail izena aurkitu"
++
++#: keymap.c:466
++msgid "Macro loop detected."
++msgstr "Makro begizta aurkitua."
++
++#: keymap.c:676 keymap.c:684
++msgid "Key is not bound."
++msgstr "Letra ez dago mugaturik."
++
++#: keymap.c:688
++#, c-format
++msgid "Key is not bound. Press '%s' for help."
++msgstr "Letra ez dago mugaturik. %s jo laguntzarako"
++
++#: keymap.c:699
++msgid "push: too many arguments"
++msgstr "push: argumentu gutxiegi"
++
++#: keymap.c:729
++#, c-format
++msgid "%s: no such menu"
++msgstr "%s: ez da menurik"
++
++#: keymap.c:744
++msgid "null key sequence"
++msgstr "baloigabeko sekuentzi gakoa"
++
++#: keymap.c:831
++msgid "bind: too many arguments"
++msgstr "bind:argumento gehiegi"
++
++#: keymap.c:854
++#, c-format
++msgid "%s: no such function in map"
++msgstr "%s: ez da horrelako funtziorik aurkitu mapan"
++
++#: keymap.c:878
++msgid "macro: empty key sequence"
++msgstr "macro: sekuentzi gako hutsa"
++
++#: keymap.c:889
++msgid "macro: too many arguments"
++msgstr "makro: argumento gutxiegi"
++
++#: keymap.c:925
++msgid "exec: no arguments"
++msgstr "exec: ez da argumetorik"
++
++#: keymap.c:945
++#, c-format
++msgid "%s: no such function"
++msgstr "%s: ez da funtziorik"
++
++#: keymap.c:966
++msgid "Enter keys (^G to abort): "
++msgstr "Sartu gakoak (^G uzteko): "
++
++#: keymap.c:971
++#, c-format
++msgid "Char = %s, Octal = %o, Decimal = %d"
++msgstr "Kar = %s, Zortziko = %o, amarreko = %d"
++
++#: keymap_alldefs.h:5
++msgid "null operation"
++msgstr "operazio baloigabea"
++
++#: keymap_alldefs.h:6
++msgid "end of conditional execution (noop)"
++msgstr "balizko exekuzio amaiera (noop)"
++
++#: keymap_alldefs.h:7
++msgid "force viewing of attachment using mailcap"
++msgstr "Gehigarria mailcap erabiliaz erakustea derrigortu"
++
++#: keymap_alldefs.h:8
++msgid "view attachment as text"
++msgstr "Gehigarriak testua balira ikusi"
++
++#: keymap_alldefs.h:9
++msgid "Toggle display of subparts"
++msgstr "Azpizatien erakustaldia txandakatu"
++
++#: keymap_alldefs.h:10
++msgid "move to the bottom of the page"
++msgstr "Orrialdearen azkenera mugitu"
++
++#: keymap_alldefs.h:11
++msgid "remail a message to another user"
++msgstr "Mezua beste erabiltzaile bati berbidali"
++
++#: keymap_alldefs.h:12
++msgid "select a new file in this directory"
++msgstr "aukeratu fitxategi berria karpeta honetan"
++
++#: keymap_alldefs.h:13
++msgid "view file"
++msgstr "fitxategia ikusi"
++
++#: keymap_alldefs.h:14
++msgid "display the currently selected file's name"
++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)"
++
++#: keymap_alldefs.h:16
++msgid "unsubscribe to current mailbox (IMAP only)"
++msgstr "Une honetako postakutxan harpidetza ezabatu (IMAP bakarrik)"
++
++#: keymap_alldefs.h:17
++msgid "toggle view all/subscribed mailboxes (IMAP only)"
++msgstr "denak/harpidetutako postakutxen (IMAP bakarrik) erakustaldia txandakatu"
++
++#: keymap_alldefs.h:18
++msgid "list mailboxes with new mail"
++msgstr "Posta berridun postakutxen zerrenda"
++
++#: keymap_alldefs.h:19
++msgid "change directories"
++msgstr "Karpetak aldatu"
++
++#: keymap_alldefs.h:20
++msgid "check mailboxes for new mail"
++msgstr "Postakutxak eposta berrien bila arakatu"
++
++#: keymap_alldefs.h:21
++msgid "attach a file(s) to this message"
++msgstr "fitxategia(k) gehitu mezu honetara"
++
++#: keymap_alldefs.h:22
++msgid "attach message(s) to this message"
++msgstr "Mezuak gehitu mezu honetara"
++
++#: keymap_alldefs.h:23
++msgid "edit the BCC list"
++msgstr "BCC Zerrenda editatu"
++
++#: keymap_alldefs.h:24
++msgid "edit the CC list"
++msgstr "CC zerrenda editatu"
++
++#: keymap_alldefs.h:25
++msgid "edit attachment description"
++msgstr "gehigarri dekribapena editatu"
++
++#: keymap_alldefs.h:26
++msgid "edit attachment transfer-encoding"
++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"
++
++#: keymap_alldefs.h:28
++msgid "edit the file to be attached"
++msgstr "Gehitu behar den fitxategia editatu"
++
++#: keymap_alldefs.h:29
++msgid "edit the from field"
++msgstr "Nondik parametroa editatu"
++
++#: keymap_alldefs.h:30
++msgid "edit the message with headers"
++msgstr "Mezua buruekin editatu"
++
++#: keymap_alldefs.h:31
++msgid "edit the message"
++msgstr "Mezua editatu"
++
++#: keymap_alldefs.h:32
++msgid "edit attachment using mailcap entry"
++msgstr "mailcap sarrera erabiliaz gehigarria editatu"
++
++#: keymap_alldefs.h:33
++msgid "edit the Reply-To field"
++msgstr "Erantzun-honi aldagaia aldatu"
++
++#: keymap_alldefs.h:34
++msgid "edit the subject of this message"
++msgstr "MEzu honen gaia editatu"
++
++#: keymap_alldefs.h:35
++msgid "edit the TO list"
++msgstr "Nori zerrenda editatu"
++
++#: keymap_alldefs.h:36
++msgid "create a new mailbox (IMAP only)"
++msgstr "Postakutxa berria sortu (IMAP bakarrik)"
++
++#: keymap_alldefs.h:37
++msgid "edit attachment content type"
++msgstr "gehigarriaren eduki moeta editatu"
++
++#: keymap_alldefs.h:38
++msgid "get a temporary copy of an attachment"
++msgstr "Gehigarriaren kopia temporala eskuratu"
++
++#: keymap_alldefs.h:39
++msgid "run ispell on the message"
++msgstr "Mezu honetan ispell abiarazi"
++
++#: keymap_alldefs.h:40
++msgid "compose new attachment using mailcap entry"
++msgstr "mailcap sarrera erabiliaz gehigarri berria sortu"
++
++#: keymap_alldefs.h:41
++msgid "toggle recoding of this attachment"
++msgstr "txandakatu gehigarri honen gordetzea"
++
++#: keymap_alldefs.h:42
++msgid "save this message to send later"
++msgstr "Mezu hau beranduago bidaltzeko gorde"
++
++#: keymap_alldefs.h:43
++msgid "rename/move an attached file"
++msgstr "Gehituriko fitxategia ezabatu/izenaldatu"
++
++#: keymap_alldefs.h:44
++msgid "send the message"
++msgstr "Mezua bidali"
++
++#: keymap_alldefs.h:45
++msgid "toggle disposition between inline/attachment"
++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."
++
++#: keymap_alldefs.h:47
++msgid "update an attachment's encoding info"
++msgstr "gehigarriaren kodeaketa argibideak eguneratu"
++
++#: keymap_alldefs.h:48
++msgid "write the message to a folder"
++msgstr "Mezua karpeta batetan gorde"
++
++#: keymap_alldefs.h:49
++msgid "copy a message to a file/mailbox"
++msgstr "fitxategi/postakutxa batetaraka kopiatu mezua"
++
++#: keymap_alldefs.h:50
++msgid "create an alias from a message sender"
++msgstr "Mezuaren bidaltzailearentzat alias berria sortu"
++
++#: keymap_alldefs.h:51
++msgid "move entry to bottom of screen"
++msgstr "Sarrera pantailaren bukaerara mugitu"
++
++#: keymap_alldefs.h:52
++msgid "move entry to middle of screen"
++msgstr "Sarrera pantailaren erdira mugitu"
++
++#: keymap_alldefs.h:53
++msgid "move entry to top of screen"
++msgstr "Sarrera pantailaren goikaldera mugitu"
++
++#: keymap_alldefs.h:54
++msgid "make decoded (text/plain) copy"
++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"
++
++#: keymap_alldefs.h:56
++msgid "delete the current entry"
++msgstr "Uneko sarrera ezabatu"
++
++#: keymap_alldefs.h:57
++msgid "delete the current mailbox (IMAP only)"
++msgstr "Uneko postakutxa ezabatu (IMAP bakarrik)"
++
++#: keymap_alldefs.h:58
++msgid "delete all messages in subthread"
++msgstr "hariazpi honetako mezuak ezabatu"
++
++#: keymap_alldefs.h:59
++msgid "delete all messages in thread"
++msgstr "Hari honetako mezu guztiak ezabatu"
++
++#: keymap_alldefs.h:60
++msgid "display full address of sender"
++msgstr "Bidaltzailearen helbide osoa erakutsi"
++
++#: keymap_alldefs.h:61
++msgid "display message and toggle header weeding"
++msgstr "Mezua erakutsi eta buru guztien erakustaldia aldatu"
++
++#: keymap_alldefs.h:62
++msgid "display a message"
++msgstr "Mezua erakutsi"
++
++#: keymap_alldefs.h:63
++msgid "edit the raw message"
++msgstr "Mezu laua editatu"
++
++#: keymap_alldefs.h:64
++msgid "delete the char in front of the cursor"
++msgstr "Kursorearen aurrean dagoen karakterra ezabatu"
++
++#: keymap_alldefs.h:65
++msgid "move the cursor one character to the left"
++msgstr "kurtsorea karaktere bat ezkerraldera mugitu"
++
++#: keymap_alldefs.h:66
++msgid "move the cursor to the beginning of the word"
++msgstr "kurtsorea hitzaren hasierara mugitu"
++
++#: keymap_alldefs.h:67
++msgid "jump to the beginning of the line"
++msgstr "Lerroaren haserara salto egin"
++
++#: keymap_alldefs.h:68
++msgid "cycle among incoming mailboxes"
++msgstr "Sarrera postakutxen artean aldatu"
++
++#: keymap_alldefs.h:69
++msgid "complete filename or alias"
++msgstr "fitxategi izen edo alias bete"
++
++#: keymap_alldefs.h:70
++msgid "complete address with query"
++msgstr "Galderarekin osatu helbidea"
++
++#: keymap_alldefs.h:71
++msgid "delete the char under the cursor"
++msgstr "Kurtsorearen azpian dagoen karakterra ezabatu"
++
++#: keymap_alldefs.h:72
++msgid "jump to the end of the line"
++msgstr "Lerroaren bukaerara salto egin"
++
++#: keymap_alldefs.h:73
++msgid "move the cursor one character to the right"
++msgstr "kurtsorea karaktere bat eskuinaldera mugitu"
++
++#: keymap_alldefs.h:74
++msgid "move the cursor to the end of the word"
++msgstr "kurtsorea hitzaren bukaerara mugitu"
++
++#: keymap_alldefs.h:75
++msgid "scroll down through the history list"
++msgstr "historia zeerendan atzera mugitu"
++
++#: keymap_alldefs.h:76
++msgid "scroll up through the history list"
++msgstr "historia zerrendan aurrera mugitu"
++
++#: keymap_alldefs.h:77
++msgid "delete chars from cursor to end of line"
++msgstr "kurtsoretik lerro bukaerara dauden karakterrak ezabatu"
++
++#: keymap_alldefs.h:78
++msgid "delete chars from the cursor to the end of the word"
++msgstr "kurtsoretik hitzaren bukaerara dauden karakterrak ezabatu"
++
++#: keymap_alldefs.h:79
++msgid "delete all chars on the line"
++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"
++
++#: keymap_alldefs.h:81
++msgid "quote the next typed key"
++msgstr "sakatzen den hurrengo tekl markatu"
++
++#: keymap_alldefs.h:82
++msgid "transpose character under cursor with previous"
++msgstr "kursorearen azpiko karakterra aurrekoarekin irauli"
++
++#: keymap_alldefs.h:83
++msgid "capitalize the word"
++msgstr "Hitza kapitalizatu"
++
++#: keymap_alldefs.h:84
++msgid "convert the word to lower case"
++msgstr "Hitza minuskuletara bihurtu"
++
++#: keymap_alldefs.h:85
++msgid "convert the word to upper case"
++msgstr "Hitza maiuskuletara bihurtu"
++
++#: keymap_alldefs.h:86
++msgid "enter a muttrc command"
++msgstr "sar muttrc komandoa"
++
++#: keymap_alldefs.h:87
++msgid "enter a file mask"
++msgstr "fitxategi maskara sartu"
++
++#: keymap_alldefs.h:88
++msgid "exit this menu"
++msgstr "menu hau utzi"
++
++#: keymap_alldefs.h:89
++msgid "filter attachment through a shell command"
++msgstr "sheel komado bidezko gehigarri iragazkia"
++
++#: keymap_alldefs.h:90
++msgid "move to the first entry"
++msgstr "Lehenengo sarrerara mugitu"
++
++#: keymap_alldefs.h:91
++msgid "toggle a message's 'important' flag"
++msgstr "Mezuen bandera garrantzitsuak txandakatu"
++
++#: keymap_alldefs.h:92
++msgid "forward a message with comments"
++msgstr "Birbidali mezua iruzkinekin"
++
++#: keymap_alldefs.h:93
++msgid "select the current entry"
++msgstr "Uneko sarrera aukeratu"
++
++#: keymap_alldefs.h:94
++msgid "reply to all recipients"
++msgstr "Denei erantzun"
++
++#: keymap_alldefs.h:95
++msgid "scroll down 1/2 page"
++msgstr "Orrialde erdia jeitsi"
++
++#: keymap_alldefs.h:96
++msgid "scroll up 1/2 page"
++msgstr "Orrialde erdia igo"
++
++#: keymap_alldefs.h:97
++msgid "this screen"
++msgstr "Leiho hau"
++
++#: keymap_alldefs.h:98
++msgid "jump to an index number"
++msgstr "joan sarrera zenbakira "
++
++#: keymap_alldefs.h:99
++msgid "move to the last entry"
++msgstr "azkenengo sarrerara salto egin"
++
++#: keymap_alldefs.h:100
++msgid "reply to specified mailing list"
++msgstr "emandako ePosta zerrendara erantzun"
++
++#: keymap_alldefs.h:101
++msgid "execute a macro"
++msgstr "macro bat abiarazi"
++
++#: keymap_alldefs.h:102
++msgid "compose a new mail message"
++msgstr "ePosta mezu berri bat idatzi"
++
++#: keymap_alldefs.h:103
++msgid "break the thread in two"
++msgstr "Haria bitan zatitu"
++
++#: keymap_alldefs.h:104
++msgid "open a different folder"
++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"
++
++#: keymap_alldefs.h:106
++msgid "clear a status flag from a message"
++msgstr "Mezuaren egoera bandera ezabatu"
++
++#: keymap_alldefs.h:107
++msgid "delete messages matching a pattern"
++msgstr "Emandako patroaiaren arabaerako 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 "retrieve mail from POP server"
++msgstr "POP zerbitzaritik ePosta jaso"
++
++#: keymap_alldefs.h:110
++msgid "move to the first message"
++msgstr "Lehenengo mezura joan"
++
++#: keymap_alldefs.h:111
++msgid "move to the last message"
++msgstr "Azkenengo mezura joan"
++
++#: keymap_alldefs.h:112
++msgid "show only messages matching a pattern"
++msgstr "Emandako patroia betetzen duten mezuak bakarrik erakutsi"
++
++#: keymap_alldefs.h:113
++msgid "link tagged message to the current one"
++msgstr "lotu markaturiko mezua honetara"
++
++#: keymap_alldefs.h:114
++msgid "jump to the next new message"
++msgstr "Hurrengo mezu berrira joan"
++
++#: keymap_alldefs.h:115
++msgid "jump to the next new or unread message"
++msgstr "Hurrengo mezu berri edo irakurgabera joan"
++
++#: keymap_alldefs.h:116
++msgid "jump to the next subthread"
++msgstr "Hurrengo hariazpira joan"
++
++#: keymap_alldefs.h:117
++msgid "jump to the next thread"
++msgstr "Hurrengo harira joan"
++
++#: keymap_alldefs.h:118
++msgid "move to the next undeleted message"
++msgstr "Hurrengo ezabatu gabeko mezura joan"
++
++#: keymap_alldefs.h:119
++msgid "jump to the next unread message"
++msgstr "Hurrengo irakurgabeko mezura joan"
++
++#: keymap_alldefs.h:120
++msgid "jump to parent message in thread"
++msgstr "Hariko goiko mezura joan"
++
++#: keymap_alldefs.h:121
++msgid "jump to previous thread"
++msgstr "Aurreko harira joan"
++
++#: keymap_alldefs.h:122
++msgid "jump to previous subthread"
++msgstr "Aurreko harirazpira joan"
++
++#: keymap_alldefs.h:123
++msgid "move to the previous undeleted message"
++msgstr "ezabatugabeko hurrengo mezura joan"
++
++#: keymap_alldefs.h:124
++msgid "jump to the previous new message"
++msgstr "aurreko mezu berrira joan"
++
++#: keymap_alldefs.h:125
++msgid "jump to the previous new or unread message"
++msgstr "aurreko mezu berri edo irakurgabera joan"
++
++#: keymap_alldefs.h:126
++msgid "jump to the previous unread message"
++msgstr "aurreko mezu irakurgabera joan"
++
++#: keymap_alldefs.h:127
++msgid "mark the current thread as read"
++msgstr "uneko haria irakurria bezala markatu"
++
++#: keymap_alldefs.h:128
++msgid "mark the current subthread as read"
++msgstr "uneko hariazpia irakurria bezala markatu"
++
++#: keymap_alldefs.h:129
++msgid "set a status flag on a message"
++msgstr "egoera bandera ezarri mezuari"
++
++#: keymap_alldefs.h:130
++msgid "save changes to mailbox"
++msgstr "postakutxaren aldaketak gorde"
++
++#: keymap_alldefs.h:131
++msgid "tag messages matching a pattern"
++msgstr "emandako patroiaren araberako mezuak markatu"
++
++#: keymap_alldefs.h:132
++msgid "undelete messages matching a pattern"
++msgstr "emandako patroairen araberako mezuak berreskuratu."
++
++#: keymap_alldefs.h:133
++msgid "untag messages matching a pattern"
++msgstr "Emandako patroiaren araberako mezuak desmarkatu."
++
++#: keymap_alldefs.h:134
++msgid "move to the middle of the page"
++msgstr "Orriaren erdira joan"
++
++#: keymap_alldefs.h:135
++msgid "move to the next entry"
++msgstr "hurrengo sarrerara joan"
++
++#: keymap_alldefs.h:136
++msgid "scroll down one line"
++msgstr "lerro bat jeitsi"
++
++#: keymap_alldefs.h:137
++msgid "move to the next page"
++msgstr "hurrengo orrialdera joan"
++
++#: keymap_alldefs.h:138
++msgid "jump to the bottom of the message"
++msgstr "mezuaren bukaerara joan"
++
++#: keymap_alldefs.h:139
++msgid "toggle display of quoted text"
++msgstr "gakoarteko textuaren erakustaldia aldatu."
++
++#: keymap_alldefs.h:140
++msgid "skip beyond quoted text"
++msgstr "gako arteko testuaren atzera salto egin"
++
++#: keymap_alldefs.h:141
++msgid "jump to the top of the message"
++msgstr "mezuaren aserara joan"
++
++#: keymap_alldefs.h:142
++msgid "pipe message/attachment to a shell command"
++msgstr "mezua/gehigarria shell komando batetara bideratu"
++
++#: keymap_alldefs.h:143
++msgid "move to the previous entry"
++msgstr "Aurreko sarrerara joan"
++
++#: keymap_alldefs.h:144
++msgid "scroll up one line"
++msgstr "lerro bat igo"
++
++#: keymap_alldefs.h:145
++msgid "move to the previous page"
++msgstr "Aurreko orrialdera joan"
++
++#: keymap_alldefs.h:146
++msgid "print the current entry"
++msgstr "uneko sarrera imprimatu"
++
++#: keymap_alldefs.h:147
++msgid "query external program for addresses"
++msgstr "galdetu kanpoko aplikazioari helbidea lortzeko"
++
++#: keymap_alldefs.h:148
++msgid "append new query results to current results"
++msgstr "emaitza hauei bilaketa berriaren emaitzak gehitu"
++
++#: keymap_alldefs.h:149
++msgid "save changes to mailbox and quit"
++msgstr "aldaketak postakutxan gorde eta utzi"
++
++#: keymap_alldefs.h:150
++msgid "recall a postponed message"
++msgstr "atzeratiutako mezua berriz artu"
++
++#: keymap_alldefs.h:151
++msgid "clear and redraw the screen"
++msgstr "pantaila garbitu eta berriz marraztu"
++
++#: keymap_alldefs.h:152
++msgid "{internal}"
++msgstr "(barnekoa)"
++
++#: keymap_alldefs.h:153
++msgid "rename the current mailbox (IMAP only)"
++msgstr "uneko postakutxa berrizendatu (IMAP soilik)"
++
++#: keymap_alldefs.h:154
++msgid "reply to a message"
++msgstr "mezuari erantzuna"
++
++#: keymap_alldefs.h:155
++msgid "use the current message as a template for a new one"
++msgstr "Unekoa mezu berri bat egiteko txantilloi gisa erabili."
++
++#: keymap_alldefs.h:156
++msgid "save message/attachment to a file"
++msgstr "mezua/gehigarria fitxategi batetan gorde"
++
++#: keymap_alldefs.h:157
++msgid "search for a regular expression"
++msgstr "espresio erregular bat bilatu"
++
++#: keymap_alldefs.h:158
++msgid "search backwards for a regular expression"
++msgstr "espresio erregular baten bidez atzeraka bilatu"
++
++#: keymap_alldefs.h:159
++msgid "search for next match"
++msgstr "hurrengo psrekatzera joan"
++
++#: keymap_alldefs.h:160
++msgid "search for next match in opposite direction"
++msgstr "Beste zentzuan hurrengoa parekatzea bilatu"
++
++#: keymap_alldefs.h:161
++msgid "toggle search pattern coloring"
++msgstr "bilaketa patroiaren kolorea txandakatu"
++
++#: keymap_alldefs.h:162
++msgid "invoke a command in a subshell"
++msgstr "Komando bat subshell batetan deitu"
++
++#: keymap_alldefs.h:163
++msgid "sort messages"
++msgstr "mezuak ordenatu"
++
++#: keymap_alldefs.h:164
++msgid "sort messages in reverse order"
++msgstr "mezuak atzekoz aurrera ordenatu"
++
++#: keymap_alldefs.h:165
++msgid "tag the current entry"
++msgstr "uneko sarrera markatu"
++
++#: keymap_alldefs.h:166
++msgid "apply next function to tagged messages"
++msgstr "markatutako mezuei funtzio hau aplikatu"
++
++#: keymap_alldefs.h:167
++msgid "apply next function ONLY to tagged messages"
++msgstr "hurrengo funtzioa BAKARRIK narkaturiko mezuetan erabili"
++
++#: keymap_alldefs.h:168
++msgid "tag the current subthread"
++msgstr "Uneko hariazpia markatu"
++
++#: keymap_alldefs.h:169
++msgid "tag the current thread"
++msgstr "uneko haria markatu"
++
++#: keymap_alldefs.h:170
++msgid "toggle a message's 'new' flag"
++msgstr "Mezuaren 'berria' bandera aldatu"
++
++#: keymap_alldefs.h:171
++msgid "toggle whether the mailbox will be rewritten"
++msgstr "Poastkutxaren datuak berritzen direnean aldatu"
++
++#: keymap_alldefs.h:172
++msgid "toggle whether to browse mailboxes or all files"
++msgstr "postakutxak eta artxibo guztien ikustaldia aldatu"
++
++#: keymap_alldefs.h:173
++msgid "move to the top of the page"
++msgstr "orriaren goikaldera joan"
++
++#: keymap_alldefs.h:174
++msgid "undelete the current entry"
++msgstr "Uneko sarrera berreskuratu"
++
++#: keymap_alldefs.h:175
++msgid "undelete all messages in thread"
++msgstr "Hariko mezu guztiak berreskuratu."
++
++#: keymap_alldefs.h:176
++msgid "undelete all messages in subthread"
++msgstr "Hariazpiko mezu guztiak berreskuratu"
++
++#: keymap_alldefs.h:177
++msgid "show the Mutt version number and date"
++msgstr "Mutt bertsio zenbakia eta data erakutsi"
++
++#: keymap_alldefs.h:178
++msgid "view attachment using mailcap entry if necessary"
++msgstr "Gehigarria erakutsi beharrezkoa balitz mailcap sarrera erabiliaz"
++
++#: keymap_alldefs.h:179
++msgid "show MIME attachments"
++msgstr "MIME gehigarriak ikusi"
++
++#: keymap_alldefs.h:180
++msgid "display the keycode for a key press"
++msgstr "zanpatutakpo teklaren tekla-kodea erakutsi"
++
++#: keymap_alldefs.h:181
++msgid "show currently active limit pattern"
++msgstr "unean gaitutako patroiaren muga erakutsi"
++
++#: keymap_alldefs.h:182
++msgid "collapse/uncollapse current thread"
++msgstr "uneko haria zabaldu/trinkotu"
++
++#: keymap_alldefs.h:183
++msgid "collapse/uncollapse all threads"
++msgstr "hari guztiak zabaldu/trinkotu"
++
++#: keymap_alldefs.h:184
++msgid "attach a PGP public key"
++msgstr "PGP gako publikoa gehitu"
++
++#: keymap_alldefs.h:185
++msgid "show PGP options"
++msgstr "PGP aukerak ikusi"
++
++#: keymap_alldefs.h:186
++msgid "mail a PGP public key"
++msgstr "PGP gako publikoa ePostaz bidali"
++
++#: keymap_alldefs.h:187
++msgid "verify a PGP public key"
++msgstr "PGP gako publioa egiaztatu"
++
++#: keymap_alldefs.h:188
++msgid "view the key's user id"
++msgstr "gakoaren erbiltzaile id-a erakutsi"
++
++#: keymap_alldefs.h:189
++msgid "check for classic pgp"
++msgstr "pgp klasiko bila arakatu"
++
++#: keymap_alldefs.h:190
++msgid "Accept the chain constructed"
++msgstr "Eratutako katea onartu."
++
++#: keymap_alldefs.h:191
++msgid "Append a remailer to the chain"
++msgstr "kateari berbidaltze bat gehitu"
++
++#: keymap_alldefs.h:192
++msgid "Insert a remailer into the chain"
++msgstr "kateari berbidaltze bat gehitu"
++
++#: keymap_alldefs.h:193
++msgid "Delete a remailer from the chain"
++msgstr "kateari berbidaltze bat ezabatu"
++
++#: keymap_alldefs.h:194
++msgid "Select the previous element of the chain"
++msgstr "Katearen aurreko elementoa aukeratu"
++
++#: keymap_alldefs.h:195
++msgid "Select the next element of the chain"
++msgstr "Katearen hurrengo elementoa aukeratu"
++
++#: keymap_alldefs.h:196
++msgid "send the message through a mixmaster remailer chain"
++msgstr "mixmaster berbidalketa katearen bidez bidali mezua"
++
++#: keymap_alldefs.h:197
++msgid "make decrypted copy and delete"
++msgstr "enkriptatu gabeko kopia egin eta ezabatu"
++
++#: keymap_alldefs.h:198
++msgid "make decrypted copy"
++msgstr "enkriptatu gabeko kopia egin"
++
++#: keymap_alldefs.h:199
++msgid "wipe passphrase(s) from memory"
++msgstr "Pasahitza(k) memoriatik ezabatu"
++
++#: keymap_alldefs.h:200
++msgid "extract supported public keys"
++msgstr "Onartutako gako publikoak atera"
++
++#: keymap_alldefs.h:201
++msgid "show S/MIME options"
++msgstr "S/MIME aukerak ikusi"
++
++#: lib.c:126
++msgid "Integer overflow -- can't allocate memory!"
++msgstr "Osoko zenbakia iraultzea - ezin da memoria esleitu!"
++
++#: lib.c:133 lib.c:148 lib.c:180
++msgid "Out of memory!"
++msgstr "Memoriaz kanpo!"
++
++#: main.c:59
++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 ""
++
++#: main.c:63
++msgid ""
++"Copyright (C) 1996-2005 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 ""
++
++#: main.c:69
++msgid ""
++"Copyright (C) 1996-2004 Michael R. Elkins <me@mutt.org>\n"
++"Copyright (C) 1996-2002 Brandon Long <blong@fiction.net>\n"
++"Copyright (C) 1997-2005 Thomas Roessler <roessler@does-not-exist.org>\n"
++"Copyright (C) 1998-2005 Werner Koch <wk@isil.d.shuttle.de>\n"
++"Copyright (C) 1999-2005 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"
++"Many others not mentioned here contributed code, fixes,\n"
++"and suggestions.\n"
++msgstr ""
++
++#: main.c:81
++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"
++" the Free Software Foundation; either version 2 of the License, or\n"
++" (at your option) any later version.\n"
++"\n"
++" This program is distributed in the hope that it will be useful,\n"
++" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
++" GNU General Public License for more details.\n"
++msgstr ""
++
++#: main.c:91
++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 ""
++
++#: main.c:108
++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 ""
++
++#: main.c:116
++msgid ""
++"options:\n"
++" -A <alias>\texpand the given alias\n"
++" -a <file>\tattach a file to the message\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 ""
++
++#: main.c:124
++msgid " -d <level>\tlog debugging output to ~/.muttdebug0"
++msgstr ""
++
++#: main.c:127
++msgid ""
++" -e <command>\tspecify a command to be executed after initialization\n"
++" -f <file>\tspecify which mailbox to read\n"
++" -F <file>\tspecify an alternate muttrc file\n"
++" -H <file>\tspecify a draft file to read header and body from\n"
++" -i <file>\tspecify a file which Mutt should include in the body\n"
++" -m <type>\tspecify a default mailbox type\n"
++" -n\t\tcauses Mutt not to read the system Muttrc\n"
++" -p\t\trecall a postponed message"
++msgstr ""
++
++#: main.c:136
++msgid ""
++" -Q <variable>\tquery a configuration variable\n"
++" -R\t\topen mailbox in read-only mode\n"
++" -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
++" -v\t\tshow version and compile-time definitions\n"
++" -x\t\tsimulate the mailx send mode\n"
++" -y\t\tselect a mailbox specified in your `mailboxes' list\n"
++" -z\t\texit immediately if there are no messages in the mailbox\n"
++" -Z\t\topen the first folder with new message, exit immediately if none\n"
++" -h\t\tthis help message"
++msgstr ""
++
++#: main.c:185
++msgid ""
++"\n"
++"Compile options:"
++msgstr ""
++"\n"
++"Kompilazio aukerak:"
++
++#: main.c:494
++msgid "Error initializing terminal."
++msgstr "Errorea terminala abiaraztekoan."
++
++#: main.c:604
++#, c-format
++msgid "Debugging at level %d.\n"
++msgstr "%d. mailan arazten.\n"
++
++#: main.c:606
++msgid "DEBUG was not defined during compilation. Ignored.\n"
++msgstr "DEBUG ez dago kompilatzerakoan definiturik. Alde batetara uzten.\n"
++
++#: main.c:758
++#, c-format
++msgid "%s does not exist. Create it?"
++msgstr "%s ez da esistitzen. Sortu?"
++
++#: main.c:762
++#, c-format
++msgid "Can't create %s: %s."
++msgstr "Ezin da %s sortu: %s."
++
++#: main.c:807
++msgid "No recipients specified.\n"
++msgstr "Ez da jasotzailerik eman.\n"
++
++#: main.c:893
++#, c-format
++msgid "%s: unable to attach file.\n"
++msgstr "%s: ezin da fitxategia txertatu.\n"
++
++#: main.c:913
++msgid "No mailbox with new mail."
++msgstr "Ez da posta berririk postakutxetan"
++
++#: main.c:922
++msgid "No incoming mailboxes defined."
++msgstr "Ez da sarrera postakutxarik ezarri."
++
++#: main.c:950
++msgid "Mailbox is empty."
++msgstr "Postakutxa hutsik dago."
++
++#: mbox.c:129 mbox.c:288
++#, c-format
++msgid "Reading %s... %d (%d%%)"
++msgstr "%s irakurtzen... %d (%d%%)"
++
++#: mbox.c:153 mbox.c:210
++msgid "Mailbox is corrupt!"
++msgstr "Postakutxa hondaturik dago!"
++
++#: mbox.c:662
++msgid "Mailbox was corrupted!"
++msgstr "Postakutxa hondaturik zegoen!"
++
++#: mbox.c:701 mbox.c:952
++msgid "Fatal error! Could not reopen mailbox!"
++msgstr "Errore konponezina! Ezin da postakutxa berrireki!"
++
++#: mbox.c:710
++msgid "Unable to lock mailbox!"
++msgstr "Ezin da postakutxa blokeatu!"
++
++#. this means ctx->changed or ctx->deleted was set, but no
++#. * messages were found to be changed or deleted. This should
++#. * never happen, is we presume it is a bug in mutt.
++#.
++#: mbox.c:753
++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:792
++#, c-format
++msgid "Writing messages... %d (%d%%)"
++msgstr "Mezuak idazten... %d (%d%%)"
++
++#. copy the temp mailbox back into place starting at the first
++#. * change/deleted message
++#.
++#: mbox.c:905
++msgid "Committing changes..."
++msgstr "Aldaketak eguneratzen..."
++
++#: mbox.c:936
++#, c-format
++msgid "Write failed! Saved partial mailbox to %s"
++msgstr "Idazteak huts egin du! postakutxa zatia %s-n gorderik"
++
++#: mbox.c:1000
++msgid "Could not reopen mailbox!"
++msgstr "Ezin da postakutxa berrireki!"
++
++#: mbox.c:1035
++msgid "Reopening mailbox..."
++msgstr "Postakuxa berrirekitzen... "
++
++#: menu.c:419
++msgid "Jump to: "
++msgstr "Joan hona: "
++
++#: menu.c:428
++msgid "Invalid index number."
++msgstr "Baliogabeko sarrera zenbakia."
++
++#: menu.c:432 menu.c:453 menu.c:518 menu.c:561 menu.c:577 menu.c:588
++#: menu.c:599 menu.c:610 menu.c:623 menu.c:636 menu.c:1037
++msgid "No entries."
++msgstr "Ez dago sarrerarik."
++
++#: menu.c:450
++msgid "You cannot scroll down farther."
++msgstr "Ezin duzu hurrunago jeitsi."
++
++#: menu.c:468
++msgid "You cannot scroll up farther."
++msgstr "Ezin duzu hurrunago igo."
++
++#: menu.c:511
++msgid "You are on the first page."
++msgstr "Lehenengo orrialdean zaude."
++
++#: menu.c:512
++msgid "You are on the last page."
++msgstr "Azkenengo orrialdean zaude."
++
++#: menu.c:647
++msgid "You are on the last entry."
++msgstr "Azkenengo sarreran zaude."
++
++#: menu.c:658
++msgid "You are on the first entry."
++msgstr "Lehenengo sarreran zaude."
++
++#: menu.c:718 pattern.c:1308
++msgid "Search for: "
++msgstr "Bilatu hau:"
++
++#: menu.c:719 pattern.c:1309
++msgid "Reverse search for: "
++msgstr "Hau atzetik-aurrera begiratu:"
++
++#: menu.c:729 pattern.c:1341
++msgid "No search pattern."
++msgstr "Ez da bilaketa patroia aurkitu."
++
++#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1410
++msgid "Not found."
++msgstr "Ez da aurkitu."
++
++#: menu.c:889
++msgid "No tagged entries."
++msgstr "Ez dago markaturiko sarrerarik."
++
++#: menu.c:994
++msgid "Search is not implemented for this menu."
++msgstr "Menu honek ez du bilaketarik implementaturik."
++
++#: menu.c:999
++msgid "Jumping is not implemented for dialogs."
++msgstr "elkarrizketetan ez da saltorik implementatu"
++
++#: menu.c:1040
++msgid "Tagging is not supported."
++msgstr "Markatzea ez da onartzen."
++
++#: mh.c:667 mh.c:923
++#, c-format
++msgid "Reading %s... %d"
++msgstr "%s irakurtzen ... %d"
++
++#: mh.c:1203
++msgid "maildir_commit_message(): unable to set time on file"
++msgstr "maildir_commit_message(): fitxategian ezin da data ezarri"
++
++#: mutt_socket.c:91 mutt_socket.c:147
++#, c-format
++msgid "Connection to %s closed"
++msgstr "%s-rekiko konexioa itxia."
++
++#: mutt_socket.c:269
++msgid "SSL is unavailable."
++msgstr "SSL ez da erabilgarri"
++
++#: mutt_socket.c:300
++msgid "Preconnect command failed."
++msgstr "Aurrekonexio komandoak huts egin du."
++
++#: mutt_socket.c:371 mutt_socket.c:385
++#, c-format
++msgid "Error talking to %s (%s)"
++msgstr "Errorea %s (%s) komunikatzerakoan"
++
++#: mutt_socket.c:424 mutt_socket.c:482
++#, c-format
++msgid "Bad IDN \"%s\"."
++msgstr "IDN okerra \"%s\"."
++
++#: mutt_socket.c:431 mutt_socket.c:489
++#, c-format
++msgid "Looking up %s..."
++msgstr "%s Bilatzen..."
++
++#: mutt_socket.c:442 mutt_socket.c:496
++#, c-format
++msgid "Could not find the host \"%s\""
++msgstr "Ezin da \"%s\" hostalaria aurkitu"
++
++#: mutt_socket.c:447 mutt_socket.c:505
++#, c-format
++msgid "Connecting to %s..."
++msgstr "%s-ra konektartzen..."
++
++#: mutt_socket.c:529
++#, c-format
++msgid "Could not connect to %s (%s)."
++msgstr "Ezin da %s (%s)-ra konektatu."
++
++#: mutt_ssl.c:175
++msgid "Failed to find enough entropy on your system"
++msgstr "Huts zure sisteman entropia nahikoak bidaltzerakoan"
++
++#: mutt_ssl.c:199
++#, c-format
++msgid "Filling entropy pool: %s...\n"
++msgstr "Entropia elkarbiltzea betetzen: %s...\n"
++
++#: mutt_ssl.c:207
++#, c-format
++msgid "%s has insecure permissions!"
++msgstr "%s ziurtasun gabeko biamenak ditu!"
++
++#: mutt_ssl.c:226
++msgid "SSL disabled due the lack of entropy"
++msgstr "Entropia gabezia dela eta SSL ezgaitu egin da"
++
++#: mutt_ssl.c:322
++msgid "I/O error"
++msgstr "S/I errorea"
++
++#: mutt_ssl.c:331
++#, c-format
++msgid "SSL failed: %s"
++msgstr "SSL hutsa: %s"
++
++#: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
++#: mutt_ssl_gnutls.c:531
++msgid "Unable to get certificate from peer"
++msgstr "auzolagunengatik ezin da zertifikatua jaso"
++
++#: mutt_ssl.c:348
++#, c-format
++msgid "SSL connection using %s (%s)"
++msgstr "%s (%s) erabiltzen SSL konexioa"
++
++#: mutt_ssl.c:392
++msgid "Unknown"
++msgstr "Ezezaguna"
++
++#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381
++#, c-format
++msgid "[unable to calculate]"
++msgstr "[Ezin da kalkulatu]"
++
++#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404
++msgid "[invalid date]"
++msgstr "[balkiogabeko data]"
++
++#: mutt_ssl.c:556
++msgid "Server certificate is not yet valid"
++msgstr "Jadanik zerbitzari zertifikatua ez da baliozkoa"
++
++#: mutt_ssl.c:563
++msgid "Server certificate has expired"
++msgstr "Zerbitzariaren zertifikatua denboraz kanpo dago"
++
++#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
++msgid "This certificate belongs to:"
++msgstr "Zertifikatuaren jabea:"
++
++#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
++msgid "This certificate was issued by:"
++msgstr "Honek emandako zertifikatua:"
++
++#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
++#, c-format
++msgid "This certificate is valid"
++msgstr "Zertifikatu hau baliozkoa da"
++
++#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715
++#, c-format
++msgid " from %s"
++msgstr " %s-tik"
++
++#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719
++#, c-format
++msgid " to %s"
++msgstr " %s-ra"
++
++#: mutt_ssl.c:660
++#, c-format
++msgid "Fingerprint: %s"
++msgstr "Hatz-marka: %s"
++
++#: mutt_ssl.c:662
++msgid "SSL Certificate check"
++msgstr "SSL Zihurtagiri arakatzea"
++
++#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760
++msgid "(r)eject, accept (o)nce, (a)ccept always"
++msgstr "(u)katu, behin (o)nartu, (b)etirko onartu"
++
++#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761
++msgid "roa"
++msgstr "uob"
++
++#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765
++msgid "(r)eject, accept (o)nce"
++msgstr "(u)katu, behin (o)nartu"
++
++#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766
++msgid "ro"
++msgstr "uo"
++
++#: mutt_ssl.c:703 mutt_ssl_gnutls.c:815
++msgid "Warning: Couldn't save certificate"
++msgstr "Kontuz: Ezin da zihurtagiria gorde"
++
++#: mutt_ssl.c:708 mutt_ssl_gnutls.c:820
++msgid "Certificate saved"
++msgstr "Zihurtagiria gordea"
++
++#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117
++msgid "Error: no TLS socket open"
++msgstr "Errorea ez da TLS socket-ik ireki"
++
++#: mutt_ssl_gnutls.c:204
++msgid "All available protocols for TLS/SSL connection disabled"
++msgstr "TLS/SSL bidezko protokolo erabilgarri guztiak ezgaiturik"
++
++#: mutt_ssl_gnutls.c:265
++#, 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:508
++#, c-format
++msgid "Certificate verification error (%s)"
++msgstr "Ziurtagiria egiaztapen errorea (%s)"
++
++#: mutt_ssl_gnutls.c:516
++msgid "Certificate is not X.509"
++msgstr "Ziurtagiria ez da X.509"
++
++#: mutt_ssl_gnutls.c:523
++msgid "Error initialising gnutls certificate data"
++msgstr "Errorea gnutls ziurtagiri datuak abiaraztean"
++
++#: mutt_ssl_gnutls.c:539
++msgid "Error processing certificate data"
++msgstr "Errorea ziurtagiri datuak prozesatzerakoan"
++
++#: mutt_ssl_gnutls.c:724
++#, c-format
++msgid "SHA1 Fingerprint: %s"
++msgstr "SHA1 Hatz-marka: %s"
++
++#: mutt_ssl_gnutls.c:727
++#, c-format
++msgid "MD5 Fingerprint: %s"
++msgstr "MD5 Hatz-marka: %s"
++
++#: mutt_ssl_gnutls.c:732
++msgid "WARNING: Server certificate is not yet valid"
++msgstr "ABISUA Zerbitzari ziurtagiria ez baliozkoa dagoeneko"
++
++#: mutt_ssl_gnutls.c:737
++msgid "WARNING: Server certificate has expired"
++msgstr "ABISUA Zerbitzaria ziurtagiria iraungi egin da"
++
++#: mutt_ssl_gnutls.c:742
++msgid "WARNING: Server certificate has been revoked"
++msgstr "ABISUA Zerbitzariaziurtagiria errebokatu egin da"
++
++#: mutt_ssl_gnutls.c:747
++msgid "WARNING: Server hostname does not match certificate"
++msgstr "ABISUA Zerbitzari ostalari izena ez da ziurtagiriko berdina"
++
++#: mutt_ssl_gnutls.c:752
++msgid "WARNING: Signer of server certificate is not a CA"
++msgstr "WARNING: Zerbitzari ziurtagiri sinatzailea ez da CA"
++
++#: mutt_ssl_gnutls.c:755
++msgid "TLS/SSL Certificate check"
++msgstr "TLS/SSL Ziurtagiria egiaztapena"
++
++#: mutt_tunnel.c:70
++#, c-format
++msgid "Connecting with \"%s\"..."
++msgstr "\"%s\"-rekin konektatzen..."
++
++#: mutt_tunnel.c:137
++#, c-format
++msgid "Tunnel to %s returned error %d (%s)"
++msgstr "%s-rako tunelako %d errorea itzuli du (%s)"
++
++#: mutt_tunnel.c:155 mutt_tunnel.c:171
++#, c-format
++msgid "Tunnel error talking to %s: %s"
++msgstr "Tunel errorea %s-rekiko konexioan: %s"
++
++#: muttlib.c:910
++msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
++msgstr "Fitxategis direktorioa bat da, honen barnean gorde?[(b)ai, (e)z, d(a)na]\t"
++
++#: muttlib.c:910
++msgid "yna"
++msgstr "bea"
++
++#: muttlib.c:926
++msgid "File is a directory, save under it?"
++msgstr "Fitxategia direktorio bat da. Honen barnean gorde?"
++
++#: muttlib.c:932
++msgid "File under directory: "
++msgstr "Direkorio barneko fitxategiak: "
++
++#: muttlib.c:944
++msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
++msgstr "Fitxategia existitzen da (b)erridatzi, (g)ehitu edo (e)zeztatu?"
++
++#: muttlib.c:944
++msgid "oac"
++msgstr "bge"
++
++#: muttlib.c:1263
++msgid "Can't save message to POP mailbox."
++msgstr "Ezin da mezua POP postakutxan gorde."
++
++#: muttlib.c:1272
++#, c-format
++msgid "Append messages to %s?"
++msgstr "Mezuak %s-ra gehitu?"
++
++#: muttlib.c:1284
++#, c-format
++msgid "%s is not a mailbox!"
++msgstr "%s ez da postakutxa bat!"
++
++#: mx.c:120
++#, c-format
++msgid "Lock count exceeded, remove lock for %s?"
++msgstr "Blokeo kontua gainditua, %s-ren blokeoa ezabatu?"
++
++#: mx.c:132
++#, c-format
++msgid "Can't dotlock %s.\n"
++msgstr "Ezin inza da dotlock bidez %s blokeatu.\n"
++
++#: mx.c:190
++msgid "Timeout exceeded while attempting fcntl lock!"
++msgstr "fcntl lock itxaroten denbora amaitu da!"
++
++#: mx.c:196
++#, c-format
++msgid "Waiting for fcntl lock... %d"
++msgstr "fcntl lock itxaroten... %d"
++
++#: mx.c:224
++msgid "Timeout exceeded while attempting flock lock!"
++msgstr "flock lock itxaroten denbora amaitu da!"
++
++#: mx.c:231
++#, c-format
++msgid "Waiting for flock attempt... %d"
++msgstr "flock eskuratzea itxaroten... %d"
++
++#: mx.c:595
++#, c-format
++msgid "Couldn't lock %s\n"
++msgstr "Ezin da %s blokeatu\n"
++
++#: mx.c:679
++#, c-format
++msgid "Reading %s..."
++msgstr "%s Irakurtzen..."
++
++#: mx.c:779
++#, c-format
++msgid "Writing %s..."
++msgstr "%s idazten..."
++
++#: mx.c:812
++#, c-format
++msgid "Could not synchronize mailbox %s!"
++msgstr "Ezin da %s postakutxa eguneratu!"
++
++#: mx.c:878
++#, c-format
++msgid "Move read messages to %s?"
++msgstr "Irakurritako mezuak %s-ra mugitu?"
++
++#: mx.c:894 mx.c:1150
++#, c-format
++msgid "Purge %d deleted message?"
++msgstr "Ezabatutako %d mezua betirako ezabatu?"
++
++#: mx.c:894 mx.c:1150
++#, c-format
++msgid "Purge %d deleted messages?"
++msgstr "Ezabatutako %d mezuak betirako ezabatu?"
++
++#: mx.c:918
++#, c-format
++msgid "Moving read messages to %s..."
++msgstr "Irakurritako mezuak %s-ra mugitzen..."
++
++#: mx.c:977 mx.c:1141
++msgid "Mailbox is unchanged."
++msgstr "Postakutxak ez du aldaketarik."
++
++#: mx.c:1013
++#, c-format
++msgid "%d kept, %d moved, %d deleted."
++msgstr "%d utzi, %d mugiturik, %d ezabaturik"
++
++#: mx.c:1016 mx.c:1190
++#, c-format
++msgid "%d kept, %d deleted."
++msgstr "%d utzi, %d ezabaturik"
++
++#: mx.c:1126
++#, c-format
++msgid " Press '%s' to toggle write"
++msgstr " %s sakatu idatzitarikoa aldatzeko"
++
++#: mx.c:1128
++msgid "Use 'toggle-write' to re-enable write!"
++msgstr "'toogle-write' erabili idazketa berriz gaitzeko!"
++
++#: mx.c:1130
++#, c-format
++msgid "Mailbox is marked unwritable. %s"
++msgstr "Postakutxa idaztezin bezala markatuta. %s"
++
++#: mx.c:1187
++msgid "Mailbox checkpointed."
++msgstr "Postakutxa markaturik"
++
++#: mx.c:1499
++msgid "Can't write message"
++msgstr "Ezind a mezua idatzi."
++
++#: mx.c:1544
++msgid "Integer overflow -- can't allocate memory."
++msgstr "Integral gainezkatzea -- ezin da memoria esleitu"
++
++#: pager.c:1484
++msgid "PrevPg"
++msgstr "AurrekoOrria"
++
++#: pager.c:1485
++msgid "NextPg"
++msgstr "HurrengoOrria"
++
++#: pager.c:1489
++msgid "View Attachm."
++msgstr "Ikusi gehigar."
++
++#: pager.c:1492
++msgid "Next"
++msgstr "Hurrengoa"
++
++#. emulate "less -q" and don't go on to the next message.
++#: pager.c:1888 pager.c:1919 pager.c:1951 pager.c:2192
++msgid "Bottom of message is shown."
++msgstr "Mezuaren bukaera erakutsita dago."
++
++#: pager.c:1904 pager.c:1926 pager.c:1933 pager.c:1940
++msgid "Top of message is shown."
++msgstr "Mezuaren hasiera erakutsita dago."
++
++#: pager.c:2009
++msgid "Reverse search: "
++msgstr "Atzetik aurrera bilatu:"
++
++#: pager.c:2010
++msgid "Search: "
++msgstr "Bilatu: "
++
++#: pager.c:2130
++msgid "Help is currently being shown."
++msgstr "Laguntza erakutsirik dago."
++
++#: pager.c:2159
++msgid "No more quoted text."
++msgstr "Ez dago gakoarteko testu gehiago."
++
++#: pager.c:2172
++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:602
++msgid "multipart message has no boundary parameter!"
++msgstr "zati anitzeko mezuak ez du errebote parametrorik!"
++
++#: pattern.c:263
++#, c-format
++msgid "Error in expression: %s"
++msgstr "Espresioan errorea: %s"
++
++#: pattern.c:268
++#, c-format
++msgid "Empty expression"
++msgstr "Espresio hutsa"
++
++#: pattern.c:394
++#, c-format
++msgid "Invalid day of month: %s"
++msgstr "Baliogabeko hilabte eguna: %s"
++
++#: pattern.c:408
++#, c-format
++msgid "Invalid month: %s"
++msgstr "Baliogabeko hilabetea: %s"
++
++#. getDate has its own error message, don't overwrite it here
++#: pattern.c:560
++#, c-format
++msgid "Invalid relative date: %s"
++msgstr "Data erlatibo baliogabea: %s"
++
++#: pattern.c:574
++msgid "error in expression"
++msgstr "errorea espresioan"
++
++#: pattern.c:789 pattern.c:899
++#, c-format
++msgid "error in pattern at: %s"
++msgstr "Patroiean akatsa: %s"
++
++#: pattern.c:839
++#, c-format
++msgid "%c: invalid command"
++msgstr "%c: Baliogabeko komandoa"
++
++#: pattern.c:845
++#, c-format
++msgid "%c: not supported in this mode"
++msgstr "%c: Ez da onartzen modu honetan."
++
++#: pattern.c:858
++#, c-format
++msgid "missing parameter"
++msgstr "galdutako parametroa"
++
++#: pattern.c:874
++#, c-format
++msgid "mismatched parenthesis: %s"
++msgstr "parentesiak ez datoz bat: %s"
++
++#: pattern.c:906
++msgid "empty pattern"
++msgstr "patroi hutsa"
++
++#: pattern.c:1122
++#, c-format
++msgid "error: unknown op %d (report this error)."
++msgstr "errorea:%d aukera ezezaguna (errore honen berri eman)"
++
++#: pattern.c:1198 pattern.c:1327
++msgid "Compiling search pattern..."
++msgstr "Bilaketa patroia konpilatzen..."
++
++#: pattern.c:1217
++msgid "Executing command on matching messages..."
++msgstr "Markaturiko mezuetan komandoa abiarazten..."
++
++#: pattern.c:1280
++msgid "No messages matched criteria."
++msgstr "Ez eskatutako parametroetako mezurik aurkitu."
++
++#: pattern.c:1369
++msgid "Search hit bottom without finding match"
++msgstr "Bilaketa bukaeraraino iritsi da parekorik aurkitu gabe"
++
++#: pattern.c:1380
++msgid "Search hit top without finding match"
++msgstr "Bilaketa hasieraraino iritsi da parekorik aurkitu gabe"
++
++#: pattern.c:1402
++msgid "Search interrupted."
++msgstr "Bilaketa geldiarazirik."
++
++#: pgp.c:90
++msgid "Enter PGP passphrase:"
++msgstr "Sar PGP pasahitza:"
++
++#: pgp.c:104
++msgid "PGP passphrase forgotten."
++msgstr "PGP pasahitza ahazturik."
++
++#: pgp.c:353
++msgid "[-- Error: unable to create PGP subprocess! --]\n"
++msgstr "[-- Errorea: Ezin da PGP subprozesua sortu! --]\n"
++
++#: pgp.c:387 pgp.c:628 pgp.c:832
++msgid ""
++"[-- End of PGP output --]\n"
++"\n"
++msgstr ""
++"[-- PGP irteeraren amaiera --]\n"
++"\n"
++
++#: pgp.c:400 pgp.c:964
++msgid "Could not decrypt PGP message"
++msgstr "Ezin da PGP mezua desenkriptatu"
++
++#. clear 'Invoking...' message, since there's no error
++#: pgp.c:449 pgp.c:960
++msgid "PGP message successfully decrypted."
++msgstr "PGP mezua arrakastatsuki desenkriptatu da."
++
++#: pgp.c:736
++msgid "Internal error. Inform <roessler@does-not-exist.org>."
++msgstr "Barne arazoa. Berri eman <roessler@does-not-exist.org>."
++
++#: pgp.c:797
++msgid ""
++"[-- Error: could not create a PGP subprocess! --]\n"
++"\n"
++msgstr ""
++"[-- Errorea: ezin da PGP azpiprozesua sortu! --]\n"
++"\n"
++
++#: pgp.c:841
++msgid "Decryption failed"
++msgstr "Desenkriptazio hutsa"
++
++#: pgp.c:1016
++msgid "Can't open PGP subprocess!"
++msgstr "Ezin da PGP azpiprozesua ireki!"
++
++#: pgp.c:1452
++msgid "Can't invoke PGP"
++msgstr "Ezin da PGP deitu"
++
++#: pgp.c:1553
++#, c-format
++msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
++msgstr "PGP (e)nkript, (s)ina, sign (a)tu hola, (b)iak, %s, edo (g)arbitu? "
++
++#: pgp.c:1554
++msgid "PGP/M(i)ME"
++msgstr "PGP/M(i)ME"
++
++#: pgp.c:1554
++msgid "(i)nline"
++msgstr "(i)barnean"
++
++#: pgp.c:1556
++msgid "esabifc"
++msgstr "esabifg"
++
++#: pgpinvoke.c:307
++msgid "Fetching PGP key..."
++msgstr "PGP gakoa eskuratzen..."
++
++#: pgpkey.c:490
++msgid "All matching keys are expired, revoked, or disabled."
++msgstr ""
++"Aurkitutako gako guztiuak denboraz kanpo, errebokatutarik edo ezgaiturik "
++"daude."
++
++#: pgpkey.c:532
++#, c-format
++msgid "PGP keys matching <%s>."
++msgstr "aurkitutako PGP gakoak <%s>"
++
++#: pgpkey.c:534
++#, c-format
++msgid "PGP keys matching \"%s\"."
++msgstr "aurkitutako PGP gakoak \"%s\"."
++
++#: pgpkey.c:553 pgpkey.c:745
++msgid "Can't open /dev/null"
++msgstr "Ezin da /dev/mull ireki"
++
++#: pgpkey.c:724
++msgid "Please enter the key ID: "
++msgstr "Mesedez sar ezazu gako-ID-a: "
++
++#: pgpkey.c:752
++msgid "Invoking pgp..."
++msgstr "pgp deitzen..."
++
++#: pgpkey.c:777
++#, c-format
++msgid "PGP Key %s."
++msgstr "PGP Gakoa %s."
++
++#: pop.c:91 pop_lib.c:201
++#, c-format
++msgid "Command TOP is not supported by server."
++msgstr "TOP komandoa ez du zerbitzariak onartzen."
++
++#: pop.c:118
++msgid "Can't write header to temporary file!"
++msgstr "Ezin da burua fitxategi tenporalean gorde!"
++
++#: pop.c:199 pop_lib.c:203
++#, c-format
++msgid "Command UIDL is not supported by server."
++msgstr "UIDL komandoa ez du zerbitzariak onartzen."
++
++#: pop.c:248 pop.c:565
++#, c-format
++msgid "%s is an invalid POP path"
++msgstr "%s ez da baliozko datu-bidea"
++
++#: pop.c:279
++msgid "Fetching list of messages..."
++msgstr "Mezuen zerrenda eskuratzen..."
++
++#: pop.c:418
++msgid "Can't write message to temporary file!"
++msgstr "Ezin da mezua fitxategi tenporalean gorde!"
++
++#: pop.c:520 pop.c:585
++msgid "Checking for new messages..."
++msgstr "Mezu berriak bilatzen..."
++
++#: pop.c:549
++msgid "POP host is not defined."
++msgstr "POP hostalaria ez dago ezarririk."
++
++#: pop.c:613
++msgid "No new mail in POP mailbox."
++msgstr "Ez dago posta berririk POP postakutxan."
++
++#: pop.c:620
++msgid "Delete messages from server?"
++msgstr "Zerbitzaritik mezuak ezabatu?"
++
++#: pop.c:622
++#, c-format
++msgid "Reading new messages (%d bytes)..."
++msgstr "Mezu berriak irakurtzen (%d byte)..."
++
++#: pop.c:664
++msgid "Error while writing mailbox!"
++msgstr "Postakutxa idazterakoan errorea!"
++
++#: pop.c:668
++#, c-format
++msgid "%s [%d of %d messages read]"
++msgstr "%s [%d-tik %d mezu irakurririk]"
++
++#: pop.c:691 pop_lib.c:373
++msgid "Server closed connection!"
++msgstr "Zerbitzariak konexioa itxi du!"
++
++#: pop_auth.c:79
++msgid "Authenticating (SASL)..."
++msgstr "(SASL) autentifikazioa..."
++
++#: pop_auth.c:184
++msgid "Authenticating (APOP)..."
++msgstr "Autetifikatzen (APOP)..."
++
++#: pop_auth.c:208
++msgid "APOP authentication failed."
++msgstr "APOP autentifikazioak huts egin du."
++
++#: pop_auth.c:243
++#, c-format
++msgid "Command USER is not supported by server."
++msgstr "USER komandoa ez du zerbitzariak onartzen."
++
++#: pop_lib.c:199
++msgid "Unable to leave messages on server."
++msgstr "Ezin dira mezuak zerbitzarian utzi."
++
++#: pop_lib.c:229
++#, c-format
++msgid "Error connecting to server: %s"
++msgstr "Errorea zerbitzariarekin konektatzerakoan: %s"
++
++#: pop_lib.c:387
++msgid "Closing connection to POP server..."
++msgstr "POP Zerbitzariarekiko konexioa itxen..."
++
++#: pop_lib.c:557
++msgid "Verifying message indexes..."
++msgstr "Mezu indizea egiaztatzen..."
++
++#: pop_lib.c:580
++msgid "Connection lost. Reconnect to POP server?"
++msgstr "Konexioa galdua. POP zerbitzariarekiko konexio berrasi?"
++
++#: postpone.c:167
++msgid "Postponed Messages"
++msgstr "Atzeratutako mezuak"
++
++#: postpone.c:247 postpone.c:256
++msgid "No postponed messages."
++msgstr "Ez da atzeraturiko mezurik."
++
++#: postpone.c:442 postpone.c:463 postpone.c:497
++msgid "Illegal PGP header"
++msgstr "BAliogabeko PGP burukoa"
++
++#: postpone.c:483
++msgid "Illegal S/MIME header"
++msgstr "Baliogabeko S/MIME burukoa"
++
++#: postpone.c:556
++msgid "Decrypting message..."
++msgstr "Mezua desenkriptatzen..."
++
++#: postpone.c:565
++msgid "Decryption failed."
++msgstr "Deskribapenak huts egin du."
++
++#: query.c:50
++msgid "New Query"
++msgstr "Bilaketa berria"
++
++#: query.c:51
++msgid "Make Alias"
++msgstr "Aliasa egin"
++
++#: query.c:52
++msgid "Search"
++msgstr "Bilatu"
++
++#: query.c:99
++msgid "Waiting for response..."
++msgstr "Erantzunaren zai..."
++
++#: query.c:235 query.c:263
++msgid "Query command not defined."
++msgstr "Bilaketa komadoa ezarri gabea."
++
++#: query.c:290
++#, c-format
++msgid "Query"
++msgstr "Bilaketa"
++
++#. Prompt for Query
++#: query.c:303 query.c:328
++msgid "Query: "
++msgstr "Bilaketa: "
++
++#: query.c:311 query.c:337
++#, c-format
++msgid "Query '%s'"
++msgstr "Bilaketa '%s'"
++
++#: recvattach.c:56
++msgid "Pipe"
++msgstr "Hodia"
++
++#: recvattach.c:57
++msgid "Print"
++msgstr "Inprimatu"
++
++#: recvattach.c:435
++msgid "Saving..."
++msgstr "Gordetzen..."
++
++#: recvattach.c:438 recvattach.c:527
++msgid "Attachment saved."
++msgstr "Gehigarria gordea."
++
++#: recvattach.c:539
++#, c-format
++msgid "WARNING! You are about to overwrite %s, continue?"
++msgstr "KONTUZ! %s gainetik idaztera zoaz. Jarraitu ?"
++
++#: recvattach.c:557
++msgid "Attachment filtered."
++msgstr "Gehigarria iragazirik."
++
++#: recvattach.c:624
++msgid "Filter through: "
++msgstr "Honen arabera iragazi:"
++
++#: recvattach.c:624
++msgid "Pipe to: "
++msgstr "komandora hodia egin:"
++
++#: recvattach.c:659
++#, c-format
++msgid "I dont know how to print %s attachments!"
++msgstr "Ez dakit nola imprimatu %s gehigarriak!"
++
++#: recvattach.c:724
++msgid "Print tagged attachment(s)?"
++msgstr "Markaturiko mezua(K) imprimatu?"
++
++#: recvattach.c:724
++msgid "Print attachment?"
++msgstr "Gehigarria imprimatu?"
++
++#: recvattach.c:957
++msgid "Can't decrypt encrypted message!"
++msgstr "Ezin da enkriptaturiko mezua desenkriptratu!"
++
++#: recvattach.c:970
++msgid "Attachments"
++msgstr "Gehigarriak"
++
++#: recvattach.c:1006
++msgid "There are no subparts to show!"
++msgstr "Hemen ez dago erakusteko azpizatirik!"
++
++#: recvattach.c:1067
++msgid "Can't delete attachment from POP server."
++msgstr "Ezi da gehigarria POP zerbitzaritik ezabatu."
++
++#: recvattach.c:1075
++msgid "Deletion of attachments from encrypted messages is unsupported."
++msgstr "Enkriptaturiko mezuetatik gehigarriak ezabatzea ez da onartzen."
++
++#: recvattach.c:1094 recvattach.c:1111
++msgid "Only deletion of multipart attachments is supported."
++msgstr "Zati anitzetako gehigarrien ezabaketa bakarrik onartzen da."
++
++#: recvcmd.c:47
++msgid "You may only bounce message/rfc822 parts."
++msgstr "Bakarrik message/rfc822 moetatako zatiak errebota ditzazkezu."
++
++#: recvcmd.c:217
++msgid "Error bouncing message!"
++msgstr "Errorea mezua errebotatzerakoan!"
++
++#: recvcmd.c:217
++msgid "Error bouncing messages!"
++msgstr "Errorea mezuak errebotatzerakoan!"
++
++#: recvcmd.c:417
++#, c-format
++msgid "Can't open temporary file %s."
++msgstr "Ezind a %s fitxategi tenporala ireki."
++
++#: recvcmd.c:448
++msgid "Forward as attachments?"
++msgstr "Gehigarri bezala berbidali?"
++
++#: recvcmd.c:462
++msgid "Can't decode all tagged attachments. MIME-forward the others?"
++msgstr "Ezin dira markaturiko mezu guztiak dekofikatu. Besteak MIME bezala bialdu?"
++
++#: recvcmd.c:587
++msgid "Forward MIME encapsulated?"
++msgstr "MIME enkapsulaturik berbidali?"
++
++#: recvcmd.c:595 recvcmd.c:845
++#, c-format
++msgid "Can't create %s."
++msgstr "Ezin da %s sortu."
++
++#: recvcmd.c:728
++msgid "Can't find any tagged messages."
++msgstr "Ezin da markaturiko mezurik aurkitu."
++
++#: recvcmd.c:749 send.c:721
++msgid "No mailing lists found!"
++msgstr "Ez da ePosta zerrendarik aurkitu"
++
++#: recvcmd.c:824
++msgid "Can't decode all tagged attachments. MIME-encapsulate the others?"
++msgstr "Ezin dira markaturiko mezu guztiak dekodifikatu. MIME enkapsulatu besteak?"
++
++#: remailer.c:484
++msgid "Append"
++msgstr "Gehitu"
++
++#: remailer.c:485
++msgid "Insert"
++msgstr "Txertatu"
++
++#: remailer.c:486
++msgid "Delete"
++msgstr "Ezabatu"
++
++#: remailer.c:488
++msgid "OK"
++msgstr "Ados"
++
++#: remailer.c:516
++msgid "Can't get mixmaster's type2.list!"
++msgstr "mixmaster's type2.zerrenda ezin da eskuratu!"
++
++#: remailer.c:542
++msgid "Select a remailer chain."
++msgstr "berbidaltze katea aukeratu."
++
++#: 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 bebidaltzaile bezala erabili."
++
++#: remailer.c:632
++#, c-format
++msgid "Mixmaster chains are limited to %d elements."
++msgstr "Mixmaster kateak %d elementuetara mugaturik daude."
++
++#: remailer.c:655
++msgid "The remailer chain is already empty."
++msgstr "Berbidaltzaile katea dagoeneko betea dago."
++
++#: remailer.c:665
++msgid "You already have the first chain element selected."
++msgstr "Zuk dagoeneko kateko lehenengo elementua aukeraturik duzu."
++
++#: remailer.c:675
++msgid "You already have the last chain element selected."
++msgstr "Zuk dagoeneko kateko azkenengo elementua aukeraturik duzu."
++
++#: remailer.c:714
++msgid "Mixmaster doesn't accept Cc or Bcc headers."
++msgstr "Miixmasterrek ez du Cc eta Bcc burukorik onartzen."
++
++#: remailer.c:738
++msgid "Please set the hostname variable to a proper value when using mixmaster!"
++msgstr "Mesdez ezarri mixmaster erabiltzen denerako hostalari izen egokia!"
++
++#: remailer.c:772
++#, c-format
++msgid "Error sending message, child exited %d.\n"
++msgstr "Errorea mezua bidaltzerakoan, azpiprozesua uzten %d.\n"
++
++#: remailer.c:776
++msgid "Error sending message."
++msgstr "Errorea mezua bidaltzerakoan."
++
++#: rfc1524.c:163
++#, c-format
++msgid "Improperly formated entry for type %s in \"%s\" line %d"
++msgstr "Gaizki eratutako %s moetatako sarrera \"%s\"-n %d lerroan"
++
++#: rfc1524.c:395
++msgid "No mailcap path specified"
++msgstr "Ez da mailcap bidea ezarri"
++
++#: rfc1524.c:423
++#, c-format
++msgid "mailcap entry for type %s not found"
++msgstr "Ez da aurkitu %s moetatako mailcap sarrerarik"
++
++#: score.c:75
++msgid "score: too few arguments"
++msgstr "score: argumentu gutxiegi"
++
++#: score.c:84
++msgid "score: too many arguments"
++msgstr "score: argumentu gehiegi"
++
++#: send.c:252
++msgid "No subject, abort?"
++msgstr "Ez du gairik, ezeztatu?"
++
++#: send.c:254
++msgid "No subject, aborting."
++msgstr "Ez du gairik, ezeztatzen."
++
++#. There are quite a few mailing lists which set the Reply-To:
++#. * header field to the list address, which makes it quite impossible
++#. * to send a message to only the sender of the message. This
++#. * provides a way to do that.
++#.
++#: send.c:488
++#, c-format
++msgid "Reply to %s%s?"
++msgstr "%s%s-ra erantzun?"
++
++#: send.c:522
++#, c-format
++msgid "Follow-up to %s%s?"
++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:696
++msgid "No tagged messages are visible!"
++msgstr "Ez da markatutako mezu ikusgarririk!"
++
++#: send.c:747
++msgid "Include message in reply?"
++msgstr "Erantzunean mezua gehitu?"
++
++#: send.c:752
++msgid "Including quoted message..."
++msgstr "markaturiko mezua gehitzen..."
++
++#: send.c:762
++msgid "Could not include all requested messages!"
++msgstr "Ezin dira reskaturiko mezu guztiak gehitu!"
++
++#: send.c:776
++msgid "Forward as attachment?"
++msgstr "Gehigarri gisa berbidali?"
++
++#: send.c:780
++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:1077
++msgid "Recall postponed message?"
++msgstr "Atzeraturiko mezuak artu?"
++
++#: send.c:1379
++msgid "Edit forwarded message?"
++msgstr "berbidalitako mezua editatu?"
++
++#: send.c:1407
++msgid "Abort unmodified message?"
++msgstr "Aldatugabeko mezua ezeztatu?"
++
++#: send.c:1409
++msgid "Aborted unmodified message."
++msgstr "Aldatugabeko mezua ezeztatuta."
++
++#: send.c:1478
++msgid "Message postponed."
++msgstr "MEzua atzeraturik."
++
++#: send.c:1487
++msgid "No recipients are specified!"
++msgstr "Ez da hartzailerik eman!"
++
++#: send.c:1492
++msgid "No recipients were specified."
++msgstr "Ez zen hartzailerik eman."
++
++#: send.c:1508
++msgid "No subject, abort sending?"
++msgstr "Ez dago gairik, bidalketa ezeztatzen?"
++
++#: send.c:1512
++msgid "No subject specified."
++msgstr "Ez da gairik ezarri."
++
++#: send.c:1574
++msgid "Sending message..."
++msgstr "Mezua bidaltzen..."
++
++#: send.c:1715
++msgid "Could not send the message."
++msgstr "Ezin da mezua bidali."
++
++#: send.c:1720
++msgid "Mail sent."
++msgstr "MEzua bidalirik."
++
++#: send.c:1720
++msgid "Sending in background."
++msgstr "Bigarren planoan bidaltzen."
++
++#: sendlib.c:410
++msgid "No boundary parameter found! [report this error]"
++msgstr "Ez da birbidalketa parametroa aurkitu! [errore honen berri eman]"
++
++#: sendlib.c:440
++#, c-format
++msgid "%s no longer exists!"
++msgstr "%s ez da gehiago esistitzen!"
++
++#: sendlib.c:862
++#, c-format
++msgid "%s isn't a regular file."
++msgstr "%s ez da fitxategi erregularra."
++
++#: sendlib.c:1031
++#, c-format
++msgid "Could not open %s"
++msgstr "Ezin da %s ireki"
++
++#: sendlib.c:1996
++#, c-format
++msgid "Error sending message, child exited %d (%s)."
++msgstr "Errorea mezua bidaltzerakoan, azpiprozesua irteten %d (%s)."
++
++#: sendlib.c:2002
++msgid "Output of the delivery process"
++msgstr "postaketa prozesuaren irteera"
++
++#: sendlib.c:2208
++#, c-format
++msgid "Bad IDN %s while preparing resent-from."
++msgstr "%s berbidalketa imprimakia prestatzerakoan IDN okerra."
++
++#: signal.c:43
++#, c-format
++msgid "%s... Exiting.\n"
++msgstr "%s... Irteten.\n"
++
++#: signal.c:46 signal.c:49
++#, c-format
++msgid "Caught %s... Exiting.\n"
++msgstr "Mozten %s... Uzten.\n"
++
++#: signal.c:51
++#, c-format
++msgid "Caught signal %d... Exiting.\n"
++msgstr "Mozte seinalea %d... Irteten.\n"
++
++#: smime.c:111
++msgid "Enter S/MIME passphrase:"
++msgstr "Sartu S/MIME pasahitza:"
++
++#: smime.c:321
++msgid "Trusted "
++msgstr "Fidagarria "
++
++#: smime.c:324
++msgid "Verified "
++msgstr "Egiaztaturik "
++
++#: smime.c:327
++msgid "Unverified"
++msgstr "Egiaztatu gabea"
++
++#: smime.c:330
++msgid "Expired "
++msgstr "Denboraz kanpo "
++
++#: smime.c:333
++msgid "Revoked "
++msgstr "Errebokaturik "
++
++#: smime.c:336
++msgid "Invalid "
++msgstr "Baliogabea "
++
++#: smime.c:339
++msgid "Unknown "
++msgstr "Ezezaguna "
++
++#: smime.c:368
++msgid "Enter keyID: "
++msgstr "IDgakoa sartu: "
++
++#: smime.c:391
++#, c-format
++msgid "S/MIME certificates matching \"%s\"."
++msgstr "S/MIME zertifitaua aurkiturik \"%s\"."
++
++#: smime.c:541 smime.c:611 smime.c:629
++#, 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?"
++
++#: smime.c:545 smime.c:615
++#, c-format
++msgid "Use (untrusted!) ID %s for %s ?"
++msgstr "Erabili (segurtasun gabeko!) %s ID-a %s-rentzat?"
++
++#: smime.c:548 smime.c:618
++#, c-format
++msgid "Use ID %s for %s ?"
++msgstr "ID %s erabili %s-rentzat?"
++
++#: smime.c:637
++#, 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:796
++#, c-format
++msgid "No (valid) certificate found for %s."
++msgstr "Ez da (baliozko) zertifikaturik aurkitu %s-rentzat."
++
++#: smime.c:851 smime.c:879 smime.c:944 smime.c:988 smime.c:1053 smime.c:1128
++msgid "Error: unable to create OpenSSL subprocess!"
++msgstr "Errorea: Ezin da OpenSSL azpiprozesua sortu!"
++
++#: smime.c:1206
++msgid "no certfile"
++msgstr "Zertifikatu gabea"
++
++#: smime.c:1209
++msgid "no mbox"
++msgstr "ez dago postakutxarik"
++
++#. fatal error while trying to encrypt message
++#: smime.c:1352
++msgid "No output from OpenSSL.."
++msgstr "Ez dago OpenSSL irteerarik.."
++
++#: smime.c:1390
++msgid "Warning: Intermediate certificate not found."
++msgstr "Kontuz: biderdiko zihurtagiria ezin da aurkitu."
++
++#: smime.c:1433
++msgid "Can't open OpenSSL subprocess!"
++msgstr "Ezin da OpenSSL azpiprozesua ireki!"
++
++#: smime.c:1471
++msgid "No output from OpenSSL..."
++msgstr "Ez dago irteerarik OpenSSL-tik..."
++
++#: smime.c:1636 smime.c:1760
++msgid ""
++"[-- End of OpenSSL output --]\n"
++"\n"
++msgstr ""
++"[-- OpenSSL ireteeraren bukaera --]\n"
++"\n"
++
++#: smime.c:1720 smime.c:1731
++msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
++msgstr "[-- Errorea: Ezin da OpenSSL azpiprozesua sortu!--]\n"
++
++#: smime.c:1764
++msgid "[-- The following data is S/MIME encrypted --]\n"
++msgstr "[-- Honako datu hauek S/MIME enkriptatutik daude --]\n"
++
++#: smime.c:1767
++msgid "[-- The following data is S/MIME signed --]\n"
++msgstr "[-- Hurrengo datu hauek S/MIME sinaturik daude --]\n"
++
++#: smime.c:1831
++msgid ""
++"\n"
++"[-- End of S/MIME encrypted data. --]\n"
++msgstr ""
++"\n"
++"[-- S/MIME enkriptaturiko duen amaiera --]\n"
++
++#: smime.c:1833
++msgid ""
++"\n"
++"[-- End of S/MIME signed data. --]\n"
++msgstr ""
++"\n"
++"[-- S/MIME sinatutako datuen amaiera. --]\n"
++
++#: smime.c:1944
++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?"
++
++#: smime.c:1945
++msgid "eswabfc"
++msgstr "eshabfc"
++
++#: smime.c:1954
++msgid "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
++msgstr "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, edo berau a(h)aztu? "
++
++#: smime.c:1956
++msgid "12345f"
++msgstr "12345h"
++
++#: smime.c:1980
++msgid "Can't sign: No key specified. Use Sign As."
++msgstr "Ezin da sinatu. Ez da gakorik ezarri. HonelA siantu erabili."
++
++#: sort.c:259
++msgid "Sorting mailbox..."
++msgstr "Postakutxa ordenatzen..."
++
++#: sort.c:296
++msgid "Could not find sorting function! [report this bug]"
++msgstr "Ezin da ordentza funtzioa aurkitu! [zorri honen berri eman]"
++
++#: status.c:106
++msgid "(no mailbox)"
++msgstr "(ez dago postakutxarik)"
++
++#: thread.c:1089
++msgid "Parent message is not visible in this limited view."
++msgstr "Jatorrizko mezua ez da ikusgarria bistaratze mugatu honetan."
++
++#: thread.c:1095
++msgid "Parent message is not available."
++msgstr "Aurreko mezua ez da eskuragarri."
++
+Index: mutt/po/fr.po
+===================================================================
+RCS file: /home/roessler/cvs/mutt/po/fr.po,v
+retrieving revision 3.39
+retrieving revision 3.41
+diff -u -p -r3.39 -r3.41
+--- mutt/po/fr.po 17 Sep 2005 20:46:12 -0000 3.39
++++ mutt/po/fr.po 18 Oct 2005 07:04:50 -0000 3.41
+@@ -8,10 +8,10 @@
+ # , fuzzy
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: Mutt 1.5.11\n"
++"Project-Id-Version: Mutt 1.5.11-20051017\n"
+ "Report-Msgid-Bugs-To: \n"
+-"POT-Creation-Date: 2005-09-17 02:35+0200\n"
+-"PO-Revision-Date: 2005-09-17 02:37+0200\n"
++"POT-Creation-Date: 2005-10-17 23:22+0200\n"
++"PO-Revision-Date: 2005-10-17 23:22+0200\n"
+ "Last-Translator: Vincent Lefevre <vincent@vinc17.org>\n"
+ "Language-Team: mutt-dev <mutt-dev@mutt.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -21,20 +21,20 @@ msgstr ""
+ #: account.c:154
+ #, c-format
+ msgid "Username at %s: "
+-msgstr "Nom d'utilisateur sur %s : "
++msgstr "Nom d'utilisateur sur %s : "
+
+ # , c-format
+ #: account.c:209
+ #, c-format
+ msgid "Password for %s@%s: "
+-msgstr "Mot de passe pour %s@%s : "
++msgstr "Mot de passe pour %s@%s : "
+
+-#: addrbook.c:37 browser.c:45 pager.c:1483 postpone.c:43 query.c:48
++#: addrbook.c:37 browser.c:45 pager.c:1487 postpone.c:43 query.c:48
+ #: recvattach.c:54
+ msgid "Exit"
+ msgstr "Quitter"
+
+-#: addrbook.c:38 curs_main.c:407 pager.c:1490 postpone.c:44
++#: addrbook.c:38 curs_main.c:407 pager.c:1494 postpone.c:44
+ msgid "Del"
+ msgstr "Effacer"
+
+@@ -48,14 +48,14 @@ msgstr "Sélectionner"
+
+ #. __STRCAT_CHECKED__
+ #: addrbook.c:41 browser.c:48 compose.c:96 crypt-gpgme.c:3569 curs_main.c:413
+-#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1582 pgpkey.c:521
++#: mutt_ssl.c:678 mutt_ssl_gnutls.c:772 pager.c:1586 pgpkey.c:521
+ #: postpone.c:46 query.c:53 recvattach.c:58 smime.c:436
+ msgid "Help"
+ msgstr "Aide"
+
+ #: addrbook.c:145
+ msgid "You have no aliases!"
+-msgstr "Vous n'avez pas défini d'alias !"
++msgstr "Vous n'avez pas défini d'alias !"
+
+ #: addrbook.c:156
+ msgid "Aliases"
+@@ -64,19 +64,19 @@ msgstr "Alias"
+ #. add a new alias
+ #: alias.c:246
+ msgid "Alias as: "
+-msgstr "Créer l'alias : "
++msgstr "Créer l'alias : "
+
+ #: alias.c:252
+ msgid "You already have an alias defined with that name!"
+-msgstr "Vous avez déjà défini un alias ayant ce nom !"
++msgstr "Vous avez déjà défini un alias ayant ce nom !"
+
+ #: alias.c:258
+ msgid "Warning: This alias name may not work. Fix it?"
+-msgstr "Attention : ce nom d'alias peut ne pas fonctionner. Corriger ?"
++msgstr "Attention : ce nom d'alias peut ne pas fonctionner. Corriger ?"
+
+ #: alias.c:283
+ msgid "Address: "
+-msgstr "Adresse : "
++msgstr "Adresse : "
+
+ #: alias.c:293 send.c:206
+ #, c-format
+@@ -85,18 +85,18 @@ msgstr "Erreur : '%s' est un mauvais IDN
+
+ #: alias.c:305
+ msgid "Personal name: "
+-msgstr "Nom de la personne : "
++msgstr "Nom de la personne : "
+
+ # , c-format
+ #: alias.c:314
+ #, c-format
+ msgid "[%s = %s] Accept?"
+-msgstr "[%s = %s] Accepter ?"
++msgstr "[%s = %s] Accepter ?"
+
+-#: alias.c:331 recvattach.c:394 recvattach.c:417 recvattach.c:430
+-#: recvattach.c:443 recvattach.c:471
++#: alias.c:331 recvattach.c:411 recvattach.c:434 recvattach.c:447
++#: recvattach.c:460 recvattach.c:488
+ msgid "Save to file: "
+-msgstr "Sauver dans le fichier : "
++msgstr "Sauver dans le fichier : "
+
+ #: alias.c:346
+ msgid "Alias added."
+@@ -104,7 +104,7 @@ msgstr "Alias ajouté."
+
+ #: attach.c:113 attach.c:245 attach.c:477 attach.c:968
+ msgid "Can't match nametemplate, continue?"
+-msgstr "Ne correspond pas au nametemplate, continuer ?"
++msgstr "Ne correspond pas au nametemplate, continuer ?"
+
+ #. For now, editing requires a file, no piping
+ #: attach.c:126
+@@ -112,11 +112,11 @@ msgstr "Ne correspond pas au nametemplat
+ msgid "Mailcap compose entry requires %%s"
+ msgstr "L'entrée compose du fichier mailcap nécessite %%s"
+
+-#: attach.c:134 attach.c:266 commands.c:221 compose.c:1183 curs_lib.c:179
+-#: curs_lib.c:458
++#: attach.c:134 attach.c:266 commands.c:221 compose.c:1183 curs_lib.c:166
++#: curs_lib.c:444
+ #, c-format
+ msgid "Error running \"%s\"!"
+-msgstr "Erreur en exécutant \"%s\" !"
++msgstr "Erreur en exécutant \"%s\" !"
+
+ #: attach.c:144
+ msgid "Failure to open file to parse headers."
+@@ -167,11 +167,11 @@ msgstr "Impossible de créer le filtre"
+
+ #: attach.c:840
+ msgid "Write fault!"
+-msgstr "Erreur d'écriture !"
++msgstr "Erreur d'écriture !"
+
+ #: attach.c:1082
+ msgid "I don't know how to print that!"
+-msgstr "Je ne sais pas comment imprimer ceci !"
++msgstr "Je ne sais pas comment imprimer ceci !"
+
+ #: browser.c:46
+ msgid "Chdir"
+@@ -182,7 +182,7 @@ msgid "Mask"
+ msgstr "Masque"
+
+ # , c-format
+-#: browser.c:382 browser.c:990
++#: browser.c:382 browser.c:995
+ #, c-format
+ msgid "%s is not a directory."
+ msgstr "%s n'est pas un répertoire."
+@@ -197,80 +197,80 @@ msgstr "Boîtes aux lettres [%d]"
+ #: browser.c:509
+ #, c-format
+ msgid "Subscribed [%s], File mask: %s"
+-msgstr "Abonné [%s], masque de fichier : %s"
++msgstr "Abonné [%s], masque de fichier : %s"
+
+ # , c-format
+ #: browser.c:513
+ #, c-format
+ msgid "Directory [%s], File mask: %s"
+-msgstr "Répertoire [%s], masque de fichier : %s"
++msgstr "Répertoire [%s], masque de fichier : %s"
+
+ #: browser.c:525
+ msgid "Can't attach a directory!"
+-msgstr "Impossible d'attacher un répertoire !"
++msgstr "Impossible d'attacher un répertoire !"
+
+-#: browser.c:656 browser.c:1057 browser.c:1154
++#: browser.c:657 browser.c:1063 browser.c:1161
+ msgid "No files match the file mask"
+ msgstr "Aucun fichier ne correspond au masque"
+
+-#: browser.c:861
++#: browser.c:863
+ msgid "Create is only supported for IMAP mailboxes"
+ msgstr "La création n'est supportée que pour les boîtes aux lettres IMAP"
+
+-#: browser.c:881
++#: browser.c:884
+ msgid "Rename is only supported for IMAP mailboxes"
+ msgstr "Le renommage n'est supporté que pour les boîtes aux lettres IMAP"
+
+-#: browser.c:902
++#: browser.c:906
+ msgid "Delete is only supported for IMAP mailboxes"
+ msgstr "La suppression n'est supportée que pour les boîtes aux lettres IMAP"
+
+-#: browser.c:910
++#: browser.c:914
+ #, c-format
+ msgid "Really delete mailbox \"%s\"?"
+-msgstr "Voulez-vous vraiment supprimer la boîte aux lettres \"%s\" ?"
++msgstr "Voulez-vous vraiment supprimer la boîte aux lettres \"%s\" ?"
+
+-#: browser.c:924
++#: browser.c:928
+ msgid "Mailbox deleted."
+ msgstr "Boîte aux lettres supprimée."
+
+-#: browser.c:930
++#: browser.c:934
+ msgid "Mailbox not deleted."
+ msgstr "Boîte aux lettres non supprimée."
+
+-#: browser.c:949
++#: browser.c:953
+ msgid "Chdir to: "
+-msgstr "Changement de répertoire vers : "
++msgstr "Changement de répertoire vers : "
+
+-#: browser.c:978 browser.c:1050
++#: browser.c:983 browser.c:1056
+ msgid "Error scanning directory."
+ msgstr "Erreur de lecture du répertoire."
+
+-#: browser.c:1001
++#: browser.c:1006
+ msgid "File Mask: "
+-msgstr "Masque de fichier : "
++msgstr "Masque de fichier : "
+
+-#: browser.c:1073
++#: browser.c:1079
+ msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
+-msgstr "Tri inverse par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
++msgstr "Tri inverse par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
+
+-#: browser.c:1074
++#: browser.c:1080
+ msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? "
+-msgstr "Tri par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
++msgstr "Tri par (d)ate, (a)lphabétique, (t)aille ou (n)e pas trier ? "
+
+-#: browser.c:1075
++#: browser.c:1081
+ msgid "dazn"
+ msgstr "datn"
+
+-#: browser.c:1141
++#: browser.c:1148
+ msgid "New file name: "
+-msgstr "Nouveau nom de fichier : "
++msgstr "Nouveau nom de fichier : "
+
+-#: browser.c:1172
++#: browser.c:1179
+ msgid "Can't view a directory"
+ msgstr "Impossible de visualiser un répertoire"
+
+-#: browser.c:1189
++#: browser.c:1196
+ msgid "Error trying to view file"
+ msgstr "Erreur en essayant de visualiser le fichier"
+
+@@ -283,31 +283,31 @@ msgstr "Nouveau(x) message(s) dans "
+ #: color.c:326
+ #, c-format
+ msgid "%s: color not supported by term"
+-msgstr "%s : couleur non disponible sur ce terminal"
++msgstr "%s : couleur non disponible sur ce terminal"
+
+ # , c-format
+ #: color.c:332
+ #, c-format
+ msgid "%s: no such color"
+-msgstr "%s : cette couleur n'existe pas"
++msgstr "%s : cette couleur n'existe pas"
+
+ # , c-format
+ #: color.c:378 color.c:579 color.c:590
+ #, c-format
+ msgid "%s: no such object"
+-msgstr "%s : cet objet n'existe pas"
++msgstr "%s : cet objet n'existe pas"
+
+ # , c-format
+ #: color.c:385
+ #, c-format
+ msgid "%s: command valid only for index object"
+-msgstr "%s : commande uniquement valide pour l'objet index"
++msgstr "%s : commande uniquement valide pour l'objet index"
+
+ # , c-format
+ #: color.c:393
+ #, c-format
+ msgid "%s: too few arguments"
+-msgstr "%s : pas assez d'arguments"
++msgstr "%s : pas assez d'arguments"
+
+ #: color.c:567
+ msgid "Missing arguments."
+@@ -315,17 +315,17 @@ msgstr "Arguments manquants."
+
+ #: color.c:606 color.c:617
+ msgid "color: too few arguments"
+-msgstr "color : pas assez d'arguments"
++msgstr "color : pas assez d'arguments"
+
+ #: color.c:640
+ msgid "mono: too few arguments"
+-msgstr "mono : pas assez d'arguments"
++msgstr "mono : pas assez d'arguments"
+
+ # , c-format
+ #: color.c:660
+ #, c-format
+ msgid "%s: no such attribute"
+-msgstr "%s : cet attribut n'existe pas"
++msgstr "%s : cet attribut n'existe pas"
+
+ #: color.c:700 hook.c:69 hook.c:77 keymap.c:751
+ msgid "too few arguments"
+@@ -342,11 +342,11 @@ msgstr "La couleur default n'est pas dis
+ #. find out whether or not the verify signature
+ #: commands.c:92
+ msgid "Verify PGP signature?"
+-msgstr "Vérifier la signature PGP ?"
++msgstr "Vérifier la signature PGP ?"
+
+ #: commands.c:117 mbox.c:736
+ msgid "Could not create temporary file!"
+-msgstr "Impossible de créer le fichier temporaire !"
++msgstr "Impossible de créer le fichier temporaire !"
+
+ #: commands.c:130
+ msgid "Cannot create display filter"
+@@ -382,19 +382,19 @@ msgstr "La signature PGP n'a PAS pu être
+
+ #: commands.c:228
+ msgid "Command: "
+-msgstr "Commande : "
++msgstr "Commande : "
+
+ #: commands.c:247 recvcmd.c:147
+ msgid "Bounce message to: "
+-msgstr "Renvoyer le message à : "
++msgstr "Renvoyer le message à : "
+
+ #: commands.c:249 recvcmd.c:149
+ msgid "Bounce tagged messages to: "
+-msgstr "Renvoyer les messages marqués à : "
++msgstr "Renvoyer les messages marqués à : "
+
+ #: commands.c:264 recvcmd.c:158
+ msgid "Error parsing address!"
+-msgstr "Erreur de décodage de l'adresse !"
++msgstr "Erreur de décodage de l'adresse !"
+
+ #: commands.c:272 recvcmd.c:166
+ #, c-format
+@@ -435,7 +435,7 @@ msgstr "Impossible de créer le processus
+
+ #: commands.c:466
+ msgid "Pipe to command: "
+-msgstr "Passer à la commande : "
++msgstr "Passer à la commande : "
+
+ #: commands.c:483
+ msgid "No printing command has been defined."
+@@ -443,11 +443,11 @@ msgstr "Aucune commande d'impression n'a
+
+ #: commands.c:488
+ msgid "Print message?"
+-msgstr "Imprimer le message ?"
++msgstr "Imprimer le message ?"
+
+ #: commands.c:488
+ msgid "Print tagged messages?"
+-msgstr "Imprimer les messages marqués ?"
++msgstr "Imprimer les messages marqués ?"
+
+ #: commands.c:497
+ msgid "Message printed"
+@@ -471,7 +471,7 @@ msgid ""
+ "(p)am?: "
+ msgstr ""
+ "Tri inv (d)at/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)or/s(p)"
+-"am ? : "
++"am ? : "
+
+ #: commands.c:510
+ msgid ""
+@@ -479,7 +479,7 @@ msgid ""
+ "am?: "
+ msgstr ""
+ "Tri (d)ate/(a)ut/(r)eçu/(o)bj/de(s)t/d(i)sc/(n)on/(t)aille/s(c)ore/s(p)"
+-"am ? : "
++"am ? : "
+
+ #: commands.c:511
+ msgid "dfrsotuzcp"
+@@ -487,7 +487,7 @@ msgstr "darosintcp"
+
+ #: commands.c:568
+ msgid "Shell command: "
+-msgstr "Commande shell : "
++msgstr "Commande shell : "
+
+ # , c-format
+ #: commands.c:716
+@@ -538,7 +538,7 @@ msgstr "Copie vers %s..."
+ #: commands.c:926
+ #, c-format
+ msgid "Convert to %s upon sending?"
+-msgstr "Convertir en %s à l'envoi ?"
++msgstr "Convertir en %s à l'envoi ?"
+
+ # , c-format
+ #: commands.c:936
+@@ -549,7 +549,7 @@ msgstr "Content-Type changé à %s."
+ #: commands.c:941
+ #, c-format
+ msgid "Character set changed to %s; %s."
+-msgstr "Jeu de caractères changé à %s ; %s."
++msgstr "Jeu de caractères changé à %s ; %s."
+
+ #: commands.c:943
+ msgid "not converting"
+@@ -605,7 +605,7 @@ msgstr " (PGP/MIME)"
+
+ #: compose.c:155 compose.c:159
+ msgid " sign as: "
+-msgstr " signer en tant que : "
++msgstr " signer en tant que : "
+
+ #: compose.c:155 compose.c:159
+ msgid "<default>"
+@@ -613,19 +613,19 @@ msgstr "<défaut>"
+
+ #: compose.c:167
+ msgid "Encrypt with: "
+-msgstr "Chiffrer avec : "
++msgstr "Chiffrer avec : "
+
+ # , c-format
+ #: compose.c:221
+ #, c-format
+ msgid "%s [#%d] no longer exists!"
+-msgstr "%s [#%d] n'existe plus !"
++msgstr "%s [#%d] n'existe plus !"
+
+ # , c-format
+ #: compose.c:229
+ #, c-format
+ msgid "%s [#%d] modified. Update encoding?"
+-msgstr "%s [#%d] modifié. Mise à jour du codage ?"
++msgstr "%s [#%d] modifié. Mise à jour du codage ?"
+
+ #: compose.c:272
+ msgid "-- Attachments"
+@@ -640,7 +640,7 @@ msgstr "Attention : '%s' est un mauvais
+ msgid "You may not delete the only attachment."
+ msgstr "Vous ne pouvez pas effacer l'unique attachement."
+
+-#: compose.c:601 send.c:1492
++#: compose.c:601 send.c:1521
+ #, c-format
+ msgid "Bad IDN in \"%s\": '%s'"
+ msgstr "Mauvais IDN dans « %s » : '%s'"
+@@ -652,7 +652,7 @@ msgstr "J'attache les fichiers sélection
+ #: compose.c:696
+ #, c-format
+ msgid "Unable to attach %s!"
+-msgstr "Impossible d'attacher %s !"
++msgstr "Impossible d'attacher %s !"
+
+ #: compose.c:715
+ msgid "Open mailbox to attach message from"
+@@ -664,11 +664,11 @@ msgstr "Aucun message dans ce dossier."
+
+ #: compose.c:762
+ msgid "Tag the messages you want to attach!"
+-msgstr "Marquez les messages que vous voulez attacher !"
++msgstr "Marquez les messages que vous voulez attacher !"
+
+ #: compose.c:794
+ msgid "Unable to attach!"
+-msgstr "Impossible d'attacher !"
++msgstr "Impossible d'attacher !"
+
+ #: compose.c:845
+ msgid "Recoding only affects text attachments."
+@@ -688,21 +688,21 @@ msgstr "Codage invalide."
+
+ #: compose.c:953
+ msgid "Save a copy of this message?"
+-msgstr "Sauver une copie de ce message ?"
++msgstr "Sauver une copie de ce message ?"
+
+ #: compose.c:1009
+ msgid "Rename to: "
+-msgstr "Renommer en : "
++msgstr "Renommer en : "
+
+ # , c-format
+ #: compose.c:1014 editmsg.c:116 sendlib.c:856
+ #, c-format
+ msgid "Can't stat %s: %s"
+-msgstr "Impossible d'obtenir le statut de %s : %s"
++msgstr "Impossible d'obtenir le statut de %s : %s"
+
+ #: compose.c:1041
+ msgid "New file: "
+-msgstr "Nouveau fichier : "
++msgstr "Nouveau fichier : "
+
+ #: compose.c:1054
+ msgid "Content-Type is of the form base/sub"
+@@ -726,7 +726,7 @@ msgstr "Nous sommes en présence d'un éch
+
+ #: compose.c:1142
+ msgid "Postpone this message?"
+-msgstr "Ajourner ce message ?"
++msgstr "Ajourner ce message ?"
+
+ #: compose.c:1201
+ msgid "Write message to mailbox"
+@@ -744,11 +744,11 @@ msgstr "Message écrit."
+
+ #: compose.c:1225
+ msgid "S/MIME already selected. Clear & continue ? "
+-msgstr "S/MIME déjà sélectionné. Effacer & continuer ? "
++msgstr "S/MIME déjà sélectionné. Effacer & continuer ? "
+
+ #: compose.c:1251
+ msgid "PGP already selected. Clear & continue ? "
+-msgstr "PGP déjà sélectionné. Effacer & continuer ? "
++msgstr "PGP déjà sélectionné. Effacer & continuer ? "
+
+ # , c-format
+ #: crypt-gpgme.c:335
+@@ -804,7 +804,7 @@ msgstr "spécification de la clé secrète
+ #: crypt-gpgme.c:657
+ #, c-format
+ msgid "error setting secret key `%s': %s\n"
+-msgstr "erreur lors de la mise en place de la clé secrète « %s »: %s\n"
++msgstr "erreur lors de la mise en place de la clé secrète « %s » : %s\n"
+
+ # , c-format
+ #: crypt-gpgme.c:701
+@@ -954,7 +954,7 @@ msgstr "Erreur : le déchiffrage/vérifica
+ msgid "Error: copy data failed\n"
+ msgstr "Erreur : la copie des données a échoué\n"
+
+-#: crypt-gpgme.c:2074 pgp.c:410
++#: crypt-gpgme.c:2074 pgp.c:421
+ msgid ""
+ "[-- BEGIN PGP MESSAGE --]\n"
+ "\n"
+@@ -962,11 +962,11 @@ msgstr ""
+ "[-- DÉBUT DE MESSAGE PGP --]\n"
+ "\n"
+
+-#: crypt-gpgme.c:2076 pgp.c:412
++#: crypt-gpgme.c:2076 pgp.c:423
+ msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
+ msgstr "[-- DÉBUT DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
+
+-#: crypt-gpgme.c:2079 pgp.c:414
++#: crypt-gpgme.c:2079 pgp.c:425
+ msgid ""
+ "[-- BEGIN PGP SIGNED MESSAGE --]\n"
+ "\n"
+@@ -974,37 +974,37 @@ msgstr ""
+ "[-- DÉBUT DE MESSAGE SIGNÉ PGP --]\n"
+ "\n"
+
+-#: crypt-gpgme.c:2106 pgp.c:440
++#: crypt-gpgme.c:2106 pgp.c:451
+ msgid "[-- END PGP MESSAGE --]\n"
+ msgstr "[-- FIN DE MESSAGE PGP --]\n"
+
+-#: crypt-gpgme.c:2108 pgp.c:444
++#: crypt-gpgme.c:2108 pgp.c:455
+ msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
+ msgstr "[-- FIN DE BLOC DE CLÉ PUBLIQUE PGP --]\n"
+
+-#: crypt-gpgme.c:2110 pgp.c:446
++#: crypt-gpgme.c:2110 pgp.c:457
+ msgid "[-- END PGP SIGNED MESSAGE --]\n"
+ msgstr "[-- FIN DE MESSAGE SIGNÉ PGP --]\n"
+
+-#: crypt-gpgme.c:2131 pgp.c:476
++#: crypt-gpgme.c:2131 pgp.c:487
+ msgid ""
+ "[-- Error: could not find beginning of PGP message! --]\n"
+ "\n"
+ msgstr ""
+-"[-- Erreur : impossible de trouver le début du message PGP ! --]\n"
++"[-- Erreur : impossible de trouver le début du message PGP ! --]\n"
+ "\n"
+
+-#: crypt-gpgme.c:2162 pgp.c:905
++#: crypt-gpgme.c:2162 pgp.c:916
+ msgid ""
+ "[-- Error: malformed PGP/MIME message! --]\n"
+ "\n"
+ msgstr ""
+-"[-- Erreur : message PGP/MIME mal formé ! --]\n"
++"[-- Erreur : message PGP/MIME mal formé ! --]\n"
+ "\n"
+
+-#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:918
++#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:929
+ msgid "[-- Error: could not create temporary file! --]\n"
+-msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
++msgstr "[-- Erreur : impossible de créer le fichier temporaire ! --]\n"
+
+ #: crypt-gpgme.c:2186
+ msgid ""
+@@ -1014,7 +1014,7 @@ msgstr ""
+ "[-- Les données suivantes sont signées et chiffrées avec PGP/MIME --]\n"
+ "\n"
+
+-#: crypt-gpgme.c:2187 pgp.c:927
++#: crypt-gpgme.c:2187 pgp.c:938
+ msgid ""
+ "[-- The following data is PGP/MIME encrypted --]\n"
+ "\n"
+@@ -1026,7 +1026,7 @@ msgstr ""
+ msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
+ msgstr "[-- Fin des données signées et chiffrées avec PGP/MIME --]\n"
+
+-#: crypt-gpgme.c:2210 pgp.c:947
++#: crypt-gpgme.c:2210 pgp.c:958
+ msgid "[-- End of PGP/MIME encrypted data --]\n"
+ msgstr "[-- Fin des données chiffrées avec PGP/MIME --]\n"
+
+@@ -1083,7 +1083,7 @@ msgstr "[Invalide]"
+ #: crypt-gpgme.c:2985 crypt-gpgme.c:3128
+ #, c-format
+ msgid "Valid From : %s\n"
+-msgstr "From valide : %s\n"
++msgstr "From valide : %s\n"
+
+ # , c-format
+ #: crypt-gpgme.c:2998 crypt-gpgme.c:3141
+@@ -1094,12 +1094,12 @@ msgstr "To valide ..: %s\n"
+ #: crypt-gpgme.c:3011 crypt-gpgme.c:3154
+ #, c-format
+ msgid "Key Type ..: %s, %lu bit %s\n"
+-msgstr "Type de clé : %s, %lu bits %s\n"
++msgstr "Type de clé : %s, %lu bits %s\n"
+
+ #: crypt-gpgme.c:3013 crypt-gpgme.c:3156
+ #, c-format
+ msgid "Key Usage .: "
+-msgstr "Utilisation : "
++msgstr "Utilisation : "
+
+ #: crypt-gpgme.c:3018 crypt-gpgme.c:3161
+ msgid "encryption"
+@@ -1121,12 +1121,12 @@ msgstr "certification"
+ #: crypt-gpgme.c:3068
+ #, c-format
+ msgid "Serial-No .: 0x%s\n"
+-msgstr "N° de série : 0x%s\n"
++msgstr "N° de série : 0x%s\n"
+
+ #: crypt-gpgme.c:3076
+ #, c-format
+ msgid "Issued By .: "
+-msgstr "Publiée par : "
++msgstr "Publiée par : "
+
+ # , c-format
+ #. display only the short keyID
+@@ -1170,7 +1170,7 @@ msgstr "Erreur : chaîne de certification
+ #: crypt-gpgme.c:3248 pgpkey.c:580
+ #, c-format
+ msgid "Key ID: 0x%s"
+-msgstr "ID de la clé : 0x%s"
++msgstr "ID de la clé : 0x%s"
+
+ #: crypt-gpgme.c:3331
+ #, c-format
+@@ -1256,7 +1256,7 @@ msgstr "L'ID n'est que peu valide."
+ #: crypt-gpgme.c:3669 pgpkey.c:626
+ #, c-format
+ msgid "%s Do you really want to use the key?"
+-msgstr "%s Voulez-vous vraiment utiliser la clé ?"
++msgstr "%s Voulez-vous vraiment utiliser la clé ?"
+
+ #: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955
+ #, c-format
+@@ -1264,16 +1264,16 @@ msgid "Looking for keys matching \"%s\".
+ msgstr "Recherche des clés correspondant à \"%s\"..."
+
+ # , c-format
+-#: crypt-gpgme.c:4002 pgp.c:1154
++#: crypt-gpgme.c:4002 pgp.c:1165
+ #, c-format
+ msgid "Use keyID = \"%s\" for %s?"
+-msgstr "Utiliser keyID = \"%s\" pour %s ?"
++msgstr "Utiliser keyID = \"%s\" pour %s ?"
+
+ # , c-format
+-#: crypt-gpgme.c:4038 pgp.c:1188 smime.c:665 smime.c:790
++#: crypt-gpgme.c:4038 pgp.c:1199 smime.c:665 smime.c:790
+ #, c-format
+ msgid "Enter keyID for %s: "
+-msgstr "Entrez keyID pour %s : "
++msgstr "Entrez keyID pour %s : "
+
+ #: crypt-gpgme.c:4103
+ msgid ""
+@@ -1295,7 +1295,7 @@ msgstr "csedpor"
+ #: crypt-gpgme.c:4135
+ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?"
+ msgstr ""
+-"(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, s/(m)ime ou en clai(r) ?"
++"(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, s/(m)ime ou en clai(r) ?"
+
+ #: crypt-gpgme.c:4136
+ msgid "esabmfc"
+@@ -1304,9 +1304,9 @@ msgstr "csedmor"
+ #. sign (a)s
+ #. unset_option(OPTCRYPTCHECKTRUST);
+ #. sign (a)s
+-#: crypt-gpgme.c:4152 pgp.c:1563 smime.c:1990
++#: crypt-gpgme.c:4152 pgp.c:1574 smime.c:2034
+ msgid "Sign as: "
+-msgstr "Signer en tant que : "
++msgstr "Signer en tant que : "
+
+ #: crypt-gpgme.c:4249
+ msgid "Failed to verify sender"
+@@ -1319,7 +1319,7 @@ msgstr "Impossible de trouver l'expédite
+ #: crypt.c:69
+ #, c-format
+ msgid " (current time: %c)"
+-msgstr " (heure courante : %c)"
++msgstr " (heure courante : %c)"
+
+ #: crypt.c:75
+ #, c-format
+@@ -1338,10 +1338,10 @@ msgstr "Appel de PGP..."
+ #. otherwise inline won't work...ask for revert
+ #: crypt.c:156
+ msgid "Message can't be sent inline. Revert to using PGP/MIME?"
+-msgstr "Le message ne peut pas être envoyé en ligne. Utiliser PGP/MIME ?"
++msgstr "Le message ne peut pas être envoyé en ligne. Utiliser PGP/MIME ?"
+
+ #. abort
+-#: crypt.c:158 send.c:1444
++#: crypt.c:158 send.c:1473
+ msgid "Mail not sent."
+ msgstr "Message non envoyé."
+
+@@ -1363,7 +1363,7 @@ msgid ""
+ "[-- Error: Inconsistent multipart/signed structure! --]\n"
+ "\n"
+ msgstr ""
+-"[-- Erreur : Structure multipart/signed incohérente ! --]\n"
++"[-- Erreur : Structure multipart/signed incohérente ! --]\n"
+ "\n"
+
+ #: crypt.c:823
+@@ -1372,7 +1372,7 @@ msgid ""
+ "[-- Error: Unknown multipart/signed protocol %s! --]\n"
+ "\n"
+ msgstr ""
+-"[-- Erreur : Protocole multipart/signed %s inconnu ! --]\n"
++"[-- Erreur : Protocole multipart/signed %s inconnu ! --]\n"
+ "\n"
+
+ #: crypt.c:862
+@@ -1381,7 +1381,7 @@ msgid ""
+ "[-- Warning: We can't verify %s/%s signatures. --]\n"
+ "\n"
+ msgstr ""
+-"[-- Attention : les signatures %s/%s ne peuvent pas être vérifiées. --]\n"
++"[-- Attention : les signatures %s/%s ne peuvent pas être vérifiées. --]\n"
+ "\n"
+
+ #. Now display the signed body
+@@ -1398,7 +1398,7 @@ msgid ""
+ "[-- Warning: Can't find any signatures. --]\n"
+ "\n"
+ msgstr ""
+-"[-- Attention : Impossible de trouver des signatures. --]\n"
++"[-- Attention : Impossible de trouver des signatures. --]\n"
+ "\n"
+
+ #: crypt.c:886
+@@ -1418,30 +1418,30 @@ msgstr ""
+ msgid "Invoking S/MIME..."
+ msgstr "Appel de S/MIME..."
+
+-#: curs_lib.c:188
++#: curs_lib.c:174
+ msgid "yes"
+ msgstr "oui"
+
+-#: curs_lib.c:189
++#: curs_lib.c:175
+ msgid "no"
+ msgstr "non"
+
+ #. restore blocking operation
+-#: curs_lib.c:285
++#: curs_lib.c:271
+ msgid "Exit Mutt?"
+-msgstr "Quitter Mutt ?"
++msgstr "Quitter Mutt ?"
+
+-#: curs_lib.c:410 mutt_socket.c:530 mutt_ssl.c:328
++#: curs_lib.c:396 mutt_socket.c:530 mutt_ssl.c:328
+ msgid "unknown error"
+ msgstr "erreur inconnue"
+
+-#: curs_lib.c:430
++#: curs_lib.c:416
+ msgid "Press any key to continue..."
+ msgstr "Appuyez sur une touche pour continuer..."
+
+-#: curs_lib.c:474
++#: curs_lib.c:460
+ msgid " ('?' for list): "
+-msgstr " ('?' pour avoir la liste) : "
++msgstr " ('?' pour avoir la liste) : "
+
+ #: curs_main.c:52 curs_main.c:624 curs_main.c:654
+ msgid "No mailbox is open."
+@@ -1456,7 +1456,7 @@ msgid "Mailbox is read-only."
+ msgstr "La boîte aux lettres est en lecture seule."
+
+ # , c-format
+-#: curs_main.c:55 pager.c:59 recvattach.c:873
++#: curs_main.c:55 pager.c:59 recvattach.c:890
+ msgid "Function not permitted in attach-message mode."
+ msgstr "Fonction non autorisée en mode attach-message."
+
+@@ -1467,7 +1467,7 @@ msgstr "Pas de messages visibles."
+ #: curs_main.c:256
+ msgid "Cannot toggle write on a readonly mailbox!"
+ msgstr ""
+-"Impossible de rendre inscriptible une boîte aux lettres en lecture seule !"
++"Impossible de rendre inscriptible une boîte aux lettres en lecture seule !"
+
+ #: curs_main.c:263
+ msgid "Changes to folder will be written on folder exit."
+@@ -1489,7 +1489,7 @@ msgstr "Sauver"
+ msgid "Mail"
+ msgstr "Message"
+
+-#: curs_main.c:411 pager.c:1491
++#: curs_main.c:411 pager.c:1495
+ msgid "Reply"
+ msgstr "Répondre"
+
+@@ -1521,7 +1521,7 @@ msgstr "Rien à faire."
+
+ #: curs_main.c:752
+ msgid "Jump to message: "
+-msgstr "Aller au message : "
++msgstr "Aller au message : "
+
+ #: curs_main.c:758
+ msgid "Argument must be a message number."
+@@ -1537,7 +1537,7 @@ msgstr "Numéro de message invalide."
+
+ #: curs_main.c:813
+ msgid "Delete messages matching: "
+-msgstr "Effacer les messages correspondant à : "
++msgstr "Effacer les messages correspondant à : "
+
+ #: curs_main.c:835
+ msgid "No limit pattern is in effect."
+@@ -1548,27 +1548,27 @@ msgstr "Aucun motif de limite n'est en v
+ #: curs_main.c:840
+ #, c-format
+ msgid "Limit: %s"
+-msgstr "Limite : %s"
++msgstr "Limite : %s"
+
+ #: curs_main.c:850
+ msgid "Limit to messages matching: "
+-msgstr "Limiter aux messages correspondant à : "
++msgstr "Limiter aux messages correspondant à : "
+
+ #: curs_main.c:882
+ msgid "Quit Mutt?"
+-msgstr "Quitter Mutt ?"
++msgstr "Quitter Mutt ?"
+
+ #: curs_main.c:966
+ msgid "Tag messages matching: "
+-msgstr "Marquer les messages correspondant à : "
++msgstr "Marquer les messages correspondant à : "
+
+ #: curs_main.c:980
+ msgid "Undelete messages matching: "
+-msgstr "Récupérer les messages correspondant à : "
++msgstr "Récupérer les messages correspondant à : "
+
+ #: curs_main.c:988
+ msgid "Untag messages matching: "
+-msgstr "Démarquer les messages correspondant à : "
++msgstr "Démarquer les messages correspondant à : "
+
+ #: curs_main.c:1067
+ msgid "Open mailbox in read-only mode"
+@@ -1579,89 +1579,89 @@ msgid "Open mailbox"
+ msgstr "Ouvre la boîte aux lettres"
+
+ # , c-format
+-#: curs_main.c:1085 mx.c:512 mx.c:658
++#: curs_main.c:1093 mx.c:512 mx.c:658
+ #, c-format
+ msgid "%s is not a mailbox."
+ msgstr "%s n'est pas une boîte aux lettres."
+
+-#: curs_main.c:1180
++#: curs_main.c:1188
+ msgid "Exit Mutt without saving?"
+-msgstr "Quitter Mutt sans sauvegarder ?"
++msgstr "Quitter Mutt sans sauvegarder ?"
+
+-#: curs_main.c:1198 curs_main.c:1230 curs_main.c:1692 curs_main.c:1724
++#: curs_main.c:1206 curs_main.c:1238 curs_main.c:1700 curs_main.c:1732
+ #: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132
+ msgid "Threading is not enabled."
+ msgstr "L'affichage des discussions n'est pas activé."
+
+-#: curs_main.c:1210
++#: curs_main.c:1218
+ msgid "Thread broken"
+ msgstr "Discussion cassée"
+
+-#: curs_main.c:1232
++#: curs_main.c:1240
+ msgid "No Message-ID: header available to link thread"
+ msgstr "Pas d'en-tête Message-ID: disponible pour lier la discussion"
+
+-#: curs_main.c:1234
++#: curs_main.c:1242
+ msgid "First, please tag a message to be linked here"
+ msgstr "D'abord, veuillez marquer un message à lier ici"
+
+-#: curs_main.c:1246
++#: curs_main.c:1254
+ msgid "Threads linked"
+ msgstr "Discussions liées"
+
+-#: curs_main.c:1249
++#: curs_main.c:1257
+ msgid "No thread linked"
+ msgstr "Pas de discussion liée"
+
+-#: curs_main.c:1285 curs_main.c:1310
++#: curs_main.c:1293 curs_main.c:1318
+ msgid "You are on the last message."
+ msgstr "Vous êtes sur le dernier message."
+
+-#: curs_main.c:1292 curs_main.c:1336
++#: curs_main.c:1300 curs_main.c:1344
+ msgid "No undeleted messages."
+ msgstr "Pas de message non effacé."
+
+-#: curs_main.c:1329 curs_main.c:1353
++#: curs_main.c:1337 curs_main.c:1361
+ msgid "You are on the first message."
+ msgstr "Vous êtes sur le premier message."
+
+-#: curs_main.c:1428 pattern.c:1361
++#: curs_main.c:1436 pattern.c:1383
+ msgid "Search wrapped to top."
+ msgstr "La recherche est repartie du début."
+
+-#: curs_main.c:1437 pattern.c:1372
++#: curs_main.c:1445 pattern.c:1394
+ msgid "Search wrapped to bottom."
+ msgstr "La recherche est repartie de la fin."
+
+-#: curs_main.c:1478
++#: curs_main.c:1486
+ msgid "No new messages"
+ msgstr "Pas de nouveaux messages"
+
+-#: curs_main.c:1478
++#: curs_main.c:1486
+ msgid "No unread messages"
+ msgstr "Pas de messages non lus"
+
+-#: curs_main.c:1479
++#: curs_main.c:1487
+ msgid " in this limited view"
+ msgstr " dans cette vue limitée"
+
+-#: curs_main.c:1500 pager.c:2403
++#: curs_main.c:1508 pager.c:2412
+ msgid "Can't change 'important' flag on POP server."
+ msgstr "Impossible de changer l'indicateur 'important' sur le serveur POP."
+
+-#: curs_main.c:1624
++#: curs_main.c:1632
+ msgid "No more threads."
+ msgstr "Pas d'autres discussions."
+
+-#: curs_main.c:1626
++#: curs_main.c:1634
+ msgid "You are on the first thread."
+ msgstr "Vous êtes sur la première discussion."
+
+-#: curs_main.c:1710
++#: curs_main.c:1718
+ msgid "Thread contains unread messages."
+ msgstr "Cette discussion contient des messages non-lus."
+
+-#: curs_main.c:1897
++#: curs_main.c:1905
+ msgid "Can't edit message on POP server."
+ msgstr "Impossible d'éditer le message sur le serveur POP."
+
+@@ -1680,15 +1680,6 @@ msgid ""
+ "~m messages\tinclude and quote messages\n"
+ "~M messages\tsame as ~m, except include headers\n"
+ "~p\t\tprint the message\n"
+-"~q\t\twrite file and quit editor\n"
+-"~r file\t\tread a file into the editor\n"
+-"~t users\tadd users to the To: field\n"
+-"~u\t\trecall the previous line\n"
+-"~v\t\tedit message with the $visual editor\n"
+-"~w file\t\twrite message to file\n"
+-"~x\t\tabort changes and quit editor\n"
+-"~?\t\tthis message\n"
+-".\t\ton a line by itself ends input\n"
+ msgstr ""
+ "~~\t\tinsère une ligne commençant par un unique ~\n"
+ "~b utilisateurs\tajoute des utilisateurs au champ Bcc:\n"
+@@ -1699,6 +1690,19 @@ msgstr ""
+ "~m messages\tinclut et cite les messages\n"
+ "~M messages\tidentique à ~m, mais inclut les en-têtes\n"
+ "~p\t\timprime le message\n"
++
++#: edit.c:52
++msgid ""
++"~q\t\twrite file and quit editor\n"
++"~r file\t\tread a file into the editor\n"
++"~t users\tadd users to the To: field\n"
++"~u\t\trecall the previous line\n"
++"~v\t\tedit message with the $visual editor\n"
++"~w file\t\twrite message to file\n"
++"~x\t\tabort changes and quit editor\n"
++"~?\t\tthis message\n"
++".\t\ton a line by itself ends input\n"
++msgstr ""
+ "~q\t\tsauvegarde le fichier et quitte l'éditeur\n"
+ "~r fichier\tlit un fichier dans l'éditeur\n"
+ "~t utilisateurs\tajoute des utilisateurs au champ To:\n"
+@@ -1710,85 +1714,85 @@ msgstr ""
+ ".\t\tseul sur une ligne, termine la saisie\n"
+
+ # , c-format
+-#: edit.c:186
++#: edit.c:188
+ #, c-format
+ msgid "%d: invalid message number.\n"
+-msgstr "%d : numéro de message invalide.\n"
++msgstr "%d : numéro de message invalide.\n"
+
+-#: edit.c:328
++#: edit.c:330
+ msgid "(End message with a . on a line by itself)\n"
+ msgstr "(Veuillez terminer le message par un . en début de ligne)\n"
+
+-#: edit.c:386
++#: edit.c:389
+ msgid "No mailbox.\n"
+ msgstr "Pas de boîte aux lettres.\n"
+
+-#: edit.c:390
++#: edit.c:393
+ msgid "Message contains:\n"
+-msgstr "Le message contient :\n"
++msgstr "Le message contient :\n"
+
+-#: edit.c:394 edit.c:451
++#: edit.c:397 edit.c:454
+ msgid "(continue)\n"
+ msgstr "(continuer)\n"
+
+-#: edit.c:407
++#: edit.c:410
+ msgid "missing filename.\n"
+ msgstr "nom de fichier manquant.\n"
+
+-#: edit.c:427
++#: edit.c:430
+ msgid "No lines in message.\n"
+ msgstr "Pas de lignes dans le message.\n"
+
+-#: edit.c:444
++#: edit.c:447
+ #, c-format
+ msgid "Bad IDN in %s: '%s'\n"
+ msgstr "Mauvais IDN dans %s : '%s'\n"
+
+ # , c-format
+-#: edit.c:462
++#: edit.c:465
+ #, c-format
+ msgid "%s: unknown editor command (~? for help)\n"
+-msgstr "%s : commande d'éditeur inconnue (~? pour l'aide)\n"
++msgstr "%s : commande d'éditeur inconnue (~? pour l'aide)\n"
+
+ #: editmsg.c:78
+ #, c-format
+ msgid "could not create temporary folder: %s"
+-msgstr "impossible de créer le dossier temporaire : %s"
++msgstr "impossible de créer le dossier temporaire : %s"
+
+ #: editmsg.c:90
+ #, c-format
+ msgid "could not write temporary mail folder: %s"
+-msgstr "impossible d'écrire dans le dossier temporaire : %s"
++msgstr "impossible d'écrire dans le dossier temporaire : %s"
+
+ #: editmsg.c:107
+ #, c-format
+ msgid "could not truncate temporary mail folder: %s"
+-msgstr "impossible de tronquer le dossier temporaire : %s"
++msgstr "impossible de tronquer le dossier temporaire : %s"
+
+ #: editmsg.c:122
+ msgid "Message file is empty!"
+-msgstr "Le fichier contenant le message est vide !"
++msgstr "Le fichier contenant le message est vide !"
+
+ #: editmsg.c:129
+ msgid "Message not modified!"
+-msgstr "Message non modifié !"
++msgstr "Message non modifié !"
+
+ # , c-format
+ #: editmsg.c:137
+ #, c-format
+ msgid "Can't open message file: %s"
+-msgstr "Impossible d'ouvrir le fichier : %s"
++msgstr "Impossible d'ouvrir le fichier : %s"
+
+ # , c-format
+ #: editmsg.c:144 editmsg.c:172
+ #, c-format
+ msgid "Can't append to folder: %s"
+-msgstr "Impossible d'ajouter au dossier : %s"
++msgstr "Impossible d'ajouter au dossier : %s"
+
+ #: editmsg.c:203
+ #, c-format
+ msgid "Error. Preserving temporary file: %s"
+-msgstr "Erreur. On préserve le fichier temporaire : %s"
++msgstr "Erreur. On préserve le fichier temporaire : %s"
+
+ # , c-format
+ #: flags.c:336
+@@ -1803,7 +1807,7 @@ msgstr "Effacer l'indicateur"
+ #: handler.c:1352
+ msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n"
+ msgstr ""
+-"[-- Erreur : Aucune partie du Multipart/Alternative n'a pu être affichée ! "
++"[-- Erreur : Aucune partie du Multipart/Alternative n'a pu être affichée ! "
+ "--]\n"
+
+ # , c-format
+@@ -1816,7 +1820,7 @@ msgstr "[-- Attachement #%d"
+ #: handler.c:1481
+ #, c-format
+ msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n"
+-msgstr "[-- Type : %s/%s, Codage : %s, Taille : %s --]\n"
++msgstr "[-- Type : %s/%s, Codage : %s, Taille : %s --]\n"
+
+ # , c-format
+ #: handler.c:1547
+@@ -1828,7 +1832,7 @@ msgstr "[-- Visualisation automatique en
+ #: handler.c:1548
+ #, c-format
+ msgid "Invoking autoview command: %s"
+-msgstr "Invocation de la commande de visualisation automatique : %s"
++msgstr "Invocation de la commande de visualisation automatique : %s"
+
+ # , c-format
+ #: handler.c:1580
+@@ -1873,7 +1877,7 @@ msgstr "[-- le %s --]\n"
+ #: handler.c:1697
+ #, c-format
+ msgid "[-- name: %s --]\n"
+-msgstr "[-- nom: %s --]\n"
++msgstr "[-- nom : %s --]\n"
+
+ # , c-format
+ #: handler.c:1710 handler.c:1726
+@@ -1895,15 +1899,15 @@ msgstr "[-- et l'access-type %s indiqué
+
+ #: handler.c:1841
+ msgid "Error: multipart/signed has no protocol."
+-msgstr "Erreur : multipart/signed n'a pas de protocole."
++msgstr "Erreur : multipart/signed n'a pas de protocole."
+
+ #: handler.c:1851
+ msgid "Error: multipart/encrypted has no protocol parameter!"
+-msgstr "Erreur : multipart/encrypted n'a pas de paramètre de protocole !"
++msgstr "Erreur : multipart/encrypted n'a pas de paramètre de protocole !"
+
+ #: handler.c:1891
+ msgid "Unable to open temporary file!"
+-msgstr "Impossible d'ouvrir le fichier temporaire !"
++msgstr "Impossible d'ouvrir le fichier temporaire !"
+
+ # , c-format
+ #: handler.c:1952
+@@ -1919,17 +1923,17 @@ msgstr "(utilisez '%s' pour voir cette p
+
+ #: handler.c:1959
+ msgid "(need 'view-attachments' bound to key!)"
+-msgstr "(la fonction 'view-attachments' doit être affectée à une touche !)"
++msgstr "(la fonction 'view-attachments' doit être affectée à une touche !)"
+
+ # , c-format
+ #: headers.c:177
+ #, c-format
+ msgid "%s: unable to attach file"
+-msgstr "%s : impossible d'attacher le fichier"
++msgstr "%s : impossible d'attacher le fichier"
+
+ #: help.c:282
+ msgid "ERROR: please report this bug"
+-msgstr "ERREUR : veuillez signaler ce problème"
++msgstr "ERREUR : veuillez signaler ce problème"
+
+ #: help.c:324
+ msgid "<UNKNOWN>"
+@@ -1942,7 +1946,7 @@ msgid ""
+ "\n"
+ msgstr ""
+ "\n"
+-"Affectations génériques :\n"
++"Affectations génériques :\n"
+ "\n"
+
+ #: help.c:340
+@@ -1952,7 +1956,7 @@ msgid ""
+ "\n"
+ msgstr ""
+ "\n"
+-"Fonctions non affectées :\n"
++"Fonctions non affectées :\n"
+ "\n"
+
+ # , c-format
+@@ -1964,18 +1968,18 @@ msgstr "Aide pour %s"
+ #: hook.c:246
+ #, c-format
+ msgid "unhook: Can't do unhook * from within a hook."
+-msgstr "unhook : impossible de faire un unhook * à l'intérieur d'un hook."
++msgstr "unhook : impossible de faire un unhook * à l'intérieur d'un hook."
+
+ # , c-format
+ #: hook.c:258
+ #, c-format
+ msgid "unhook: unknown hook type: %s"
+-msgstr "unhook : type hook inconnu : %s"
++msgstr "unhook : type hook inconnu : %s"
+
+ #: hook.c:264
+ #, c-format
+ msgid "unhook: Can't delete a %s from within a %s."
+-msgstr "unhook : impossible de supprimer un %s à l'intérieur d'un %s."
++msgstr "unhook : impossible de supprimer un %s à l'intérieur d'un %s."
+
+ #: imap/auth.c:108 pop_auth.c:390
+ msgid "No authenticators available"
+@@ -2047,7 +2051,7 @@ msgstr "Ce dossier n'existe pas"
+
+ #: imap/browse.c:288
+ msgid "Create mailbox: "
+-msgstr "Créer la boîte aux lettres : "
++msgstr "Créer la boîte aux lettres : "
+
+ #: imap/browse.c:293 imap/browse.c:339
+ msgid "Mailbox must have a name."
+@@ -2060,27 +2064,27 @@ msgstr "Boîte aux lettres créée."
+ #: imap/browse.c:332
+ #, c-format
+ msgid "Rename mailbox %s to: "
+-msgstr "Renommer la boîte aux lettres %s en : "
++msgstr "Renommer la boîte aux lettres %s en : "
+
+ #: imap/browse.c:345
+ #, c-format
+ msgid "Rename failed: %s"
+-msgstr "Le renommage a échoué : %s"
++msgstr "Le renommage a échoué : %s"
+
+ #: imap/browse.c:350
+ msgid "Mailbox renamed."
+ msgstr "Boîte aux lettres renommée."
+
+-#: imap/command.c:298
++#: imap/command.c:296
+ msgid "Mailbox closed"
+ msgstr "Boîte aux lettres fermée"
+
+ #. something is wrong because the server reported fewer messages
+ #. * than we previously saw
+ #.
+-#: imap/command.c:341
++#: imap/command.c:339
+ msgid "Fatal error. Message count is out of sync!"
+-msgstr "Erreur fatale. Le nombre de messages ne correspond pas !"
++msgstr "Erreur fatale. Le nombre de messages ne correspond pas !"
+
+ #: imap/imap.c:177
+ #, c-format
+@@ -2097,7 +2101,7 @@ msgstr "Vérification des abonnements aux
+
+ #: imap/imap.c:460 pop_lib.c:286
+ msgid "Secure connection with TLS?"
+-msgstr "Connexion sécurisée avec TLS ?"
++msgstr "Connexion sécurisée avec TLS ?"
+
+ #: imap/imap.c:473 pop_lib.c:310
+ msgid "Could not negotiate TLS connection"
+@@ -2121,7 +2125,7 @@ msgstr "Erreur à l'ouverture de la boîte
+ #: imap/imap.c:803 imap/message.c:742 muttlib.c:1300
+ #, c-format
+ msgid "Create %s?"
+-msgstr "Créer %s ?"
++msgstr "Créer %s ?"
+
+ # , c-format
+ #: imap/imap.c:1041 pop.c:468
+@@ -2145,29 +2149,29 @@ msgstr "Effacement des messages sur le s
+
+ #: imap/imap.c:1101
+ msgid "imap_sync_mailbox: EXPUNGE failed"
+-msgstr "imap_sync_mailbox: EXPUNGE a échoué"
++msgstr "imap_sync_mailbox : EXPUNGE a échoué"
+
+ #: imap/imap.c:1110 imap/imap.c:1145
+ msgid "CLOSE failed"
+ msgstr "CLOSE a échoué"
+
+-#: imap/imap.c:1388
++#: imap/imap.c:1387
+ #, c-format
+ msgid "Header search without header name: %s"
+ msgstr "Recherche d'en-tête sans nom d'en-tête : %s"
+
+-#: imap/imap.c:1536
++#: imap/imap.c:1535
+ msgid "Bad mailbox name"
+ msgstr "Mauvaise boîte aux lettres"
+
+ # , c-format
+-#: imap/imap.c:1559
++#: imap/imap.c:1558
+ #, c-format
+ msgid "Subscribing to %s..."
+ msgstr "Abonnement à %s..."
+
+ # , c-format
+-#: imap/imap.c:1561
++#: imap/imap.c:1560
+ #, c-format
+ msgid "Unsubscribing to %s..."
+ msgstr "Désabonnement de %s..."
+@@ -2223,143 +2227,164 @@ msgstr "Copie du message %d dans %s..."
+
+ #: imap/util.c:236
+ msgid "Continue?"
+-msgstr "Continuer ?"
++msgstr "Continuer ?"
+
+-#: init.c:427
++#: init.c:57 init.c:1542 pager.c:57
++#, c-format
++msgid "Not available in this menu."
++msgstr "Non disponible dans ce menu."
++
++#: init.c:438
+ #, c-format
+ msgid "Bad regexp: %s"
+ msgstr "Mauvaise expression rationnelle : %s"
+
+-#: init.c:686
++#: init.c:697
+ msgid "spam: no matching pattern"
+ msgstr "spam : pas de motif correspondant"
+
+-#: init.c:688
++#: init.c:699
+ msgid "nospam: no matching pattern"
+ msgstr "nospam : pas de motif correspondant"
+
+-#: init.c:891
++#: init.c:979
++msgid "attachments: no disposition"
++msgstr "attachments : pas de disposition"
++
++#: init.c:1017
++msgid "attachments: invalid disposition"
++msgstr "attachments : disposition invalide"
++
++#: init.c:1031
++msgid "unattachments: no disposition"
++msgstr "unattachments : pas de disposition"
++
++#: init.c:1054
++msgid "unattachments: invalid disposition"
++msgstr "unattachments : disposition invalide"
++
++#: init.c:1167
+ msgid "alias: no address"
+-msgstr "alias : pas d'adresse"
++msgstr "alias : pas d'adresse"
+
+-#: init.c:936
++#: init.c:1212
+ #, c-format
+ msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
+ msgstr "Attention : mauvais IDN '%s' dans l'alias '%s'.\n"
+
+-#: init.c:1014
++#: init.c:1291
+ msgid "invalid header field"
+ msgstr "en-tête invalide"
+
+ # , c-format
+-#: init.c:1067
++#: init.c:1344
+ #, c-format
+ msgid "%s: unknown sorting method"
+-msgstr "%s : méthode de tri inconnue"
++msgstr "%s : méthode de tri inconnue"
+
+ # , c-format
+-#: init.c:1177
++#: init.c:1454
+ #, c-format
+ msgid "mutt_restore_default(%s): error in regexp: %s\n"
+-msgstr "mutt_restore_default(%s) : erreur dans l'expression rationnelle : %s\n"
++msgstr "mutt_restore_default(%s) : erreur dans l'expression rationnelle : %s\n"
+
+ # , c-format
+-#: init.c:1242
++#: init.c:1519
+ #, c-format
+ msgid "%s: unknown variable"
+-msgstr "%s : variable inconnue"
++msgstr "%s : variable inconnue"
+
+-#: init.c:1251
++#: init.c:1528
+ #, c-format
+ msgid "prefix is illegal with reset"
+ msgstr "ce préfixe est illégal avec reset"
+
+-#: init.c:1257
++#: init.c:1534
+ #, c-format
+ msgid "value is illegal with reset"
+ msgstr "cette valeur est illégale avec reset"
+
+ # , c-format
+-#: init.c:1296
++#: init.c:1587
+ #, c-format
+ msgid "%s is set"
+ msgstr "%s est positionné"
+
+ # , c-format
+-#: init.c:1296
++#: init.c:1587
+ #, c-format
+ msgid "%s is unset"
+ msgstr "%s n'est pas positionné"
+
+ # , c-format
+-#: init.c:1486
++#: init.c:1782
+ #, c-format
+ msgid "%s: invalid mailbox type"
+-msgstr "%s : type de boîte aux lettres invalide"
++msgstr "%s : type de boîte aux lettres invalide"
+
+ # , c-format
+-#: init.c:1511 init.c:1556
++#: init.c:1808 init.c:1854
+ #, c-format
+ msgid "%s: invalid value"
+-msgstr "%s : valeur invalide"
++msgstr "%s : valeur invalide"
+
+ # , c-format
+-#: init.c:1597
++#: init.c:1895
+ #, c-format
+ msgid "%s: Unknown type."
+-msgstr "%s : type inconnu."
++msgstr "%s : type inconnu."
+
+ # , c-format
+-#: init.c:1623
++#: init.c:1922
+ #, c-format
+ msgid "%s: unknown type"
+-msgstr "%s : type inconnu"
++msgstr "%s : type inconnu"
+
+ # , c-format
+-#: init.c:1682
++#: init.c:1981
+ #, c-format
+ msgid "Error in %s, line %d: %s"
+-msgstr "Erreur dans %s, ligne %d : %s"
++msgstr "Erreur dans %s, ligne %d : %s"
+
+ # , c-format
+ #. the muttrc source keyword
+-#: init.c:1705
++#: init.c:2004
+ #, c-format
+ msgid "source: errors in %s"
+-msgstr "source : erreurs dans %s"
++msgstr "source : erreurs dans %s"
+
+-#: init.c:1706
++#: init.c:2005
+ #, c-format
+ msgid "source: reading aborted due too many errors in %s"
+-msgstr "source : lecture interrompue car trop d'erreurs dans %s"
++msgstr "source : lecture interrompue car trop d'erreurs dans %s"
+
+ # , c-format
+-#: init.c:1720
++#: init.c:2019
+ #, c-format
+ msgid "source: error at %s"
+-msgstr "source : erreur dans %s"
++msgstr "source : erreur dans %s"
+
+-#: init.c:1725
++#: init.c:2024
+ msgid "source: too many arguments"
+-msgstr "source : trop d'arguments"
++msgstr "source : trop d'arguments"
+
+ # , c-format
+-#: init.c:1776
++#: init.c:2075
+ #, c-format
+ msgid "%s: unknown command"
+-msgstr "%s : commande inconnue"
++msgstr "%s : commande inconnue"
+
+ # , c-format
+-#: init.c:2220
++#: init.c:2523
+ #, c-format
+ msgid "Error in command line: %s\n"
+-msgstr "Erreur dans la ligne de commande : %s\n"
++msgstr "Erreur dans la ligne de commande : %s\n"
+
+-#: init.c:2270
++#: init.c:2573
+ msgid "unable to determine home directory"
+ msgstr "impossible de déterminer le répertoire personnel"
+
+-#: init.c:2278
++#: init.c:2581
+ msgid "unable to determine username"
+ msgstr "impossible de déterminer le nom d'utilisateur"
+
+@@ -2379,13 +2404,13 @@ msgstr "Cette touche n'est pas affectée.
+
+ #: keymap.c:699
+ msgid "push: too many arguments"
+-msgstr "push : trop d'arguments"
++msgstr "push : trop d'arguments"
+
+ # , c-format
+ #: keymap.c:729
+ #, c-format
+ msgid "%s: no such menu"
+-msgstr "%s : ce menu n'existe pas"
++msgstr "%s : ce menu n'existe pas"
+
+ #: keymap.c:744
+ msgid "null key sequence"
+@@ -2393,36 +2418,36 @@ msgstr "séquence de touches nulle"
+
+ #: keymap.c:831
+ msgid "bind: too many arguments"
+-msgstr "bind : trop d'arguments"
++msgstr "bind : trop d'arguments"
+
+ # , c-format
+ #: keymap.c:854
+ #, c-format
+ msgid "%s: no such function in map"
+-msgstr "%s : cette fonction n'existe pas dans la table"
++msgstr "%s : cette fonction n'existe pas dans la table"
+
+ #: keymap.c:878
+ msgid "macro: empty key sequence"
+-msgstr "macro : séquence de touches vide"
++msgstr "macro : séquence de touches vide"
+
+ #: keymap.c:889
+ msgid "macro: too many arguments"
+-msgstr "macro : trop d'arguments"
++msgstr "macro : trop d'arguments"
+
+ #: keymap.c:925
+ msgid "exec: no arguments"
+-msgstr "exec : pas d'arguments"
++msgstr "exec : pas d'arguments"
+
+ # , c-format
+ #: keymap.c:945
+ #, c-format
+ msgid "%s: no such function"
+-msgstr "%s : cette fonction n'existe pas"
++msgstr "%s : cette fonction n'existe pas"
+
+ # , c-format
+ #: keymap.c:966
+ msgid "Enter keys (^G to abort): "
+-msgstr "Entrez des touches (^G pour abandonner) : "
++msgstr "Entrez des touches (^G pour abandonner) : "
+
+ #: keymap.c:971
+ #, c-format
+@@ -3227,28 +3252,28 @@ msgstr ""
+
+ #: lib.c:133 lib.c:148 lib.c:180
+ msgid "Out of memory!"
+-msgstr "Plus de mémoire !"
++msgstr "Plus de mémoire !"
+
+ #: main.c:59
+ msgid ""
+ "To contact the developers, please mail to <mutt-dev@mutt.org>.\n"
+-"To report a bug, please use the flea(1) utility.\n"
++"To report a bug, please visit http://bugs.mutt.org/.\n"
+ msgstr ""
+ "Pour contacter les développeurs, veuillez écrire à <mutt-dev@mutt.org>.\n"
+-"Pour signaler un bug, veuillez utiliser l'utilitaire flea(1).\n"
++"Pour signaler un bug, veuillez aller sur http://bugs.mutt.org/.\n"
+
+ #: main.c:63
+ msgid ""
+-"Copyright (C) 1996-2002 Michael R. Elkins and others.\n"
++"Copyright (C) 1996-2005 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-2002 Michael R. Elkins et autres.\n"
+-"Mutt ne fournit ABSOLUMENT AUCUNE GARANTIE ; pour les détails tapez `mutt -"
++"Copyright (C) 1996-2005 Michael R. Elkins et autres.\n"
++"Mutt ne fournit ABSOLUMENT AUCUNE GARANTIE ; pour les détails tapez `mutt -"
+ "vv'.\n"
+ "Mutt est un logiciel libre, et vous êtes libre de le redistribuer\n"
+-"sous certaines conditions ; tapez `mutt -vv' pour les détails.\n"
++"sous certaines conditions ; tapez `mutt -vv' pour les détails.\n"
+
+ #: main.c:69
+ msgid ""
+@@ -3260,22 +3285,8 @@ msgid ""
+ "Copyright (C) 1999-2002 Tommi Komulainen <Tommi.Komulainen@iki.fi>\n"
+ "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+ "\n"
+-"Lots of others not mentioned here contributed lots of code,\n"
+-"fixes, and suggestions.\n"
+-"\n"
+-" 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"
+-" the Free Software Foundation; either version 2 of the License, or\n"
+-" (at your option) any later version.\n"
+-"\n"
+-" This program is distributed in the hope that it will be useful,\n"
+-" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+-" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+-" GNU General Public License for more details.\n"
+-"\n"
+-" 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"
++"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-2002 Brandon Long <blong@fiction.net>\n"
+@@ -3286,23 +3297,43 @@ msgstr ""
+ "Copyright (C) 2000-2002 Edmund Grimley Evans <edmundo@rano.org>\n"
+ "\n"
+ "De nombreuses autres personnes non mentionnées ici ont fourni\n"
+-"beaucoup de code, des corrections et des suggestions.\n"
++"du code, des corrections et des suggestions.\n"
++
++#: main.c:81
++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"
++" the Free Software Foundation; either version 2 of the License, or\n"
++" (at your option) any later version.\n"
+ "\n"
+-" Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou\n"
++" This program is distributed in the hope that it will be useful,\n"
++" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
++" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
++" GNU General Public License for more details.\n"
++msgstr ""
++" Ce programme est un logiciel libre ; vous pouvez le redistribuer et/ou\n"
+ " le modifier sous les termes de la GNU General Public License telle que\n"
+-" publiée par la Free Software Foundation ; que ce soit la version 2 de\n"
++" publiée par la Free Software Foundation ; que ce soit la version 2 de\n"
+ " la licence, ou (selon votre choix) une version plus récente.\n"
+ "\n"
+ " Ce programme est distribué avec l'espoir qu'il soit utile,\n"
+-" mais SANS AUCUNE GARANTIE ; sans même la garantie implicite de\n"
++" mais SANS AUCUNE GARANTIE ; sans même la garantie implicite de\n"
+ " QUALITÉ MARCHANDE ou d'ADÉQUATION À UN BESOIN PARTICULIER. Référez-vous\n"
+ " à la GNU General Public License pour plus de détails.\n"
+-"\n"
++
++#: main.c:91
++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 ""
+ " Vous devez avoir reçu un exemplaire de la GNU General Public License\n"
+-" avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software\n"
+-" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
++" avec ce programme ; si ce n'est pas le cas, écrivez à la Free Software\n"
++" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-"
++"1301, USA.\n"
+
+-#: main.c:107
++#: main.c:108
+ msgid ""
+ "usage: mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f "
+ "<file> ]\n"
+@@ -3315,13 +3346,6 @@ msgid ""
+ "[ -i <file> ] [ -s <subj> ] [ -b <addr> ] [ -c <addr> ] <addr> [ ... ]\n"
+ " mutt [ -n ] [ -e <cmd> ] [ -F <file> ] -p\n"
+ " mutt -v[v]\n"
+-"\n"
+-"options:\n"
+-" -A <alias>\texpand the given alias\n"
+-" -a <file>\tattach a file to the message\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 ""
+ "usage : mutt [ -nRyzZ ] [ -e <cmd> ] [ -F <fich> ] [ -m <type> ] [ -f "
+ "<fich> ]\n"
+@@ -3334,7 +3358,16 @@ msgstr ""
+ "[ -i <fich> ] [ -s <obj> ] [ -b <adr> ] [ -c <adr> ] <adr> [ ... ]\n"
+ " mutt [ -n ] [ -e <cmd> ] [ -F <fich> ] -p\n"
+ " mutt -v[v]\n"
+-"\n"
++
++#: main.c:116
++msgid ""
++"options:\n"
++" -A <alias>\texpand the given alias\n"
++" -a <file>\tattach a file to the message\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 :\n"
+ " -A <alias>\tdéveloppe l'alias mentionné\n"
+ " -a <fich>\tattache un fichier à ce message\n"
+@@ -3342,11 +3375,11 @@ msgstr ""
+ " -c <adresse>\tspécifie une adresse à mettre en copie (CC)\n"
+ " -D\t\técrit la valeur de toutes les variables sur stdout"
+
+-#: main.c:122
++#: main.c:124
+ msgid " -d <level>\tlog debugging output to ~/.muttdebug0"
+ msgstr " -d <niveau>\técrit les infos de débuggage dans ~/.muttdebug0"
+
+-#: main.c:125
++#: main.c:127
+ msgid ""
+ " -e <command>\tspecify a command to be executed after initialization\n"
+ " -f <file>\tspecify which mailbox to read\n"
+@@ -3355,7 +3388,19 @@ msgid ""
+ " -i <file>\tspecify a file which Mutt should include in the body\n"
+ " -m <type>\tspecify a default mailbox type\n"
+ " -n\t\tcauses Mutt not to read the system Muttrc\n"
+-" -p\t\trecall a postponed message\n"
++" -p\t\trecall a postponed message"
++msgstr ""
++" -e <commande>\tspécifie une commande à exécuter après l'initialisation\n"
++" -f <fich>\tspécifie quelle boîte aux lettres lire\n"
++" -F <fich>\tspécifie un fichier muttrc alternatif\n"
++" -H <fich>\tspécifie un fichier de brouillon d'où lire en-têtes et corps\n"
++" -i <fich>\tspécifie un fichier que Mutt doit inclure dans le corps\n"
++" -m <type>\tspécifie un type de boîte aux lettres par défaut\n"
++" -n\t\tfait que Mutt ne lit pas le fichier Muttrc système\n"
++" -p\t\trappelle un message ajourné"
++
++#: main.c:136
++msgid ""
+ " -Q <variable>\tquery a configuration variable\n"
+ " -R\t\topen mailbox in read-only mode\n"
+ " -s <subj>\tspecify a subject (must be in quotes if it has spaces)\n"
+@@ -3366,14 +3411,6 @@ msgid ""
+ " -Z\t\topen the first folder with new message, exit immediately if none\n"
+ " -h\t\tthis help message"
+ msgstr ""
+-" -e <commande>\tspécifie une commande à exécuter après l'initialisation\n"
+-" -f <fich>\tspécifie quelle boîte aux lettres lire\n"
+-" -F <fich>\tspécifie un fichier muttrc alternatif\n"
+-" -H <fich>\tspécifie un fichier de brouillon d'où lire en-têtes et corps\n"
+-" -i <fich>\tspécifie un fichier que Mutt doit inclure dans le corps\n"
+-" -m <type>\tspécifie un type de boîte aux lettres par défaut\n"
+-" -n\t\tfait que Mutt ne lit pas le fichier Muttrc système\n"
+-" -p\t\trappelle un message ajourné\n"
+ " -Q <variable>\tdemande la valeur d'une variable de configuration\n"
+ " -R\t\touvre la boîte aux lettres en mode lecture seule\n"
+ " -s <obj>\tspécifie un objet (entre guillemets s'il contient des espaces)\n"
+@@ -3384,58 +3421,58 @@ msgstr ""
+ " -Z\t\touvre le premier dossier ayant un nouveau message, quitte sinon\n"
+ " -h\t\tce message d'aide"
+
+-#: main.c:181
++#: main.c:185
+ msgid ""
+ "\n"
+ "Compile options:"
+ msgstr ""
+ "\n"
+-"Options de compilation :"
++"Options de compilation :"
+
+-#: main.c:487
++#: main.c:494
+ msgid "Error initializing terminal."
+ msgstr "Erreur d'initialisation du terminal."
+
+ # , c-format
+-#: main.c:597
++#: main.c:604
+ #, c-format
+ msgid "Debugging at level %d.\n"
+ msgstr "Débuggage au niveau %d.\n"
+
+-#: main.c:599
++#: main.c:606
+ msgid "DEBUG was not defined during compilation. Ignored.\n"
+ msgstr "DEBUG n'a pas été défini à la compilation. Ignoré.\n"
+
+-#: main.c:749
++#: main.c:758
+ #, c-format
+ msgid "%s does not exist. Create it?"
+-msgstr "%s n'existe pas. Le créer ?"
++msgstr "%s n'existe pas. Le créer ?"
+
+ # , c-format
+-#: main.c:753
++#: main.c:762
+ #, c-format
+ msgid "Can't create %s: %s."
+-msgstr "Impossible de créer %s : %s."
++msgstr "Impossible de créer %s : %s."
+
+-#: main.c:798
++#: main.c:807
+ msgid "No recipients specified.\n"
+ msgstr "Pas de destinataire spécifié.\n"
+
+ # , c-format
+-#: main.c:884
++#: main.c:893
+ #, c-format
+ msgid "%s: unable to attach file.\n"
+-msgstr "%s : impossible d'attacher le fichier.\n"
++msgstr "%s : impossible d'attacher le fichier.\n"
+
+-#: main.c:904
++#: main.c:913
+ msgid "No mailbox with new mail."
+ msgstr "Pas de boîte aux lettres avec des nouveaux messages."
+
+-#: main.c:913
++#: main.c:922
+ msgid "No incoming mailboxes defined."
+ msgstr "Pas de boîtes aux lettres recevant du courrier définies."
+
+-#: main.c:941
++#: main.c:950
+ msgid "Mailbox is empty."
+ msgstr "La boîte aux lettres est vide."
+
+@@ -3446,19 +3483,19 @@ msgstr "Lecture de %s... %d (%d%%)"
+
+ #: mbox.c:153 mbox.c:210
+ msgid "Mailbox is corrupt!"
+-msgstr "La boîte aux lettres est altérée !"
++msgstr "La boîte aux lettres est altérée !"
+
+ #: mbox.c:662
+ msgid "Mailbox was corrupted!"
+-msgstr "La boîte aux lettres a été altérée !"
++msgstr "La boîte aux lettres a été altérée !"
+
+ #: mbox.c:701 mbox.c:952
+ msgid "Fatal error! Could not reopen mailbox!"
+-msgstr "Erreur fatale ! La boîte aux lettres n'a pas pu être réouverte !"
++msgstr "Erreur fatale ! La boîte aux lettres n'a pas pu être réouverte !"
+
+ #: mbox.c:710
+ msgid "Unable to lock mailbox!"
+-msgstr "Impossible de verrouiller la boîte aux lettres !"
++msgstr "Impossible de verrouiller la boîte aux lettres !"
+
+ #. this means ctx->changed or ctx->deleted was set, but no
+ #. * messages were found to be changed or deleted. This should
+@@ -3466,7 +3503,7 @@ msgstr "Impossible de verrouiller la boî
+ #.
+ #: mbox.c:753
+ msgid "sync: mbox modified, but no modified messages! (report this bug)"
+-msgstr "sync : BAL modifiée, mais pas de message modifié ! (signalez ce bug)"
++msgstr "sync : BAL modifiée, mais pas de message modifié ! (signalez ce bug)"
+
+ #: mbox.c:792
+ #, c-format
+@@ -3484,11 +3521,11 @@ msgstr "Écriture des changements..."
+ #: mbox.c:936
+ #, c-format
+ msgid "Write failed! Saved partial mailbox to %s"
+-msgstr "Erreur d'écriture ! Boîte aux lettres partielle sauvée dans %s"
++msgstr "Erreur d'écriture ! Boîte aux lettres partielle sauvée dans %s"
+
+ #: mbox.c:1000
+ msgid "Could not reopen mailbox!"
+-msgstr "La boîte aux lettres n'a pas pu être réouverte !"
++msgstr "La boîte aux lettres n'a pas pu être réouverte !"
+
+ #: mbox.c:1035
+ msgid "Reopening mailbox..."
+@@ -3496,7 +3533,7 @@ msgstr "Réouverture de la boîte aux lett
+
+ #: menu.c:419
+ msgid "Jump to: "
+-msgstr "Aller à : "
++msgstr "Aller à : "
+
+ #: menu.c:428
+ msgid "Invalid index number."
+@@ -3531,19 +3568,19 @@ msgstr "Vous êtes sur la dernière entrée
+ msgid "You are on the first entry."
+ msgstr "Vous êtes sur la première entrée."
+
+-#: menu.c:718 pattern.c:1303
++#: menu.c:718 pattern.c:1325
+ msgid "Search for: "
+-msgstr "Rechercher : "
++msgstr "Rechercher : "
+
+-#: menu.c:719 pattern.c:1304
++#: menu.c:719 pattern.c:1326
+ msgid "Reverse search for: "
+-msgstr "Rechercher en arrière : "
++msgstr "Rechercher en arrière : "
+
+-#: menu.c:729 pattern.c:1336
++#: menu.c:729 pattern.c:1358
+ msgid "No search pattern."
+ msgstr "Pas de motif de recherche."
+
+-#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1405
++#: menu.c:759 pager.c:1989 pager.c:2005 pager.c:2113 pattern.c:1427
+ msgid "Not found."
+ msgstr "Non trouvé."
+
+@@ -3571,7 +3608,7 @@ msgstr "Lecture de %s... %d"
+
+ #: mh.c:1203
+ msgid "maildir_commit_message(): unable to set time on file"
+-msgstr "maildir_commit_message() : impossible de fixer l'heure du fichier"
++msgstr "maildir_commit_message() : impossible de fixer l'heure du fichier"
+
+ # , c-format
+ #: mutt_socket.c:91 mutt_socket.c:147
+@@ -3629,12 +3666,12 @@ msgstr "Impossible de trouver assez d'en
+ #: mutt_ssl.c:199
+ #, c-format
+ msgid "Filling entropy pool: %s...\n"
+-msgstr "Remplissage du tas d'entropie : %s...\n"
++msgstr "Remplissage du tas d'entropie : %s...\n"
+
+ #: mutt_ssl.c:207
+ #, c-format
+ msgid "%s has insecure permissions!"
+-msgstr "%s a des droits d'accès peu sûrs !"
++msgstr "%s a des droits d'accès peu sûrs !"
+
+ #: mutt_ssl.c:226
+ msgid "SSL disabled due the lack of entropy"
+@@ -3647,7 +3684,7 @@ msgstr "erreur d'E/S"
+ #: mutt_ssl.c:331
+ #, c-format
+ msgid "SSL failed: %s"
+-msgstr "SSL a échoué : %s"
++msgstr "SSL a échoué : %s"
+
+ #: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502
+ #: mutt_ssl_gnutls.c:531
+@@ -3685,11 +3722,11 @@ msgstr "Le certificat du serveur a expir
+
+ #: mutt_ssl.c:629 mutt_ssl_gnutls.c:634
+ msgid "This certificate belongs to:"
+-msgstr "Ce certificat appartient à :"
++msgstr "Ce certificat appartient à :"
+
+ #: mutt_ssl.c:640 mutt_ssl_gnutls.c:673
+ msgid "This certificate was issued by:"
+-msgstr "Ce certificat a été émis par :"
++msgstr "Ce certificat a été émis par :"
+
+ #: mutt_ssl.c:651 mutt_ssl_gnutls.c:712
+ #, c-format
+@@ -3709,7 +3746,7 @@ msgstr " à %s"
+ #: mutt_ssl.c:660
+ #, c-format
+ msgid "Fingerprint: %s"
+-msgstr "Empreinte: %s"
++msgstr "Empreinte : %s"
+
+ #: mutt_ssl.c:662
+ msgid "SSL Certificate check"
+@@ -3733,7 +3770,7 @@ msgstr "ru"
+
+ #: mutt_ssl.c:703 mutt_ssl_gnutls.c:815
+ msgid "Warning: Couldn't save certificate"
+-msgstr "Attention : le certificat n'a pas pu être sauvé"
++msgstr "Attention : le certificat n'a pas pu être sauvé"
+
+ #: mutt_ssl.c:708 mutt_ssl_gnutls.c:820
+ msgid "Certificate saved"
+@@ -3825,7 +3862,7 @@ msgstr "Erreur de tunnel en parlant à %s
+ #: muttlib.c:910
+ msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
+ msgstr ""
+-"Le fichier est un répertoire, sauver dans celui-ci ? [(o)ui, (n)on, (t)ous]"
++"Le fichier est un répertoire, sauver dans celui-ci ? [(o)ui, (n)on, (t)ous]"
+
+ #: muttlib.c:910
+ msgid "yna"
+@@ -3833,15 +3870,15 @@ msgstr "ont"
+
+ #: muttlib.c:926
+ msgid "File is a directory, save under it?"
+-msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
++msgstr "Le fichier est un répertoire, sauver dans celui-ci ?"
+
+ #: muttlib.c:932
+ msgid "File under directory: "
+-msgstr "Fichier dans le répertoire : "
++msgstr "Fichier dans le répertoire : "
+
+ #: muttlib.c:944
+ msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
+-msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
++msgstr "Le fichier existe, écras(e)r, (c)oncaténer ou (a)nnuler ?"
+
+ #: muttlib.c:944
+ msgid "oac"
+@@ -3855,19 +3892,19 @@ msgstr "Impossible de sauver le message
+ #: muttlib.c:1272
+ #, c-format
+ msgid "Append messages to %s?"
+-msgstr "Ajouter les messages à %s ?"
++msgstr "Ajouter les messages à %s ?"
+
+ # , c-format
+ #: muttlib.c:1284
+ #, c-format
+ msgid "%s is not a mailbox!"
+-msgstr "%s n'est pas une boîte aux lettres !"
++msgstr "%s n'est pas une boîte aux lettres !"
+
+ # , c-format
+ #: mx.c:120
+ #, c-format
+ msgid "Lock count exceeded, remove lock for %s?"
+-msgstr "Nombre d'essais de verrouillage dépassé, enlever le verrou pour %s ?"
++msgstr "Nombre d'essais de verrouillage dépassé, enlever le verrou pour %s ?"
+
+ # , c-format
+ #: mx.c:132
+@@ -3877,7 +3914,7 @@ msgstr "Impossible de verrouiller %s ave
+
+ #: mx.c:190
+ msgid "Timeout exceeded while attempting fcntl lock!"
+-msgstr "Délai dépassé lors de la tentative de verrouillage fcntl !"
++msgstr "Délai dépassé lors de la tentative de verrouillage fcntl !"
+
+ # , c-format
+ #: mx.c:196
+@@ -3887,7 +3924,7 @@ msgstr "Attente du verrouillage fcntl...
+
+ #: mx.c:224
+ msgid "Timeout exceeded while attempting flock lock!"
+-msgstr "Délai dépassé lors de la tentative de verrouillage flock !"
++msgstr "Délai dépassé lors de la tentative de verrouillage flock !"
+
+ # , c-format
+ #: mx.c:231
+@@ -3916,25 +3953,25 @@ msgstr "Écriture de %s..."
+ #: mx.c:812
+ #, c-format
+ msgid "Could not synchronize mailbox %s!"
+-msgstr "Impossible de synchroniser la boîte aux lettres %s !"
++msgstr "Impossible de synchroniser la boîte aux lettres %s !"
+
+ # , c-format
+ #: mx.c:878
+ #, c-format
+ msgid "Move read messages to %s?"
+-msgstr "Déplacer les messages lus dans %s ?"
++msgstr "Déplacer les messages lus dans %s ?"
+
+ # , c-format
+ #: mx.c:894 mx.c:1150
+ #, c-format
+ msgid "Purge %d deleted message?"
+-msgstr "Effacer %d message(s) marqué(s) à effacer ?"
++msgstr "Effacer %d message(s) marqué(s) à effacer ?"
+
+ # , c-format
+ #: mx.c:894 mx.c:1150
+ #, c-format
+ msgid "Purge %d deleted messages?"
+-msgstr "Effacer %d message(s) marqué(s) à effacer ?"
++msgstr "Effacer %d message(s) marqué(s) à effacer ?"
+
+ # , c-format
+ #: mx.c:918
+@@ -3966,7 +4003,7 @@ msgstr " Appuyez sur '%s' pour inverser
+
+ #: mx.c:1128
+ msgid "Use 'toggle-write' to re-enable write!"
+-msgstr "Utilisez 'toggle-write' pour réautoriser l'écriture !"
++msgstr "Utilisez 'toggle-write' pour réautoriser l'écriture !"
+
+ # , c-format
+ #: mx.c:1130
+@@ -3986,164 +4023,165 @@ msgstr "Impossible d'écrire le message"
+ msgid "Integer overflow -- can't allocate memory."
+ msgstr "Dépassement de capacité sur entier -- impossible d'allouer la mémoire."
+
+-#: pager.c:57
+-msgid "Not available in this menu."
+-msgstr "Non disponible dans ce menu."
+-
+-#: pager.c:1484
++#: pager.c:1488
+ msgid "PrevPg"
+ msgstr "PgPréc"
+
+-#: pager.c:1485
++#: pager.c:1489
+ msgid "NextPg"
+ msgstr "PgSuiv"
+
+-#: pager.c:1489
++#: pager.c:1493
+ msgid "View Attachm."
+ msgstr "Voir attach."
+
+-#: pager.c:1492
++#: pager.c:1496
+ msgid "Next"
+ msgstr "Suivant"
+
+ #. emulate "less -q" and don't go on to the next message.
+-#: pager.c:1888 pager.c:1919 pager.c:1951 pager.c:2192
++#: pager.c:1897 pager.c:1928 pager.c:1960 pager.c:2201
+ msgid "Bottom of message is shown."
+ msgstr "La fin du message est affichée."
+
+-#: pager.c:1904 pager.c:1926 pager.c:1933 pager.c:1940
++#: pager.c:1913 pager.c:1935 pager.c:1942 pager.c:1949
+ msgid "Top of message is shown."
+ msgstr "Le début du message est affiché."
+
+-#: pager.c:2009
++#: pager.c:2018
+ msgid "Reverse search: "
+-msgstr "Rechercher en arrière : "
++msgstr "Rechercher en arrière : "
+
+-#: pager.c:2010
++#: pager.c:2019
+ msgid "Search: "
+-msgstr "Rechercher : "
++msgstr "Rechercher : "
+
+-#: pager.c:2130
++#: pager.c:2139
+ msgid "Help is currently being shown."
+ msgstr "L'aide est actuellement affichée."
+
+-#: pager.c:2159
++#: pager.c:2168
+ msgid "No more quoted text."
+ msgstr "Il n'y a plus de texte cité."
+
+-#: pager.c:2172
++#: pager.c:2181
+ msgid "No more unquoted text after quoted text."
+ msgstr "Il n'y a plus de texte non cité après le texte cité."
+
+-#: parse.c:602
++#: parse.c:606
+ msgid "multipart message has no boundary parameter!"
+-msgstr "le message multipart n'a pas de paramètre boundary !"
++msgstr "le message multipart n'a pas de paramètre boundary !"
+
+ # , c-format
+-#: pattern.c:263
++#: pattern.c:264
+ #, c-format
+ msgid "Error in expression: %s"
+-msgstr "Erreur dans l'expression : %s"
++msgstr "Erreur dans l'expression : %s"
++
++#: pattern.c:269
++#, c-format
++msgid "Empty expression"
++msgstr "Expression vide"
+
+ # , c-format
+-#: pattern.c:389
++#: pattern.c:395
+ #, c-format
+ msgid "Invalid day of month: %s"
+-msgstr "Quantième invalide : %s"
++msgstr "Quantième invalide : %s"
+
+ # , c-format
+-#: pattern.c:403
++#: pattern.c:409
+ #, c-format
+ msgid "Invalid month: %s"
+-msgstr "Mois invalide : %s"
++msgstr "Mois invalide : %s"
+
+ # , c-format
+ #. getDate has its own error message, don't overwrite it here
+-#: pattern.c:555
++#: pattern.c:561
+ #, c-format
+ msgid "Invalid relative date: %s"
+-msgstr "Date relative invalide : %s"
++msgstr "Date relative invalide : %s"
+
+-#: pattern.c:569
++#: pattern.c:575
+ msgid "error in expression"
+ msgstr "erreur dans l'expression"
+
+ # , c-format
+-#: pattern.c:784 pattern.c:894
++#: pattern.c:790 pattern.c:900
+ #, c-format
+ msgid "error in pattern at: %s"
+-msgstr "erreur dans le motif à : %s"
++msgstr "erreur dans le motif à : %s"
+
+ # , c-format
+-#: pattern.c:834
++#: pattern.c:840
+ #, c-format
+ msgid "%c: invalid command"
+-msgstr "%c : commande invalide"
++msgstr "%c : commande invalide"
+
+ # , c-format
+-#: pattern.c:840
++#: pattern.c:846
+ #, c-format
+ msgid "%c: not supported in this mode"
+-msgstr "%c : non supporté dans ce mode"
++msgstr "%c : non supporté dans ce mode"
+
+-#: pattern.c:853
++#: pattern.c:859
+ #, c-format
+ msgid "missing parameter"
+ msgstr "paramètre manquant"
+
+ # , c-format
+-#: pattern.c:869
++#: pattern.c:875
+ #, c-format
+ msgid "mismatched parenthesis: %s"
+-msgstr "parenthésage incorrect : %s"
++msgstr "parenthésage incorrect : %s"
+
+-#: pattern.c:901
++#: pattern.c:907
+ msgid "empty pattern"
+ msgstr "motif vide"
+
+ # , c-format
+-#: pattern.c:1117
++#: pattern.c:1139
+ #, c-format
+ msgid "error: unknown op %d (report this error)."
+-msgstr "erreur : opération inconnue %d (signalez cette erreur)."
++msgstr "erreur : opération inconnue %d (signalez cette erreur)."
+
+-#: pattern.c:1193 pattern.c:1322
++#: pattern.c:1215 pattern.c:1344
+ msgid "Compiling search pattern..."
+ msgstr "Compilation du motif de recherche..."
+
+-#: pattern.c:1212
++#: pattern.c:1234
+ msgid "Executing command on matching messages..."
+ msgstr "Exécution de la commande sur les messages correspondants..."
+
+-#: pattern.c:1275
++#: pattern.c:1297
+ msgid "No messages matched criteria."
+ msgstr "Aucun message ne correspond au critère."
+
+-#: pattern.c:1364
++#: pattern.c:1386
+ msgid "Search hit bottom without finding match"
+ msgstr "Fin atteinte sans rien avoir trouvé"
+
+-#: pattern.c:1375
++#: pattern.c:1397
+ msgid "Search hit top without finding match"
+ msgstr "Début atteint sans rien avoir trouvé"
+
+-#: pattern.c:1397
++#: pattern.c:1419
+ msgid "Search interrupted."
+ msgstr "Recherche interrompue."
+
+ #: pgp.c:90
+ msgid "Enter PGP passphrase:"
+-msgstr "Entrez la phrase de passe PGP :"
++msgstr "Entrez la phrase de passe PGP :"
+
+ #: pgp.c:104
+ msgid "PGP passphrase forgotten."
+ msgstr "Phrase de passe PGP oubliée."
+
+-#: pgp.c:345
++#: pgp.c:352
+ msgid "[-- Error: unable to create PGP subprocess! --]\n"
+-msgstr "[-- Erreur : impossible de créer le sous-processus PGP ! --]\n"
++msgstr "[-- Erreur : impossible de créer le sous-processus PGP ! --]\n"
+
+-#: pgp.c:379 pgp.c:620 pgp.c:824
++#: pgp.c:386 pgp.c:631 pgp.c:835
+ msgid ""
+ "[-- End of PGP output --]\n"
+ "\n"
+@@ -4151,53 +4189,53 @@ msgstr ""
+ "[-- Fin de sortie PGP --]\n"
+ "\n"
+
+-#: pgp.c:392 pgp.c:956
++#: pgp.c:400 pgp.c:967
+ msgid "Could not decrypt PGP message"
+ msgstr "Impossible de déchiffrer le message PGP"
+
+ #. clear 'Invoking...' message, since there's no error
+-#: pgp.c:441 pgp.c:952
++#: pgp.c:452 pgp.c:963
+ msgid "PGP message successfully decrypted."
+ msgstr "Message PGP déchiffré avec succès."
+
+-#: pgp.c:728
++#: pgp.c:739
+ msgid "Internal error. Inform <roessler@does-not-exist.org>."
+ msgstr "Erreur interne. Veuillez avertir <roessler@does-not-exist.org>."
+
+-#: pgp.c:789
++#: pgp.c:800
+ msgid ""
+ "[-- Error: could not create a PGP subprocess! --]\n"
+ "\n"
+ msgstr ""
+-"[-- Erreur : impossible de créer un sous-processus PGP ! --]\n"
++"[-- Erreur : impossible de créer un sous-processus PGP ! --]\n"
+ "\n"
+
+-#: pgp.c:833
++#: pgp.c:844
+ msgid "Decryption failed"
+ msgstr "Le déchiffrage a échoué"
+
+-#: pgp.c:1008
++#: pgp.c:1019
+ msgid "Can't open PGP subprocess!"
+-msgstr "Impossible d'ouvrir le sous-processus PGP !"
++msgstr "Impossible d'ouvrir le sous-processus PGP !"
+
+-#: pgp.c:1444
++#: pgp.c:1455
+ msgid "Can't invoke PGP"
+ msgstr "Impossible d'invoquer PGP"
+
+-#: pgp.c:1545
++#: pgp.c:1556
+ #, c-format
+ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "
+-msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, %s, en clai(r) ? "
++msgstr "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, %s, en clai(r) ? "
+
+-#: pgp.c:1546
++#: pgp.c:1557
+ msgid "PGP/M(i)ME"
+ msgstr "PGP/M(i)ME"
+
+-#: pgp.c:1546
++#: pgp.c:1557
+ msgid "(i)nline"
+ msgstr "en l(i)gne"
+
+-#: pgp.c:1548
++#: pgp.c:1559
+ msgid "esabifc"
+ msgstr "csedior"
+
+@@ -4226,7 +4264,7 @@ msgstr "Impossible d'ouvrir /dev/null"
+
+ #: pgpkey.c:724
+ msgid "Please enter the key ID: "
+-msgstr "Veuillez entrer l'ID de la clé : "
++msgstr "Veuillez entrer l'ID de la clé : "
+
+ #: pgpkey.c:752
+ msgid "Invoking pgp..."
+@@ -4245,7 +4283,7 @@ msgstr "La commande TOP n'est pas suppor
+
+ #: pop.c:118
+ msgid "Can't write header to temporary file!"
+-msgstr "Impossible d'écrire l'en-tête dans le fichier temporaire !"
++msgstr "Impossible d'écrire l'en-tête dans le fichier temporaire !"
+
+ #: pop.c:199 pop_lib.c:203
+ #, c-format
+@@ -4263,7 +4301,7 @@ msgstr "Récupération de la liste des mes
+
+ #: pop.c:418
+ msgid "Can't write message to temporary file!"
+-msgstr "Impossible d'écrire le message dans le fichier temporaire !"
++msgstr "Impossible d'écrire le message dans le fichier temporaire !"
+
+ #: pop.c:520 pop.c:585
+ msgid "Checking for new messages..."
+@@ -4279,7 +4317,7 @@ msgstr "Aucun nouveau message dans la bo
+
+ #: pop.c:620
+ msgid "Delete messages from server?"
+-msgstr "Effacer les messages sur le serveur ?"
++msgstr "Effacer les messages sur le serveur ?"
+
+ # , c-format
+ #: pop.c:622
+@@ -4289,7 +4327,7 @@ msgstr "Lecture de nouveaux messages (%d
+
+ #: pop.c:664
+ msgid "Error while writing mailbox!"
+-msgstr "Erreur à l'écriture de la boîte aux lettres !"
++msgstr "Erreur à l'écriture de la boîte aux lettres !"
+
+ # , c-format
+ #: pop.c:668
+@@ -4299,7 +4337,7 @@ msgstr "%s [%d messages lus sur %d]"
+
+ #: pop.c:691 pop_lib.c:373
+ msgid "Server closed connection!"
+-msgstr "Le serveur a fermé la connexion !"
++msgstr "Le serveur a fermé la connexion !"
+
+ #: pop_auth.c:79
+ msgid "Authenticating (SASL)..."
+@@ -4339,7 +4377,7 @@ msgstr "Vérification des index des messa
+
+ #: pop_lib.c:580
+ msgid "Connection lost. Reconnect to POP server?"
+-msgstr "Connexion perdue. Se reconnecter au serveur POP ?"
++msgstr "Connexion perdue. Se reconnecter au serveur POP ?"
+
+ #: postpone.c:167
+ msgid "Postponed Messages"
+@@ -4393,7 +4431,7 @@ msgstr "Requête"
+ #. Prompt for Query
+ #: query.c:303 query.c:328
+ msgid "Query: "
+-msgstr "Requête : "
++msgstr "Requête : "
+
+ # , c-format
+ #: query.c:311 query.c:337
+@@ -4409,67 +4447,67 @@ msgstr "Pipe"
+ msgid "Print"
+ msgstr "Imprimer"
+
+-#: recvattach.c:435
++#: recvattach.c:452
+ msgid "Saving..."
+ msgstr "On sauve..."
+
+-#: recvattach.c:438 recvattach.c:527
++#: recvattach.c:455 recvattach.c:544
+ msgid "Attachment saved."
+ msgstr "Attachement sauvé."
+
+ # , c-format
+-#: recvattach.c:539
++#: recvattach.c:556
+ #, c-format
+ msgid "WARNING! You are about to overwrite %s, continue?"
+-msgstr "ATTENTION ! Vous allez écraser %s, continuer ?"
++msgstr "ATTENTION ! Vous allez écraser %s, continuer ?"
+
+-#: recvattach.c:557
++#: recvattach.c:574
+ msgid "Attachment filtered."
+ msgstr "Attachement filtré."
+
+-#: recvattach.c:624
++#: recvattach.c:641
+ msgid "Filter through: "
+-msgstr "Filtrer avec : "
++msgstr "Filtrer avec : "
+
+-#: recvattach.c:624
++#: recvattach.c:641
+ msgid "Pipe to: "
+-msgstr "Passer à la commande : "
++msgstr "Passer à la commande : "
+
+ # , c-format
+-#: recvattach.c:659
++#: recvattach.c:676
+ #, c-format
+ msgid "I dont know how to print %s attachments!"
+-msgstr "Je ne sais pas comment imprimer %s attachements !"
++msgstr "Je ne sais pas comment imprimer %s attachements !"
+
+-#: recvattach.c:724
++#: recvattach.c:741
+ msgid "Print tagged attachment(s)?"
+-msgstr "Imprimer l(es) attachement(s) marqué(s) ?"
++msgstr "Imprimer l(es) attachement(s) marqué(s) ?"
+
+-#: recvattach.c:724
++#: recvattach.c:741
+ msgid "Print attachment?"
+-msgstr "Imprimer l'attachement ?"
++msgstr "Imprimer l'attachement ?"
+
+-#: recvattach.c:957
++#: recvattach.c:974
+ msgid "Can't decrypt encrypted message!"
+-msgstr "Impossible de déchiffrer le message chiffré !"
++msgstr "Impossible de déchiffrer le message chiffré !"
+
+-#: recvattach.c:970
++#: recvattach.c:987
+ msgid "Attachments"
+ msgstr "Attachements"
+
+-#: recvattach.c:1006
++#: recvattach.c:1023
+ msgid "There are no subparts to show!"
+-msgstr "Il n'y a pas de sous-parties à montrer !"
++msgstr "Il n'y a pas de sous-parties à montrer !"
+
+-#: recvattach.c:1067
++#: recvattach.c:1084
+ msgid "Can't delete attachment from POP server."
+ msgstr "Impossible d'effacer l'attachement depuis le serveur POP."
+
+-#: recvattach.c:1075
++#: recvattach.c:1092
+ msgid "Deletion of attachments from encrypted messages is unsupported."
+ msgstr "L'effacement d'attachements des messages chiffrés n'est pas supporté."
+
+-#: recvattach.c:1094 recvattach.c:1111
++#: recvattach.c:1111 recvattach.c:1128
+ msgid "Only deletion of multipart attachments is supported."
+ msgstr "Seul l'effacement d'attachements multipart est supporté."
+
+@@ -4492,17 +4530,17 @@ msgstr "Impossible d'ouvrir le fichier t
+
+ #: recvcmd.c:448
+ msgid "Forward as attachments?"
+-msgstr "Faire suivre sous forme d'attachements ?"
++msgstr "Faire suivre sous forme d'attachements ?"
+
+ #: recvcmd.c:462
+ msgid "Can't decode all tagged attachments. MIME-forward the others?"
+ msgstr ""
+ "Impossible de décoder tous les attachements marqués. Faire suivre les "
+-"autres ?"
++"autres ?"
+
+ #: recvcmd.c:587
+ msgid "Forward MIME encapsulated?"
+-msgstr "Faire suivre en MIME encapsulé ?"
++msgstr "Faire suivre en MIME encapsulé ?"
+
+ # , c-format
+ #: recvcmd.c:595 recvcmd.c:845
+@@ -4514,15 +4552,15 @@ msgstr "Impossible de créer %s."
+ msgid "Can't find any tagged messages."
+ msgstr "Aucun message marqué n'a pu être trouvé."
+
+-#: recvcmd.c:749 send.c:715
++#: recvcmd.c:749 send.c:721
+ msgid "No mailing lists found!"
+-msgstr "Pas de liste de diffusion trouvée !"
++msgstr "Pas de liste de diffusion trouvée !"
+
+ #: recvcmd.c:824
+ msgid "Can't decode all tagged attachments. MIME-encapsulate the others?"
+ msgstr ""
+ "Impossible de décoder ts les attachements marqués. MIME-encapsuler les "
+-"autres ?"
++"autres ?"
+
+ #: remailer.c:484
+ msgid "Append"
+@@ -4542,7 +4580,7 @@ msgstr "OK"
+
+ #: remailer.c:516
+ msgid "Can't get mixmaster's type2.list!"
+-msgstr "Impossible d'obtenir le type2.list du mixmaster !"
++msgstr "Impossible d'obtenir le type2.list du mixmaster !"
+
+ #: remailer.c:542
+ msgid "Select a remailer chain."
+@@ -4578,7 +4616,7 @@ msgstr "Le mixmaster n'accepte pas les e
+ msgid ""
+ "Please set the hostname variable to a proper value when using mixmaster!"
+ msgstr ""
+-"Donnez une valeur correcte à hostname quand vous utilisez le mixmaster !"
++"Donnez une valeur correcte à hostname quand vous utilisez le mixmaster !"
+
+ # , c-format
+ #: remailer.c:772
+@@ -4608,15 +4646,15 @@ msgstr "Entrée mailcap pour le type %s n
+
+ #: score.c:75
+ msgid "score: too few arguments"
+-msgstr "score : pas assez d'arguments"
++msgstr "score : pas assez d'arguments"
+
+ #: score.c:84
+ msgid "score: too many arguments"
+-msgstr "score : trop d'arguments"
++msgstr "score : trop d'arguments"
+
+ #: send.c:252
+ msgid "No subject, abort?"
+-msgstr "Pas de sujet, abandonner ?"
++msgstr "Pas de sujet, abandonner ?"
+
+ #: send.c:254
+ msgid "No subject, aborting."
+@@ -4631,105 +4669,105 @@ msgstr "Pas de sujet, abandon."
+ #: send.c:488
+ #, c-format
+ msgid "Reply to %s%s?"
+-msgstr "Répondre à %s%s ?"
++msgstr "Répondre à %s%s ?"
+
+ # , c-format
+ #: send.c:522
+ #, c-format
+ msgid "Follow-up to %s%s?"
+-msgstr "Suivi de la discussion à %s%s ?"
++msgstr "Suivi de la discussion à %s%s ?"
+
+ #. 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:690
++#: send.c:696
+ msgid "No tagged messages are visible!"
+-msgstr "Pas de messages marqués visibles !"
++msgstr "Pas de messages marqués visibles !"
+
+-#: send.c:741
++#: send.c:747
+ msgid "Include message in reply?"
+-msgstr "Inclure le message dans la réponse ?"
++msgstr "Inclure le message dans la réponse ?"
+
+-#: send.c:746
++#: send.c:752
+ msgid "Including quoted message..."
+ msgstr "Inclusion du message cité..."
+
+-#: send.c:756
++#: send.c:762
+ msgid "Could not include all requested messages!"
+-msgstr "Tous les messages demandés n'ont pas pu être inclus !"
++msgstr "Tous les messages demandés n'ont pas pu être inclus !"
+
+-#: send.c:770
++#: send.c:776
+ msgid "Forward as attachment?"
+-msgstr "Faire suivre sous forme d'attachement ?"
++msgstr "Faire suivre sous forme d'attachement ?"
+
+-#: send.c:774
++#: send.c:780
+ msgid "Preparing forwarded message..."
+ msgstr "Préparation du message à faire suivre..."
+
+ #. If the user is composing a new message, check to see if there
+ #. * are any postponed messages first.
+ #.
+-#: send.c:1071
++#: send.c:1090
+ msgid "Recall postponed message?"
+-msgstr "Rappeler un message ajourné ?"
++msgstr "Rappeler un message ajourné ?"
+
+-#: send.c:1372
++#: send.c:1392
+ msgid "Edit forwarded message?"
+-msgstr "Éditer le message à faire suivre ?"
++msgstr "Éditer le message à faire suivre ?"
+
+-#: send.c:1400
++#: send.c:1429
+ msgid "Abort unmodified message?"
+-msgstr "Message non modifié. Abandonner ?"
++msgstr "Message non modifié. Abandonner ?"
+
+-#: send.c:1402
++#: send.c:1431
+ msgid "Aborted unmodified message."
+ msgstr "Message non modifié. Abandon."
+
+-#: send.c:1471
++#: send.c:1500
+ msgid "Message postponed."
+ msgstr "Message ajourné."
+
+-#: send.c:1480
++#: send.c:1509
+ msgid "No recipients are specified!"
+-msgstr "Aucun destinataire spécifié !"
++msgstr "Aucun destinataire spécifié !"
+
+-#: send.c:1485
++#: send.c:1514
+ msgid "No recipients were specified."
+ msgstr "Aucun destinataire spécifié."
+
+-#: send.c:1501
++#: send.c:1530
+ msgid "No subject, abort sending?"
+-msgstr "Pas d'objet, abandonner l'envoi ?"
++msgstr "Pas d'objet, abandonner l'envoi ?"
+
+-#: send.c:1505
++#: send.c:1534
+ msgid "No subject specified."
+ msgstr "Pas d'objet spécifié."
+
+-#: send.c:1567
++#: send.c:1596
+ msgid "Sending message..."
+ msgstr "Envoi du message..."
+
+-#: send.c:1708
++#: send.c:1737
+ msgid "Could not send the message."
+ msgstr "Impossible d'envoyer le message."
+
+-#: send.c:1713
++#: send.c:1742
+ msgid "Mail sent."
+ msgstr "Message envoyé."
+
+-#: send.c:1713
++#: send.c:1742
+ msgid "Sending in background."
+ msgstr "Envoi en tâche de fond."
+
+ #: sendlib.c:410
+ msgid "No boundary parameter found! [report this error]"
+-msgstr "Pas de paramètre boundary trouvé ! [signalez cette erreur]"
++msgstr "Pas de paramètre boundary trouvé ! [signalez cette erreur]"
+
+ # , c-format
+ #: sendlib.c:440
+ #, c-format
+ msgid "%s no longer exists!"
+-msgstr "%s n'existe plus !"
++msgstr "%s n'existe plus !"
+
+ # , c-format
+ #: sendlib.c:862
+@@ -4778,7 +4816,7 @@ msgstr "Signal %d... On quitte.\n"
+
+ #: smime.c:111
+ msgid "Enter S/MIME passphrase:"
+-msgstr "Entrez la phrase de passe S/MIME :"
++msgstr "Entrez la phrase de passe S/MIME :"
+
+ #: smime.c:321
+ msgid "Trusted "
+@@ -4812,7 +4850,7 @@ msgstr "Inconnue "
+ # , c-format
+ #: smime.c:368
+ msgid "Enter keyID: "
+-msgstr "Entrez keyID : "
++msgstr "Entrez keyID : "
+
+ #: smime.c:391
+ #, c-format
+@@ -4822,19 +4860,19 @@ msgstr "Certificats S/MIME correspondant
+ #: smime.c:541 smime.c:611 smime.c:629
+ #, c-format
+ msgid "ID %s is unverified. Do you want to use it for %s ?"
+-msgstr "L'ID %s n'est pas vérifié. Voulez-vous l'utiliser pour %s ?"
++msgstr "L'ID %s n'est pas vérifié. Voulez-vous l'utiliser pour %s ?"
+
+ # , c-format
+ #: smime.c:545 smime.c:615
+ #, c-format
+ msgid "Use (untrusted!) ID %s for %s ?"
+-msgstr "Utiliser l'ID %s (pas de confiance !) pour %s ?"
++msgstr "Utiliser l'ID %s (pas de confiance !) pour %s ?"
+
+ # , c-format
+ #: smime.c:548 smime.c:618
+ #, c-format
+ msgid "Use ID %s for %s ?"
+-msgstr "Utiliser l'ID %s pour %s ?"
++msgstr "Utiliser l'ID %s pour %s ?"
+
+ #: smime.c:637
+ #, c-format
+@@ -4849,7 +4887,7 @@ msgstr "Pas de certificat (valide) trouv
+
+ #: smime.c:851 smime.c:879 smime.c:944 smime.c:988 smime.c:1053 smime.c:1128
+ msgid "Error: unable to create OpenSSL subprocess!"
+-msgstr "Erreur : impossible de créer le sous-processus OpenSSL !"
++msgstr "Erreur : impossible de créer le sous-processus OpenSSL !"
+
+ #: smime.c:1206
+ msgid "no certfile"
+@@ -4870,7 +4908,7 @@ msgstr "Attention : le certificat interm
+
+ #: smime.c:1433
+ msgid "Can't open OpenSSL subprocess!"
+-msgstr "Impossible d'ouvrir le sous-processus OpenSSL !"
++msgstr "Impossible d'ouvrir le sous-processus OpenSSL !"
+
+ #: smime.c:1471
+ msgid "No output from OpenSSL..."
+@@ -4886,7 +4924,7 @@ msgstr ""
+
+ #: smime.c:1720 smime.c:1731
+ msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
+-msgstr "[-- Erreur : impossible de créer le sous-processus OpenSSL ! --]\n"
++msgstr "[-- Erreur : impossible de créer le sous-processus OpenSSL ! --]\n"
+
+ #: smime.c:1764
+ msgid "[-- The following data is S/MIME encrypted --]\n"
+@@ -4916,23 +4954,47 @@ msgstr ""
+ msgid ""
+ "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
+ msgstr ""
+-"(c)hiffr S/MIME, (s)ign, ch. (a)vec, s. (e)n tant que, les (d)eux, clai(r) ? "
++"(c)hiffr S/MIME, (s)ign, ch. (a)vec, s. (e)n tant que, les (d)eux, clai(r) ? "
+
+ #: smime.c:1945
+ msgid "eswabfc"
+ msgstr "csaedor"
+
+-#: smime.c:1954
+-msgid ""
+-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, or (f)orget it? "
+-msgstr ""
+-"1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, ou (o)ublier ? "
+-
+-#: smime.c:1956
+-msgid "12345f"
+-msgstr "12345o"
++#. I use "dra" because "123" is recognized anyway
++#: smime.c:1960
++msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
++msgstr ""
++"Choisissez une famille d'algo : 1: DES, 2: RC2, 3: AES, ou en (c)lair ? "
++
++#: smime.c:1963
++msgid "drac"
++msgstr "drac"
++
++#: smime.c:1966
++msgid "1: DES, 2: Triple-DES "
++msgstr "1: DES, 2: Triple-DES "
++
++#: smime.c:1967
++msgid "dt"
++msgstr "dt"
++
++#: smime.c:1979
++msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
++msgstr "1: RC2-40, 2: RC2-64, 3: RC2-128 "
+
+ #: smime.c:1980
++msgid "468"
++msgstr "468"
++
++#: smime.c:1995
++msgid "1: AES128, 2: AES192, 3: AES256 "
++msgstr "1: AES128, 2: AES192, 3: AES256 "
++
++#: smime.c:1996
++msgid "895"
++msgstr "895"
++
++#: smime.c:2024
+ msgid "Can't sign: No key specified. Use Sign As."
+ msgstr ""
+ "Impossible de signer : pas de clé spécifiée. Utilisez « Signer en tant que »."
+@@ -4943,7 +5005,7 @@ msgstr "Tri de la boîte aux lettres..."
+
+ #: sort.c:296
+ msgid "Could not find sorting function! [report this bug]"
+-msgstr "Fonction de tri non trouvée ! [signalez ce bug]"
++msgstr "Fonction de tri non trouvée ! [signalez ce bug]"
+
+ #: status.c:106
+ msgid "(no mailbox)"
+@@ -4957,43 +5019,12 @@ msgstr "Le message père n'est pas visibl
+ msgid "Parent message is not available."
+ msgstr "Le message père n'est pas disponible."
+
+-#~ msgid "First entry is shown."
+-#~ msgstr "La première entrée est affichée."
+-
+-#~ msgid "Last entry is shown."
+-#~ msgstr "La dernière entrée est affichée."
+-
+-#~ msgid " aka"
+-#~ msgstr " alias"
+-
+-#~ msgid "Name"
+-#~ msgstr "Nom"
+-
+-#~ msgid "Unexpected response received from server: %s"
+-#~ msgstr "Réponse inattendue reçue du serveur : %s"
+-
+-#~ msgid "%s failed (error %d)"
+-#~ msgstr "%s a échoué (erreur %d)"
+-
+-#~ msgid "SSL_AuthCertificate failed (error %d)"
+-#~ msgstr "Échec de SSL_AuthCertificate (erreur %d)"
+-
+-#~ msgid "Unable to find ip for host %s"
+-#~ msgstr "Impossible de trouver l'adresse IP de l'hôte %s"
+-
+-#~ msgid "PR_NewTCPSocket failed."
+-#~ msgstr "Échec de PR_NewTCPSocket."
+-
+-# , c-format
+-#~ msgid "Unable to connect to host %s"
+-#~ msgstr "Impossible de se connecter à l'hôte %s"
+-
+-#~ msgid "esabtf"
+-#~ msgstr "csedio"
+-
+-#~ msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (t)oggle or (f)orget it?"
++#~ msgid ""
++#~ "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, 6: AES128, 7: "
++#~ "AES192, 8: AES256, or (f)orget it? "
+ #~ msgstr ""
+-#~ "(c)hiffrer PGP, (s)igner, (e)n tant que, les (d)eux, (i)nv ou (o)ublier ?"
++#~ "1: DES, 2: Triple-DES, 3: RC2-40, 4: RC2-64, 5: RC2-128, 6: AES128, 7: "
++#~ "AES192, 8: AES256, ou (o)ublier ? "
+
+-#~ msgid "Unable to append to IMAP mailboxes at this server"
+-#~ msgstr "Impossible d'ajouter aux boîtes aux lettres IMAP sur ce serveur"
++#~ msgid "12345678f"
++#~ msgstr "12345678o"