From: Adeodato Simó Date: Thu, 2 Feb 2006 04:12:18 +0000 (+0100) Subject: Import mutt_1.5.11+cvs20060126-1 X-Git-Tag: 1.5.11+cvs20060126-1 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/4988a192dab00d86203bd44995b53284abfa1474?ds=inline;hp=-c Import mutt_1.5.11+cvs20060126-1 --- 4988a192dab00d86203bd44995b53284abfa1474 diff --git a/debian/MY-TODO b/debian/MY-TODO new file mode 100644 index 0000000..e9494c7 --- /dev/null +++ b/debian/MY-TODO @@ -0,0 +1,7 @@ +Only in ../m/debian/mutt/usr/share/doc/mutt: BUGS.IMAP +Only in ../m/debian/mutt/usr/share/doc/mutt: README.IMAP +Only in ../m/debian/mutt/usr/share/doc/mutt: TODO.IMAP + +Only in debian/mutt/usr/share/doc/mutt/examples: ca-bundle.crt +Only in debian/mutt/usr/share/doc/mutt/examples: iconv +Only in debian/mutt/usr/share/doc/mutt/examples: smime_keys_test.pl diff --git a/debian/NEWS b/debian/NEWS index e67afa8..7c3d399 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,16 +1,16 @@ mutt (1.5.6-1) unstable; urgency=low - In this release the alternates, lists, and subscribe configuration - variables have been turned into regular expression lists. - Additionaly, alternates is now an option, not a variable. - This means that you should change: + In this release the alternates, lists, and subscribe configuration + variables have been turned into regular expression lists. + Additionaly, alternates is now an option, not a variable. + This means that you should change: - set alternates="foo|bar" + set alternates="foo|bar" - into + into - alternates "foo|bar" + alternates "foo|bar" - in your .muttrc file. See muttrc(5) for details. + in your .muttrc file. See muttrc(5) for details. -- Artur R. Czechowski Sun, 4 Apr 2004 14:04:03 +0200 diff --git a/debian/README.CVS b/debian/README.CVS deleted file mode 100644 index cc7b63b..0000000 --- a/debian/README.CVS +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -e -# you can use this script to build the CVS source tarball - -cd upstream/tarballs/ -cvs -z3 -d :pserver:anonymous@cvs.mutt.org:/home/roessler/cvs co mutt -cd mutt/ -./prepare -make distclean -rm -rf autom4te.cache/ doc/instdoc.sh imap/Makefile -cd .. -tar czf mutt-1.5.4+$(date +%Y%m%d).tar.gz mutt/ -rm -rf mutt/ -exit 0 - -# update procedure: -cd upstream/tarballs/ -tar xzf mutt-*.tar.gz -rm mutt-*.tar.gz -cd mutt/ -cvs -z3 update -# run ./prepare etc if appropriate -cd .. -tar czf mutt-1.5.4+$(date +%Y%m%d).tar.gz mutt/ -rm -rf mutt/ - diff --git a/debian/changelog b/debian/changelog index 45ace40..9f7a1e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,42 @@ +mutt (1.5.11+cvs20060126-1) unstable; urgency=low + + * Update to CVS 2006-01-26; since this includes a huge diff between + ChangeLog and ChangeLog.old (moved entries), prepare a new tarball. + Some worth-mentioning changes: + + + Mutt can now expand its own variables as it does with envvars; for + example, it's now possible to put something like this into a hook: + set sendmail="mysmtp -f $from". + + + Support for user-defined variables starting with my_; environment + variables take precedence, and expansion does not occur in shell-escape. + + + Pattern group support, as explained (only!) in: + + + + Loooots of improvments in the IMAP code, including sync speed-ups + (through pipelining), hcache stuff (eg. $imap_cachedir), and things + like $imap_idle and support for the "old" flag in IMAP folders. + + * Rework the package build system to fit personal preference: + + debhelperize debian/rules a bit more. + + drop dbs in favor of quilt; reorganize patches a bit. + + (NOTE: quilt means that dropping patches into debian/patches is + no longer enough to get them applied; they must be listed in the + debian/patches/series file.) + + * Adjustments to debian/control: + + use '*' for the bulleted list, instead of 'o'. + + build-depend on gawk instead of mawk, to have "nextfile". + + drop conflicts and replaces on packages that are not in woody. + + * Updated debian/copyright. + + * Added debian/watch. + + -- Adeodato Simó Thu, 2 Feb 2006 05:12:18 +0100 + mutt (1.5.11-5) unstable; urgency=medium * Unbreak Mutt in Turkish locales (tr_TR): include patch from CVS to use the diff --git a/debian/control b/debian/control index 3ce4f21..fedd92e 100644 --- a/debian/control +++ b/debian/control @@ -2,30 +2,31 @@ Source: mutt Section: mail Priority: standard Maintainer: Adeodato Simó -Build-Depends: debhelper (>= 4), autotools-dev, mawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.3-dev +Build-Depends: debhelper, quilt, autotools-dev, gawk, gettext, xsltproc, docbook-xml, docbook-xsl, links, libncurses5-dev, libsasl2-dev, libgnutls-dev, libidn11-dev, zlib1g-dev, libncursesw5-dev, libdb4.3-dev Standards-Version: 3.6.2 Package: mutt Architecture: any Priority: standard Depends: ${shlibs:Depends}, ${misc:Depends}, exim4 | mail-transport-agent -Suggests: urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates Recommends: locales, mime-support +Suggests: urlview, aspell | ispell, gnupg, mixmaster, openssl, ca-certificates Provides: mail-reader, imap-client -Conflicts: suidmanager (<< 0.50), mutt-i, mutt-utf8 -Replaces: mutt-i, mutt-utf8 -Description: Text-based mailreader supporting MIME, GPG, PGP and threading +Conflicts: mutt-utf8 +Replaces: mutt-utf8 +Description: text-based mailreader supporting MIME, GPG, PGP and threading Mutt is a sophisticated text-based Mail User Agent. Some highlights: - o MIME support (including RFC1522 encoding/decoding of 8-bit message + . + * MIME support (including RFC1522 encoding/decoding of 8-bit message headers and UTF-8 support). - o PGP/MIME support (RFC 2015). - o Advanced IMAP client supporting SSL encryption and SASL authentication. - o POP3 support. - o Mailbox threading (both strict and non-strict). - o Default keybindings are much like ELM. - o Keybindings are configurable; Mush and PINE-like ones are provided as + * PGP/MIME support (RFC 2015). + * Advanced IMAP client supporting SSL encryption and SASL authentication. + * POP3 support. + * Mailbox threading (both strict and non-strict). + * Default keybindings are much like ELM. + * Keybindings are configurable; Mush and PINE-like ones are provided as examples. - o Handles MMDF, MH and Maildir in addition to regular mbox format. - o Messages may be (indefinitely) postponed. - o Colour support. - o Highly configurable through easy but powerful rc file. + * Handles MMDF, MH and Maildir in addition to regular mbox format. + * Messages may be (indefinitely) postponed. + * Colour support. + * Highly configurable through easy but powerful rc file. diff --git a/debian/copyright b/debian/copyright index 1403560..01bf277 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,12 +1,17 @@ -This package was originally debianized by Stephen Pitts - on Thu, 14 Nov 1996 19:04:20 -0600. +This is Debian's prepackaged version of Mutt, a powerful text-mode mail +user agent. -The next debian maintainer was J.H.M. Dassen . +The current maintainer for this package is: + Adeodato Simó -Current debian maintainer is Marco d'Itri (since sept. 1998). +Previous maintainers were: + Stephen Pitts + J.H.M. Dassen + Marco d'Itri -Original source has been downloaded from ftp://ftp.mutt.org/mutt/ . +Original source has been downloaded from ftp://ftp.mutt.org/mutt/: + URL: The following copyright notices apply to most of the program. Some modules are under different licenses, or in the public domain. @@ -33,4 +38,4 @@ On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. The list of authors of the applied patches to this version of mutt can -be found in `/usr/share/doc/mutt/README.Patches.gz'. +be found in `/usr/share/doc/mutt/README.Patches'. diff --git a/extra/README.SMIME b/debian/extra/README.SMIME similarity index 100% rename from extra/README.SMIME rename to debian/extra/README.SMIME diff --git a/extra/debian-ldap-query b/debian/extra/lib/debian-ldap-query similarity index 100% rename from extra/debian-ldap-query rename to debian/extra/lib/debian-ldap-query diff --git a/extra/mailspell b/debian/extra/lib/mailspell similarity index 100% rename from extra/mailspell rename to debian/extra/lib/mailspell diff --git a/extra/source-muttrc.d b/debian/extra/lib/source-muttrc.d similarity index 100% rename from extra/source-muttrc.d rename to debian/extra/lib/source-muttrc.d diff --git a/extra/mutt.xpm b/debian/extra/mutt.xpm similarity index 100% rename from extra/mutt.xpm rename to debian/extra/mutt.xpm diff --git a/extra/smime-paths.rc b/debian/extra/rc/smime-paths.rc similarity index 100% rename from extra/smime-paths.rc rename to debian/extra/rc/smime-paths.rc diff --git a/extra/source-Muttrc.d.rc b/debian/extra/rc/source-Muttrc.d.rc similarity index 100% rename from extra/source-Muttrc.d.rc rename to debian/extra/rc/source-Muttrc.d.rc diff --git a/extra/colors.angdraug b/debian/extra/samples/colors.angdraug similarity index 100% rename from extra/colors.angdraug rename to debian/extra/samples/colors.angdraug diff --git a/extra/ray.muttrc b/debian/extra/samples/ray.muttrc similarity index 100% rename from extra/ray.muttrc rename to debian/extra/samples/ray.muttrc diff --git a/debian/gen-README.Patches b/debian/header.awk similarity index 65% rename from debian/gen-README.Patches rename to debian/header.awk index 912e748..82cf656 100644 --- a/debian/gen-README.Patches +++ b/debian/header.awk @@ -1,24 +1,23 @@ -#!/usr/bin/mawk -f +#! /usr/bin/gawk -f BEGIN { sep = "=============================================================================" } FILENAME ~ /debian$/ { - exit + nextfile } /^== END PATCH$/ { print "" - exit + nextfile } FNR == 1 { - print FILENAME "\n" substr(sep, 0, 1+length(FILENAME)) "\n" + print FILENAME "\n" substr(sep, 0, length(FILENAME)) "\n" next } { print } - diff --git a/debian/doc-base b/debian/mutt.doc-base similarity index 100% rename from debian/doc-base rename to debian/mutt.doc-base diff --git a/debian/mutt.docs b/debian/mutt.docs new file mode 100644 index 0000000..58ac1f3 --- /dev/null +++ b/debian/mutt.docs @@ -0,0 +1,10 @@ +debian/extra/README.SMIME +debian/tmp/README.Patches +debian/tmp/usr/share/doc/NEWS +debian/tmp/usr/share/doc/TODO +debian/tmp/usr/share/doc/README +debian/tmp/usr/share/doc/README.SSL +debian/tmp/usr/share/doc/README.SECURITY +debian/tmp/usr/share/doc/PGP-Notes.txt +debian/tmp/usr/share/doc/ChangeLog.old +debian/tmp/usr/share/doc/manual.txt diff --git a/debian/mutt.examples b/debian/mutt.examples new file mode 100644 index 0000000..b20617c --- /dev/null +++ b/debian/mutt.examples @@ -0,0 +1,3 @@ +debian/extra/samples/* +debian/tmp/etc/Muttrc +debian/tmp/usr/share/doc/samples/* diff --git a/debian/mutt.install b/debian/mutt.install new file mode 100644 index 0000000..55e247f --- /dev/null +++ b/debian/mutt.install @@ -0,0 +1,14 @@ +debian/tmp/usr/bin/mutt +debian/tmp/usr/bin/smime_keys +debian/tmp/usr/bin/mutt_dotlock +debian/tmp/usr/share/locale/* + +debian/extra/lib/mailspell usr/lib/mutt +debian/tmp/usr/bin/pgpring usr/lib/mutt +debian/tmp/usr/bin/pgpewrap usr/lib/mutt +debian/extra/lib/source-muttrc.d usr/lib/mutt +debian/extra/lib/debian-ldap-query usr/lib/mutt + +debian/tmp/Muttrc etc +debian/extra/mutt.xpm usr/share/pixmaps +debian/tmp/usr/share/doc/*.html usr/share/doc/mutt/html diff --git a/debian/mutt.manpages b/debian/mutt.manpages new file mode 100644 index 0000000..6b6053e --- /dev/null +++ b/debian/mutt.manpages @@ -0,0 +1,5 @@ +debian/tmp/usr/share/man/man1/mutt.1 +debian/tmp/usr/share/man/man1/mutt_dotlock.1 +debian/tmp/usr/share/man/man5/muttrc.5 +debian/tmp/usr/share/man/man5/mbox.5 +debian/tmp/usr/share/man/man5/mmdf.5 diff --git a/debian/menu b/debian/mutt.menu similarity index 100% rename from debian/menu rename to debian/mutt.menu diff --git a/debian/patches/080_Md.paths_mutt.man b/debian/patches/080_Md.paths_mutt.man deleted file mode 100644 index 667d5ed..0000000 --- a/debian/patches/080_Md.paths_mutt.man +++ /dev/null @@ -1,14 +0,0 @@ -diff -urN mutt-1.3.22.orig/doc/mutt.man mutt-1.3.22/doc/mutt.man ---- mutt-1.3.22.orig/doc/mutt.man Thu Aug 30 14:55:04 2001 -+++ mutt-1.3.22/doc/mutt.man Sat Sep 15 18:41:08 2001 -@@ -136,9 +136,9 @@ - User's personal mapping between MIME types and file extensions. - .IP "/etc/mime.types" - System mapping between MIME types and file extensions. - .IP "@bindir@/mutt_dotlock" - The privileged dotlocking program. --.IP "@docdir@/manual.txt" -+.IP "/usr/share/doc/mutt/manual.txt.gz" - The Mutt manual. - .SH BUGS - .PP diff --git a/debian/patches/080_Md.use_debian_editor b/debian/patches/080_Md.use_debian_editor deleted file mode 100644 index a46f314..0000000 --- a/debian/patches/080_Md.use_debian_editor +++ /dev/null @@ -1,29 +0,0 @@ -diff -urNp mutt-1.5.3+CVS20030214.orig/PATCHES mutt-1.5.3+CVS20030214/PATCHES ---- mutt-1.5.3+CVS20030214.orig/PATCHES 2002-12-09 18:44:54.000000000 +0100 -+++ mutt-1.5.3+CVS20030214/PATCHES 2003-02-14 17:25:15.000000000 +0100 -@@ -1,0 +1 @@ -+Debian.Md.use_debian_editor -diff -urNp mutt-1.5.3+CVS20030214.orig/init.c mutt-1.5.3+CVS20030214/init.c ---- mutt-1.5.3+CVS20030214.orig/init.c 2003-01-21 13:33:41.000000000 +0100 -+++ mutt-1.5.3+CVS20030214/init.c 2003-02-14 17:25:44.000000000 +0100 -@@ -1853,7 +1853,7 @@ void mutt_init (int skip_sys_rc, LIST *c - { - p = getenv ("EDITOR"); - if (!p) -- p = "vi"; -+ p = "/usr/bin/editor"; - } - Editor = safe_strdup (p); - Visual = safe_strdup (p); -diff -urNp mutt-1.5.3+CVS20030214.orig/init.h mutt-1.5.3+CVS20030214/init.h ---- mutt-1.5.3+CVS20030214.orig/init.h 2003-02-13 10:55:02.000000000 +0100 -+++ mutt-1.5.3+CVS20030214/init.h 2003-02-14 17:27:41.000000000 +0100 -@@ -466,7 +466,7 @@ struct option_t MuttVars[] = { - ** .pp - ** This variable specifies which editor is used by mutt. - ** It defaults to the value of the VISUAL, or EDITOR, environment -- ** variable, or to the string "vi" if neither of those are set. -+ ** variable, or to the string "/usr/bin/editor" if neither of those are set. - */ - { "encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, 0 }, - /* diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update deleted file mode 100644 index 6f56066..0000000 --- a/debian/patches/autotools-update +++ /dev/null @@ -1,2675 +0,0 @@ -diff -ru mutt-1.5.11.orig/Makefile.in mutt-1.5.11/Makefile.in ---- mutt-1.5.11.orig/Makefile.in 2005-09-15 16:22:50.000000000 +0200 -+++ mutt-1.5.11/Makefile.in 2005-11-11 02:43:14.000000000 +0100 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,8 +15,6 @@ - @SET_MAKE@ - - --SOURCES = $(makedoc_SOURCES) $(mutt_SOURCES) $(EXTRA_mutt_SOURCES) $(mutt_dotlock_SOURCES) pgpewrap.c $(pgpring_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -49,7 +47,8 @@ - $(top_srcdir)/doc/Makefile.in $(top_srcdir)/doc/instdoc.sh.in \ - $(top_srcdir)/intl/Makefile.in ABOUT-NLS ChangeLog INSTALL \ - NEWS TODO config.guess config.sub depcomp install-sh missing \ -- mkinstalldirs regex.c snprintf.c strcasecmp.c strdup.c -+ mkinstalldirs regex.c setenv.c snprintf.c strcasecmp.c \ -+ strdup.c - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/m4/codeset.m4 \ -@@ -76,10 +75,10 @@ - am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ - attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ - buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ -- cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \ -- compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \ -- curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \ -- enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ -+ cryptglue.$(OBJEXT) compress.$(OBJEXT) commands.$(OBJEXT) \ -+ complete.$(OBJEXT) compose.$(OBJEXT) copy.$(OBJEXT) \ -+ curs_lib.$(OBJEXT) curs_main.$(OBJEXT) date.$(OBJEXT) \ -+ edit.$(OBJEXT) enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ - filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ - handler.$(OBJEXT) hash.$(OBJEXT) hdrline.$(OBJEXT) \ - headers.$(OBJEXT) help.$(OBJEXT) hook.$(OBJEXT) \ -@@ -159,7 +158,7 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ -+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ - - # $(makedoc_OBJECTS): $(makedoc_SOURCES) - # $(HOST_CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) -c $< -@@ -300,7 +299,7 @@ - BUILT_SOURCES = keymap_defs.h patchlist.c - mutt_SOURCES = $(BUILT_SOURCES) \ - addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ -- crypt.c cryptglue.c \ -+ crypt.c cryptglue.c compress.c \ - commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ - edit.c enter.c flags.c init.c filter.c from.c getdomain.c \ - handler.c hash.c hdrline.c headers.c help.c hook.c keymap.c \ -@@ -331,7 +330,7 @@ - crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c - - EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ -- configure account.h \ -+ configure account.h compress.h \ - attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ - globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ - mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ -@@ -480,6 +479,7 @@ - -rm -f *.tab.c - - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/regex.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/setenv.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/snprintf.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strcasecmp.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/strdup.Po@am__quote@ -@@ -496,6 +496,7 @@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ -@@ -1054,15 +1055,15 @@ - commit-changelog: - (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog) - --commit: pclean check-security commit-real changelog commit-changelog -+commit: pclean check-security commit-real update-changelog commit-changelog - --changelog: -+update-changelog: - (cd $(top_srcdir); \ - cvs update ChangeLog; \ - sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \ - $${VISUAL:-vi} ChangeLog) - --ChangeLog: changelog -+#ChangeLog: changelog - - # kluge around automake problems. - -Only in mutt-1.5.11: autom4te.cache -diff -ru mutt-1.5.11.orig/config.h.in mutt-1.5.11/config.h.in ---- mutt-1.5.11.orig/config.h.in 2005-09-15 16:21:55.000000000 +0200 -+++ mutt-1.5.11/config.h.in 2005-11-11 02:43:10.000000000 +0100 -@@ -87,6 +87,9 @@ - /* Define to 1 if you have the `fgets_unlocked' function. */ - #undef HAVE_FGETS_UNLOCKED - -+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */ -+#undef HAVE_FSEEKO -+ - /* Define to 1 if you have the `ftruncate' function. */ - #undef HAVE_FTRUNCATE - -@@ -264,12 +267,18 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_NCURSES_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_NCURSES_NCURSES_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_NL_TYPES_H - - /* Define to 1 if you have the `putenv' function. */ - #undef HAVE_PUTENV - -+/* QDBM Support */ -+#undef HAVE_QDBM -+ - /* Define to 1 if you have the `RAND_egd' function. */ - #undef HAVE_RAND_EGD - -@@ -475,6 +484,9 @@ - /* The size of a `long long', as computed by sizeof. */ - #undef SIZEOF_LONG_LONG - -+/* The size of a `off_t', as computed by sizeof. */ -+#undef SIZEOF_OFF_T -+ - /* The size of a `short', as computed by sizeof. */ - #undef SIZEOF_SHORT - -@@ -492,6 +504,9 @@ - /* Define to enable Sun mailtool attachments support. */ - #undef SUN_ATTACHMENT - -+/* Define to support compressed folders. */ -+#undef USE_COMPRESSED -+ - /* Define to use dotlocking for mailboxes. */ - #undef USE_DOTLOCK - -@@ -568,6 +583,9 @@ - # undef _GNU_SOURCE - #endif - -+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -+#undef _LARGEFILE_SOURCE -+ - /* Define for large files, on AIX-style hosts. */ - #undef _LARGE_FILES - -@@ -609,3 +627,19 @@ - - /* Define to 'int' if system headers don't define. */ - #undef wint_t -+ -+/* fseeko portability defines */ -+#ifdef HAVE_FSEEKO -+# define LOFF_T off_t -+# if SIZEOF_OFF_T == 8 -+# define OFF_T_FMT "%lld" -+# else -+# define OFF_T_FMT "%ld" -+# endif -+#else -+# define LOFF_T long -+# define fseeko fseek -+# define ftello ftell -+# define OFF_T_FMT "%ld" -+#endif -+ -Only in mutt-1.5.11: config.h.in~ -diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure ---- mutt-1.5.11.orig/configure 2005-09-15 16:21:34.000000000 +0200 -+++ mutt-1.5.11/configure 2005-11-11 02:43:15.000000000 +0100 -@@ -309,7 +309,7 @@ - # include - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CONFIGURE_DEPENDENCIES build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB AR ac_ct_AR DBX GDB SDB DEBUGGER SENDMAIL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS OPS PGPAUX_TARGET SMIMEAUX_TARGET ISPELL LIBOBJS DOTLOCK_TARGET docdir DOTLOCK_GROUP DOTLOCK_PERMISSION BUILD_IMAP_TRUE BUILD_IMAP_FALSE KRB5CFGPATH USE_GSS_TRUE USE_GSS_FALSE LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS USE_SSL_TRUE USE_SSL_FALSE USE_SASL_TRUE USE_SASL_FALSE MUTTLIBS MUTT_LIB_OBJECTS LIBIMAP LIBIMAPDEPS ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX OSPCAT DSLROOT LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CONFIG_STATUS_DEPENDENCIES build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP U ANSI2KNR RANLIB ac_ct_RANLIB AR ac_ct_AR DBX GDB SDB DEBUGGER SENDMAIL GPGME_CONFIG LIBGPGME_CFLAGS LIBGPGME_LIBS OPS PGPAUX_TARGET SMIMEAUX_TARGET ISPELL LIBOBJS DOTLOCK_TARGET docdir DOTLOCK_GROUP DOTLOCK_PERMISSION BUILD_IMAP_TRUE BUILD_IMAP_FALSE KRB5CFGPATH USE_GSS_TRUE USE_GSS_FALSE LIBGNUTLS_CONFIG LIBGNUTLS_CFLAGS LIBGNUTLS_LIBS USE_SSL_TRUE USE_SSL_FALSE USE_SASL_TRUE USE_SASL_FALSE MUTTLIBS MUTT_LIB_OBJECTS LIBIMAP LIBIMAPDEPS ALLOCA GLIBC21 LIBICONV USE_NLS MSGFMT GMSGFMT XGETTEXT INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT GMOFILES INTLLIBS INTLOBJS POFILES POSUB DATADIRNAME INSTOBJEXT GENCAT MKINSTALLDIRS INTL_LIBTOOL_SUFFIX_PREFIX OSPCAT DSLROOT LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -868,6 +868,7 @@ - --enable-buffy-size Use file size attribute instead of access time - --enable-mailtool Enable Sun mailtool attachments support - --enable-locales-fix The result of isprint() is unreliable -+ --enable-compressed Enable compressed folders support - --enable-exact-address Enable regeneration of email addresses - --enable-hcache Enable header caching - --disable-iconv Disable iconv support -@@ -891,6 +892,7 @@ - --with-sasl=PFX Use Cyrus SASL 2 network security library - --with-idn=PFX Use GNU libidn for domain names - --with-exec-shell=SHELL Specify alternate shell (ONLY if /bin/sh is broken) -+ --without-qdbm Don't use qdbm even if it is available - --without-gdbm Don't use gdbm even if it is available - --with-bdb=DIR Use BerkeleyDB4 if gdbm is not available - --with-libiconv-prefix=DIR -@@ -998,7 +1000,7 @@ - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi -- cd $ac_popdir -+ cd "$ac_popdir" - done - fi - -@@ -1786,7 +1788,7 @@ - - - --CONFIGURE_DEPENDENCIES='$(top_srcdir)/VERSION' -+CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/VERSION' - - - -@@ -1796,7 +1798,7 @@ - - - --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" -+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" - - # Make sure we can run config.sub. - $ac_config_sub sun4 >/dev/null 2>&1 || -@@ -2431,8 +2433,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2490,8 +2491,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2607,8 +2607,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2662,8 +2661,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2708,8 +2706,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -2753,8 +2750,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3006,8 +3002,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3061,8 +3056,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3397,8 +3391,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3568,8 +3561,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -3644,8 +3636,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4298,8 +4289,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4415,8 +4405,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4498,8 +4487,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4528,8 +4516,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4599,8 +4586,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4652,8 +4638,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4724,8 +4709,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4777,8 +4761,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -4812,6 +4795,584 @@ - rm -f conftest* - fi - -+echo "$as_me:$LINENO: checking for _LARGEFILE_SOURCE value needed for large files" >&5 -+echo $ECHO_N "checking for _LARGEFILE_SOURCE value needed for large files... $ECHO_C" >&6 -+if test "${ac_cv_sys_largefile_source+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ while :; do -+ ac_cv_sys_largefile_source=no -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+return !fseeko; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#define _LARGEFILE_SOURCE 1 -+#include -+int -+main () -+{ -+return !fseeko; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sys_largefile_source=1; break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ break -+done -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_source" >&5 -+echo "${ECHO_T}$ac_cv_sys_largefile_source" >&6 -+if test "$ac_cv_sys_largefile_source" != no; then -+ -+cat >>confdefs.h <<_ACEOF -+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source -+_ACEOF -+ -+fi -+rm -f conftest* -+ -+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug -+# in glibc 2.1.3, but that breaks too many other things. -+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc. -+echo "$as_me:$LINENO: checking for fseeko" >&5 -+echo $ECHO_N "checking for fseeko... $ECHO_C" >&6 -+if test "${ac_cv_func_fseeko+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+return fseeko && fseeko (stdin, 0, 0); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_fseeko=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_fseeko=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_fseeko" >&5 -+echo "${ECHO_T}$ac_cv_func_fseeko" >&6 -+if test $ac_cv_func_fseeko = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_FSEEKO 1 -+_ACEOF -+ -+fi -+ -+echo "$as_me:$LINENO: checking for off_t" >&5 -+echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -+if test "${ac_cv_type_off_t+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if ((off_t *) 0) -+ return 0; -+if (sizeof (off_t)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_type_off_t=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_type_off_t=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -+echo "${ECHO_T}$ac_cv_type_off_t" >&6 -+ -+echo "$as_me:$LINENO: checking size of off_t" >&5 -+echo $ECHO_N "checking size of off_t... $ECHO_C" >&6 -+if test "${ac_cv_sizeof_off_t+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$ac_cv_type_off_t" = yes; then -+ # The cast to unsigned long works around a bug in the HP C Compiler -+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -+ # This bug is HP SR number 8606223364. -+ if test "$cross_compiling" = yes; then -+ # Depending upon the size, compute the lo and hi bounds. -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= 0)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_lo=0 ac_mid=0 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_hi=$ac_mid; break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_lo=`expr $ac_mid + 1` -+ if test $ac_lo -le $ac_mid; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid + 1` -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) < 0)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_hi=-1 ac_mid=-1 -+ while :; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) >= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_lo=$ac_mid; break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_hi=`expr '(' $ac_mid ')' - 1` -+ if test $ac_mid -le $ac_hi; then -+ ac_lo= ac_hi= -+ break -+ fi -+ ac_mid=`expr 2 '*' $ac_mid` -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ done -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_lo= ac_hi= -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+# Binary search between lo and hi bounds. -+while test "x$ac_lo" != "x$ac_hi"; do -+ ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+static int test_array [1 - 2 * !(((long) (sizeof (off_t))) <= $ac_mid)]; -+test_array [0] = 0 -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_hi=$ac_mid -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_lo=`expr '(' $ac_mid ')' + 1` -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+case $ac_lo in -+?*) ac_cv_sizeof_off_t=$ac_lo;; -+'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (off_t), 77 -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } ;; -+esac -+else -+ if test "$cross_compiling" = yes; then -+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -+echo "$as_me: error: internal error: not reached in cross-compile" >&2;} -+ { (exit 1); exit 1; }; } -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+long longval () { return (long) (sizeof (off_t)); } -+unsigned long ulongval () { return (long) (sizeof (off_t)); } -+#include -+#include -+int -+main () -+{ -+ -+ FILE *f = fopen ("conftest.val", "w"); -+ if (! f) -+ exit (1); -+ if (((long) (sizeof (off_t))) < 0) -+ { -+ long i = longval (); -+ if (i != ((long) (sizeof (off_t)))) -+ exit (1); -+ fprintf (f, "%ld\n", i); -+ } -+ else -+ { -+ unsigned long i = ulongval (); -+ if (i != ((long) (sizeof (off_t)))) -+ exit (1); -+ fprintf (f, "%lu\n", i); -+ } -+ exit (ferror (f) || fclose (f) != 0); -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sizeof_off_t=`cat conftest.val` -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+{ { echo "$as_me:$LINENO: error: cannot compute sizeof (off_t), 77 -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute sizeof (off_t), 77 -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+fi -+rm -f conftest.val -+else -+ ac_cv_sizeof_off_t=0 -+fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sizeof_off_t" >&5 -+echo "${ECHO_T}$ac_cv_sizeof_off_t" >&6 -+cat >>confdefs.h <<_ACEOF -+#define SIZEOF_OFF_T $ac_cv_sizeof_off_t -+_ACEOF -+ -+ - - # Extract the first word of "dbx", so it can be a program name with args. - set dummy dbx; ac_word=$2 -@@ -4968,6 +5529,8 @@ - - - -+ -+ - for ac_header in inttypes.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -5001,8 +5564,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5149,8 +5711,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5212,8 +5773,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5275,8 +5835,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5316,8 +5875,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5373,8 +5931,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5414,8 +5971,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5479,8 +6035,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5511,10 +6066,8 @@ - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -+echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF -@@ -5626,8 +6179,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5689,8 +6241,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5730,8 +6281,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5787,8 +6337,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5828,8 +6377,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5893,8 +6441,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -5925,10 +6472,8 @@ - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -+echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF -@@ -6040,8 +6585,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6103,8 +6647,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6144,8 +6687,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6201,8 +6743,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6242,8 +6783,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6307,8 +6847,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6339,10 +6878,8 @@ - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -+echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF -@@ -6454,8 +6991,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6517,8 +7053,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6558,8 +7093,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6615,8 +7149,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6656,8 +7189,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6721,8 +7253,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -6753,10 +7284,8 @@ - esac - else - if test "$cross_compiling" = yes; then -- { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run test program while cross compiling --See \`config.log' for more details." >&2;} -+ { { echo "$as_me:$LINENO: error: internal error: not reached in cross-compile" >&5 -+echo "$as_me: error: internal error: not reached in cross-compile" >&2;} - { (exit 1); exit 1; }; } - else - cat >conftest.$ac_ext <<_ACEOF -@@ -7205,8 +7734,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7292,8 +7820,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7408,8 +7935,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7479,8 +8005,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7549,8 +8074,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7577,9 +8101,6 @@ - echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 - if test `eval echo '${'$as_ac_Lib'}'` = yes; then - 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 - -@@ -7616,8 +8137,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7734,6 +8254,152 @@ - - else - -+for ac_header in ncurses/ncurses.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ cf_cv_ncurses_header="ncurses/ncurses.h" -+else -+ - for ac_header in ncurses.h - do - as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -7767,8 +8433,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -7883,6 +8548,10 @@ - - done - -+fi -+ -+done -+ - fi - else - -@@ -7951,8 +8620,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8020,8 +8688,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8090,8 +8757,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8162,8 +8828,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8285,8 +8950,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8355,8 +9019,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8433,8 +9096,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8496,8 +9158,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8550,8 +9211,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8594,8 +9254,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8670,8 +9329,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8710,8 +9368,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8807,8 +9464,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -8978,8 +9634,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9129,8 +9784,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9279,8 +9933,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9466,8 +10119,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9539,8 +10191,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9647,8 +10298,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9737,8 +10387,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9811,8 +10460,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9877,8 +10525,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -9985,8 +10632,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10021,7 +10667,8 @@ - - - --for ac_func in strcasecmp strdup -+ -+for ac_func in setenv strcasecmp strdup - do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` - echo "$as_me:$LINENO: checking for $ac_func" >&5 -@@ -10089,8 +10736,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10198,8 +10844,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10259,8 +10904,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10448,8 +11092,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10552,8 +11195,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10667,8 +11309,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10737,8 +11378,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10845,8 +11485,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -10915,8 +11554,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11023,8 +11661,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11134,8 +11771,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11636,8 +12272,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11703,8 +12338,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11805,8 +12439,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11872,8 +12505,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -11978,8 +12610,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12140,8 +12771,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12214,8 +12844,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12290,8 +12919,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12484,8 +13112,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12562,8 +13189,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12672,8 +13298,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -12930,8 +13555,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13104,8 +13728,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13226,8 +13849,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13344,8 +13966,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13449,8 +14070,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13552,8 +14172,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13655,8 +14274,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13807,6 +14425,18 @@ - fi - fi; - -+# Check whether --enable-compressed or --disable-compressed was given. -+if test "${enable_compressed+set}" = set; then -+ enableval="$enable_compressed" -+ if test x$enableval = xyes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define USE_COMPRESSED 1 -+_ACEOF -+ -+ fi -+fi; -+ - - # Check whether --with-exec-shell or --without-exec-shell was given. - if test "${with_exec_shell+set}" = set; then -@@ -13858,6 +14488,74 @@ - OLDLIBS="$LIBS" - - need_md5="yes" -+ -+ ac_prefer_qdbm=yes -+ -+# Check whether --with-qdbm or --without-qdbm was given. -+if test "${with_qdbm+set}" = set; then -+ withval="$with_qdbm" -+ ac_prefer_qdbm=$withval -+fi; -+ if test x$ac_prefer_qdbm != xno; then -+ CPPFLAGS="$OLDCPPFLAGS" -+ LIBS="$OLDLIBS -lqdbm"; -+ echo "$as_me:$LINENO: checking for vlopen" >&5 -+echo $ECHO_N "checking for vlopen... $ECHO_C" >&6 -+if test "${ac_cv_vlopen+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ ac_cv_vlopen=no -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include -+int -+main () -+{ -+vlopen(0,0,0); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_vlopen=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_vlopen" >&5 -+echo "${ECHO_T}$ac_cv_vlopen" >&6 -+ fi -+ - ac_prefer_gdbm=yes - - # Check whether --with-gdbm or --without-gdbm was given. -@@ -13865,7 +14563,7 @@ - withval="$with_gdbm" - ac_prefer_gdbm=$withval - fi; -- if test x$ac_prefer_gdbm != xno; then -+ if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; - echo "$as_me:$LINENO: checking for gdbm_open" >&5 -@@ -13899,8 +14597,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -13933,7 +14630,7 @@ - withval="$with_bdb" - ac_bdb_prefix=$withval - fi; -- if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then -+ if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then - test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" - for d in $ac_bdb_prefix; do - bdbpfx="$bdbpfx $d" -@@ -13985,8 +14682,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14026,7 +14722,15 @@ - fi - fi - -- if test x$ac_cv_gdbmopen = xyes; then -+ if test x$ac_cv_vlopen = xyes; then -+ CPPFLAGS="$OLDCPPFLAGS" -+ LIBS="$OLDLIBS -lqdbm"; -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_QDBM 1 -+_ACEOF -+ -+ elif test x$ac_cv_gdbmopen = xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; - -@@ -14043,8 +14747,8 @@ - _ACEOF - - else -- { { echo "$as_me:$LINENO: error: You need Sleepycat DB4 or GDBM for --enable-hcache" >&5 --echo "$as_me: error: You need Sleepycat DB4 or GDBM for --enable-hcache" >&2;} -+ { { echo "$as_me:$LINENO: error: You need QDBM, GDBM or Sleepycat DB4 for hcache" >&5 -+echo "$as_me: error: You need QDBM, GDBM or Sleepycat DB4 for hcache" >&2;} - { (exit 1); exit 1; }; } - fi - fi -@@ -14102,8 +14806,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14168,8 +14871,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14233,8 +14935,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14315,8 +15016,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14457,8 +15157,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14596,8 +15295,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -14781,8 +15479,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15072,8 +15769,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15279,8 +15975,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15362,8 +16057,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15413,8 +16107,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15489,8 +16182,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15560,8 +16252,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15624,8 +16315,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15730,8 +16420,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15869,8 +16558,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -15929,8 +16617,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -16041,8 +16728,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -16527,8 +17213,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -16882,8 +17567,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -16954,8 +17638,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17106,8 +17789,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17174,8 +17856,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17241,8 +17922,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17429,8 +18109,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17536,8 +18215,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17640,8 +18318,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17709,8 +18386,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17791,8 +18467,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17855,8 +18530,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -17917,8 +18591,7 @@ - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -+ { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? -@@ -18713,7 +19386,7 @@ - s,@AMTAR@,$AMTAR,;t t - s,@am__tar@,$am__tar,;t t - s,@am__untar@,$am__untar,;t t --s,@CONFIGURE_DEPENDENCIES@,$CONFIGURE_DEPENDENCIES,;t t -+s,@CONFIG_STATUS_DEPENDENCIES@,$CONFIG_STATUS_DEPENDENCIES,;t t - s,@build@,$build,;t t - s,@build_cpu@,$build_cpu,;t t - s,@build_vendor@,$build_vendor,;t t -@@ -18970,11 +19643,6 @@ - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ -@@ -19013,6 +19681,12 @@ - fi;; - esac - done` || { (exit 1); exit 1; } -+ -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi - _ACEOF - cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -diff -ru mutt-1.5.11.orig/imap/Makefile.in mutt-1.5.11/imap/Makefile.in ---- mutt-1.5.11.orig/imap/Makefile.in 2005-09-15 16:22:49.000000000 +0200 -+++ mutt-1.5.11/imap/Makefile.in 2005-11-11 02:43:13.000000000 +0100 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -15,8 +15,6 @@ - @SET_MAKE@ - - --SOURCES = $(libimap_a_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -102,7 +100,7 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ -+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CYGPATH_W = @CYGPATH_W@ -diff -ru mutt-1.5.11.orig/m4/Makefile.in mutt-1.5.11/m4/Makefile.in ---- mutt-1.5.11.orig/m4/Makefile.in 2005-09-15 16:22:50.000000000 +0200 -+++ mutt-1.5.11/m4/Makefile.in 2005-11-11 02:43:14.000000000 +0100 -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.9.5 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -71,7 +71,7 @@ - CC = @CC@ - CCDEPMODE = @CCDEPMODE@ - CFLAGS = @CFLAGS@ --CONFIGURE_DEPENDENCIES = @CONFIGURE_DEPENDENCIES@ -+CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ - CYGPATH_W = @CYGPATH_W@ -@@ -219,9 +219,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign m4/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --foreign m4/Makefile -+ $(AUTOMAKE) --gnu m4/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ diff --git a/debian/patches/080_Md.Muttrc b/debian/patches/debian-specific/Md.Muttrc.diff similarity index 94% rename from debian/patches/080_Md.Muttrc rename to debian/patches/debian-specific/Md.Muttrc.diff index 7186561..792ab93 100644 --- a/debian/patches/080_Md.Muttrc +++ b/debian/patches/debian-specific/Md.Muttrc.diff @@ -1,5 +1,5 @@ ---- a/Muttrc.head.in -+++ b/Muttrc.head.in +--- mutt-1.5.11.orig/Muttrc.head.in ++++ mutt-1.5.11/Muttrc.head.in @@ -6,6 +6,38 @@ # ignore "from " received content- mime-version status x-status message-id @@ -58,9 +58,9 @@ # show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" macro index,pager y "?" "show incoming mailboxes list" -@@ -29,7 +71,22 @@ - # - # set use_8bitmime +@@ -83,7 +125,22 @@ + attachments -A message/external-body + attachments -I message/external-body -## -## More settings diff --git a/debian/patches/patch-1.5.3.Md.etc_mailname_gethostbyname b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff similarity index 74% rename from debian/patches/patch-1.5.3.Md.etc_mailname_gethostbyname rename to debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff index 5889f4f..de6765e 100644 --- a/debian/patches/patch-1.5.3.Md.etc_mailname_gethostbyname +++ b/debian/patches/debian-specific/Md.etc_mailname_gethostbyname.diff @@ -1,12 +1,6 @@ -diff -u mutt-1.5.3.orig/PATCHES mutt-1.5.3/PATCHES ---- mutt-1.5.3.orig/PATCHES 2002-12-17 10:47:20.000000000 +0100 -+++ mutt-1.5.3/PATCHES 2003-01-14 18:21:16.000000000 +0100 -@@ -1,0 +1 @@ -+Debian.Md.etc_mailname_gethostbyname -diff -u mutt-1.5.3.orig/init.c mutt-1.5.3/init.c ---- mutt-1.5.3.orig/init.c 2002-12-11 16:13:49.000000000 +0100 -+++ mutt-1.5.3/init.c 2003-01-14 18:27:54.000000000 +0100 -@@ -51,6 +51,7 @@ +--- mutt-1.5.11.orig/init.c ++++ mutt-1.5.11/init.c +@@ -46,6 +46,7 @@ #include #include #include @@ -14,7 +8,7 @@ diff -u mutt-1.5.3.orig/init.c mutt-1.5.3/init.c #include #include -@@ -1748,6 +1749,31 @@ +@@ -2761,6 +2762,31 @@ return 0; } @@ -46,7 +40,7 @@ diff -u mutt-1.5.3.orig/init.c mutt-1.5.3/init.c void mutt_init (int skip_sys_rc, LIST *commands) { struct passwd *pw; -@@ -1816,10 +1842,25 @@ +@@ -2832,10 +2858,25 @@ Hostname = mutt_substrdup (utsname.nodename, p); p++; strfcpy (buffer, p, sizeof (buffer)); /* save the domain for below */ diff --git a/debian/patches/debian-specific/Md.sasl2_needs_md5.diff b/debian/patches/debian-specific/Md.sasl2_needs_md5.diff new file mode 100644 index 0000000..d769dfb --- /dev/null +++ b/debian/patches/debian-specific/Md.sasl2_needs_md5.diff @@ -0,0 +1,10 @@ +--- mutt-1.5.11.orig/configure ++++ mutt-1.5.11/configure +@@ -13275,6 +13275,7 @@ + _ACEOF + + need_sasl=yes ++ need_md5=yes + fi + + fi; diff --git a/debian/patches/doc_build_adjustments.diff b/debian/patches/debian-specific/build_doc_adjustments.diff similarity index 90% rename from debian/patches/doc_build_adjustments.diff rename to debian/patches/debian-specific/build_doc_adjustments.diff index 5385254..f16f8e5 100644 --- a/debian/patches/doc_build_adjustments.diff +++ b/debian/patches/debian-specific/build_doc_adjustments.diff @@ -1,6 +1,6 @@ ---- mutt-1.5.11/doc/Makefile.in +--- mutt-1.5.11.orig/doc/Makefile.in +++ mutt-1.5.11/doc/Makefile.in -@@ -110,13 +110,13 @@ +@@ -111,13 +111,13 @@ check: manual.txt: manual.html diff --git a/debian/patches/debian-specific/correct_docdir_in_man_page.diff b/debian/patches/debian-specific/correct_docdir_in_man_page.diff new file mode 100644 index 0000000..e8a58cb --- /dev/null +++ b/debian/patches/debian-specific/correct_docdir_in_man_page.diff @@ -0,0 +1,11 @@ +--- mutt-1.5.11.orig/doc/mutt.man ++++ mutt-1.5.11/doc/mutt.man +@@ -154,7 +154,7 @@ + System mapping between MIME types and file extensions. + .IP "@bindir@/mutt_dotlock" + The privileged dotlocking program. +-.IP "@docdir@/manual.txt" ++.IP "/usr/share/doc/mutt/manual.txt.gz" + The Mutt manual. + .SH BUGS + .PP diff --git a/debian/patches/patch.docs-match-config.h b/debian/patches/debian-specific/dont_document_not_present_features.diff similarity index 85% rename from debian/patches/patch.docs-match-config.h rename to debian/patches/debian-specific/dont_document_not_present_features.diff index 210f44b..b1f0e90 100644 --- a/debian/patches/patch.docs-match-config.h +++ b/debian/patches/debian-specific/dont_document_not_present_features.diff @@ -1,5 +1,5 @@ ---- a/init.h -+++ b/init.h +--- mutt-1.5.11.orig/init.h ++++ mutt-1.5.11/init.h @@ -80,9 +80,9 @@ #define ISPELL "ispell" #endif @@ -12,7 +12,7 @@ # ifndef USE_IMAP # define USE_IMAP # endif -@@ -1970,7 +1970,7 @@ +@@ -2007,7 +2007,7 @@ ** .pp ** Example: set certificate_file=~/.mutt/certificates */ diff --git a/debian/patches/080_Md.po_norebuild b/debian/patches/debian-specific/dont_rebuild_po_files.diff similarity index 76% rename from debian/patches/080_Md.po_norebuild rename to debian/patches/debian-specific/dont_rebuild_po_files.diff index aa14e19..9897f7c 100644 --- a/debian/patches/080_Md.po_norebuild +++ b/debian/patches/debian-specific/dont_rebuild_po_files.diff @@ -1,5 +1,5 @@ ---- mutt-1.3.25.orig/po/Makefile.in.in Tue Jan 1 21:17:15 2002 -+++ mutt-1.3.25/po/Makefile.in.in Wed Jan 2 00:53:40 2002 +--- mutt-1.5.11.orig/po/Makefile.in.in ++++ mutt-1.5.11/po/Makefile.in.in @@ -85,7 +85,7 @@ # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. diff --git a/debian/patches/debian-specific/use_usr_bin_editor.diff b/debian/patches/debian-specific/use_usr_bin_editor.diff new file mode 100644 index 0000000..402c867 --- /dev/null +++ b/debian/patches/debian-specific/use_usr_bin_editor.diff @@ -0,0 +1,22 @@ +--- mutt-1.5.11.orig/init.c ++++ mutt-1.5.11/init.c +@@ -2920,7 +2920,7 @@ + { + p = getenv ("EDITOR"); + if (!p) +- p = "vi"; ++ p = "/usr/bin/editor"; + } + Editor = safe_strdup (p); + Visual = safe_strdup (p); +--- mutt-1.5.11.orig/init.h ++++ mutt-1.5.11/init.h +@@ -547,7 +547,7 @@ + ** .pp + ** This variable specifies which editor is used by mutt. + ** It defaults to the value of the VISUAL, or EDITOR, environment +- ** variable, or to the string "vi" if neither of those are set. ++ ** variable, or to the string "/usr/bin/editor" if neither of those are set. + */ + { "encode_from", DT_BOOL, R_NONE, OPTENCODEFROM, 0 }, + /* diff --git a/debian/patches/patch-1.5.4.vk.pgp_verbose_mime b/debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime similarity index 100% rename from debian/patches/patch-1.5.4.vk.pgp_verbose_mime rename to debian/patches/features-old/patch-1.5.4.vk.pgp_verbose_mime diff --git a/debian/patches/patch-1.5.5.1.nt.xtitles.3.ab.1 b/debian/patches/features-old/patch-1.5.5.1.nt.xtitles.3.ab.1 similarity index 100% rename from debian/patches/patch-1.5.5.1.nt.xtitles.3.ab.1 rename to debian/patches/features-old/patch-1.5.5.1.nt.xtitles.3.ab.1 diff --git a/upstream/extra-patches/assumed-charset b/debian/patches/features/assumed-charset similarity index 100% rename from upstream/extra-patches/assumed-charset rename to debian/patches/features/assumed-charset diff --git a/upstream/extra-patches/compressed-folders b/debian/patches/features/compressed-folders similarity index 99% rename from upstream/extra-patches/compressed-folders rename to debian/patches/features/compressed-folders index 1d15cad..45e3922 100644 --- a/upstream/extra-patches/compressed-folders +++ b/debian/patches/features/compressed-folders @@ -14,6 +14,7 @@ The home page for this patch is: - filterdiff -p1 \ $(for f in Makefile.in config.h.in configure 'Muttrc*' doc/manual.txt \ doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done) + - adjust the init.h hunk to the presence of group & ungroup == END PATCH diff -urN mutt-1.5.11/compress.c mutt-1.5.11-ro/compress.c @@ -841,10 +842,10 @@ diff -urN mutt-1.5.11/hook.c mutt-1.5.11-ro/hook.c diff -urN mutt-1.5.11/init.h mutt-1.5.11-ro/init.h --- mutt-1.5.11/init.h 2005-09-15 16:19:54.000000000 +0200 +++ mutt-1.5.11-ro/init.h 2005-09-27 13:27:02.000000000 +0200 -@@ -3002,6 +3002,11 @@ - { "fcc-hook", mutt_parse_hook, M_FCCHOOK }, - { "fcc-save-hook", mutt_parse_hook, M_FCCHOOK | M_SAVEHOOK }, +@@ -3100,6 +3100,11 @@ { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, + { "group", parse_group, 0 }, + { "ungroup", parse_ungroup, 0 }, +#ifdef USE_COMPRESSED + { "open-hook", mutt_parse_hook, M_OPENHOOK }, + { "close-hook", mutt_parse_hook, M_CLOSEHOOK }, diff --git a/upstream/extra-patches/compressed-folders.debian b/debian/patches/features/compressed-folders.debian similarity index 78% rename from upstream/extra-patches/compressed-folders.debian rename to debian/patches/features/compressed-folders.debian index 617c991..c077697 100644 --- a/upstream/extra-patches/compressed-folders.debian +++ b/debian/patches/features/compressed-folders.debian @@ -1,5 +1,5 @@ ---- a/debian-config.h -+++ b/debian-config.h +--- a/config-debian.h ++++ b/config-debian.h @@ -0,0 +1,4 @@ +#ifndef USE_COMPRESSED +#error "You forgot to update debian/patches/autotools-update." diff --git a/upstream/extra-patches/compressed-folders.ranty-fix b/debian/patches/features/compressed-folders.ranty-fix similarity index 100% rename from upstream/extra-patches/compressed-folders.ranty-fix rename to debian/patches/features/compressed-folders.ranty-fix diff --git a/upstream/extra-patches/maildir-mtime b/debian/patches/features/maildir-mtime similarity index 100% rename from upstream/extra-patches/maildir-mtime rename to debian/patches/features/maildir-mtime diff --git a/debian/patches/misc/autotools-update.diff b/debian/patches/misc/autotools-update.diff new file mode 100644 index 0000000..9f23c56 --- /dev/null +++ b/debian/patches/misc/autotools-update.diff @@ -0,0 +1,90 @@ +diff -ru mutt-1.5.11+cvs20060126.orig/Makefile.in mutt-1.5.11+cvs20060126/Makefile.in +--- mutt-1.5.11+cvs20060126.orig/Makefile.in 2006-02-02 04:15:38.000000000 +0100 ++++ mutt-1.5.11+cvs20060126/Makefile.in 2006-02-02 04:40:04.000000000 +0100 +@@ -75,10 +75,10 @@ + am_mutt_OBJECTS = $(am__objects_1) addrbook.$(OBJEXT) alias.$(OBJEXT) \ + attach.$(OBJEXT) base64.$(OBJEXT) browser.$(OBJEXT) \ + buffy.$(OBJEXT) color.$(OBJEXT) crypt.$(OBJEXT) \ +- cryptglue.$(OBJEXT) commands.$(OBJEXT) complete.$(OBJEXT) \ +- compose.$(OBJEXT) copy.$(OBJEXT) curs_lib.$(OBJEXT) \ +- curs_main.$(OBJEXT) date.$(OBJEXT) edit.$(OBJEXT) \ +- enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ ++ cryptglue.$(OBJEXT) compress.$(OBJEXT) commands.$(OBJEXT) \ ++ complete.$(OBJEXT) compose.$(OBJEXT) copy.$(OBJEXT) \ ++ curs_lib.$(OBJEXT) curs_main.$(OBJEXT) date.$(OBJEXT) \ ++ edit.$(OBJEXT) enter.$(OBJEXT) flags.$(OBJEXT) init.$(OBJEXT) \ + filter.$(OBJEXT) from.$(OBJEXT) getdomain.$(OBJEXT) \ + group.$(OBJEXT) handler.$(OBJEXT) hash.$(OBJEXT) \ + hdrline.$(OBJEXT) headers.$(OBJEXT) help.$(OBJEXT) \ +@@ -299,7 +299,7 @@ + BUILT_SOURCES = keymap_defs.h patchlist.c + mutt_SOURCES = $(BUILT_SOURCES) \ + addrbook.c alias.c attach.c base64.c browser.c buffy.c color.c \ +- crypt.c cryptglue.c \ ++ crypt.c cryptglue.c compress.c \ + commands.c complete.c compose.c copy.c curs_lib.c curs_main.c date.c \ + edit.c enter.c flags.c init.c filter.c from.c \ + getdomain.c group.c \ +@@ -331,7 +331,7 @@ + crypt-gpgme.c crypt-mod-pgp-gpgme.c crypt-mod-smime-gpgme.c + + EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP OPS.CRYPT OPS.SMIME TODO \ +- configure account.h \ ++ configure account.h compress.h \ + attach.h buffy.h charset.h copy.h crypthash.h dotlock.h functions.h gen_defs \ + globals.h hash.h history.h init.h keymap.h mutt_crypt.h \ + mailbox.h mapping.h md5.h mime.h mutt.h mutt_curses.h mutt_menu.h \ +@@ -497,6 +497,7 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commands.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/complete.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compose.Po@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/copy.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-gpgme.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crypt-mod-pgp-classic.Po@am__quote@ +Only in mutt-1.5.11+cvs20060126: autom4te.cache +diff -ru mutt-1.5.11+cvs20060126.orig/config.h.in mutt-1.5.11+cvs20060126/config.h.in +--- mutt-1.5.11+cvs20060126.orig/config.h.in 2006-02-02 04:14:49.000000000 +0100 ++++ mutt-1.5.11+cvs20060126/config.h.in 2006-02-02 04:40:00.000000000 +0100 +@@ -507,6 +507,9 @@ + /* Define to enable Sun mailtool attachments support. */ + #undef SUN_ATTACHMENT + ++/* Define to support compressed folders. */ ++#undef USE_COMPRESSED ++ + /* Define to use dotlocking for mailboxes. */ + #undef USE_DOTLOCK + +Only in mutt-1.5.11+cvs20060126: config.h.in~ +diff -ru mutt-1.5.11+cvs20060126.orig/configure mutt-1.5.11+cvs20060126/configure +--- mutt-1.5.11+cvs20060126.orig/configure 2006-02-02 04:39:52.000000000 +0100 ++++ mutt-1.5.11+cvs20060126/configure 2006-02-02 04:40:05.000000000 +0100 +@@ -868,6 +868,7 @@ + --enable-buffy-size Use file size attribute instead of access time + --enable-mailtool Enable Sun mailtool attachments support + --enable-locales-fix The result of isprint() is unreliable ++ --enable-compressed Enable compressed folders support + --enable-exact-address Enable regeneration of email addresses + --enable-hcache Enable header caching + --disable-iconv Disable iconv support +@@ -14682,6 +14682,18 @@ + fi + fi; + ++# Check whether --enable-compressed or --disable-compressed was given. ++if test "${enable_compressed+set}" = set; then ++ enableval="$enable_compressed" ++ if test x$enableval = xyes; then ++ ++cat >>confdefs.h <<\_ACEOF ++#define USE_COMPRESSED 1 ++_ACEOF ++ ++ fi ++fi; ++ + + # Check whether --with-exec-shell or --without-exec-shell was given. + if test "${with_exec_shell+set}" = set; then +Only in mutt-1.5.11+cvs20060126: diff.zHFCuH diff --git a/debian/patches/100_asp.pgp_getkeys b/debian/patches/misc/define-pgp_getkeys_command.diff similarity index 55% rename from debian/patches/100_asp.pgp_getkeys rename to debian/patches/misc/define-pgp_getkeys_command.diff index 1afcdd1..9964e48 100644 --- a/debian/patches/100_asp.pgp_getkeys +++ b/debian/patches/misc/define-pgp_getkeys_command.diff @@ -1,6 +1,5 @@ -diff -u -r mutt-1.5.6.orig/contrib/gpg.rc mutt-1.5.6/contrib/gpg.rc ---- mutt-1.5.6.orig/contrib/gpg.rc 2002-03-26 23:23:58.000000000 +0100 -+++ mutt-1.5.6/contrib/gpg.rc 2004-05-23 15:01:52.000000000 +0200 +--- mutt-1.5.11.orig/contrib/gpg.rc ++++ mutt-1.5.11/contrib/gpg.rc @@ -72,6 +72,8 @@ # fetch keys diff --git a/debian/patches/muttrc.man.spacing-fix.diff b/debian/patches/muttrc.man.spacing-fix.diff deleted file mode 100644 index cf68c3d..0000000 --- a/debian/patches/muttrc.man.spacing-fix.diff +++ /dev/null @@ -1,16 +0,0 @@ -Index: mutt/doc/muttrc.man.head -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/muttrc.man.head,v -retrieving revision 3.19 -diff -u -p -r3.19 muttrc.man.head ---- mutt/doc/muttrc.man.head 4 Oct 2005 06:05:39 -0000 3.19 -+++ mutt/doc/muttrc.man.head 23 Dec 2005 22:03:47 -0000 -@@ -437,7 +437,7 @@ - ~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 -+~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) diff --git a/debian/patches/not-applied/patch-1.5.8.hr.sensible_browser_position.3 b/debian/patches/not-applied/patch-1.5.8.hr.sensible_browser_position.3 new file mode 100644 index 0000000..271b810 --- /dev/null +++ b/debian/patches/not-applied/patch-1.5.8.hr.sensible_browser_position.3 @@ -0,0 +1,100 @@ +Anyway, here's patch-1.5.8.hr.sensible_browser_position.3: + +--- mutt-1.5.8/menu.c.orig 2005-02-12 21:01:55.000000000 +0100 ++++ mutt-1.5.8/menu.c 2005-03-09 16:39:49.000000000 +0100 +@@ -841,8 +841,12 @@ + + int mutt_menuLoop (MUTTMENU *menu) + { ++ static int last_position = -1; + int i = OP_NULL; + ++ if (menu->is_mailbox_list && last_position >= 0) ++ menu->current = last_position; ++ + FOREVER + { + if (option (OPTMENUCALLER)) +@@ -1068,6 +1072,8 @@ + break; + + default: ++ if (menu->is_mailbox_list) ++ last_position = menu->current; + return (i); + } + } +--- mutt-1.5.8/browser.c.orig 2005-02-03 19:47:52.000000000 +0100 ++++ mutt-1.5.8/browser.c 2005-03-09 16:48:31.000000000 +0100 +@@ -54,6 +54,7 @@ + int num; + } FOLDER; + ++static char OldLastDir[_POSIX_PATH_MAX] = ""; + static char LastDir[_POSIX_PATH_MAX] = ""; + static char LastDirBackup[_POSIX_PATH_MAX] = ""; + +@@ -498,19 +499,38 @@ + menu->tagged = 0; + + if (buffy) ++ { ++ menu->is_mailbox_list = 1; + snprintf (title, titlelen, _("Mailboxes [%d]"), mutt_buffy_check (0)); ++ } + else + { ++ menu->is_mailbox_list = 0; + strfcpy (path, LastDir, sizeof (path)); + mutt_pretty_mailbox (path); + #ifdef USE_IMAP +- if (state->imap_browse && option (OPTIMAPLSUB)) +- snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"), +- path, NONULL (Mask.pattern)); +- else ++ if (state->imap_browse && option (OPTIMAPLSUB)) ++ snprintf (title, titlelen, _("Subscribed [%s], File mask: %s"), ++ path, NONULL (Mask.pattern)); ++ else + #endif +- snprintf (title, titlelen, _("Directory [%s], File mask: %s"), +- path, NONULL(Mask.pattern)); ++ { ++ char *p = strrchr (OldLastDir, '/'); ++ if (p && p - OldLastDir == mutt_strlen (LastDir) && ++ mutt_strncmp (LastDir, OldLastDir, p - OldLastDir) == 0) ++ { ++ /* If we get here, it means that LastDir is the parent directory of ++ * OldLastDir. I.e., we're returning from a subdirectory, and we want ++ * to position the cursor on the directory we're returning from. */ ++ int i; ++ for (i = 0; i < state->entrymax; i++) ++ if (mutt_strcmp (state->entry[i].name, p + 1) == 0) ++ menu->current = i; ++ } ++ snprintf (title, titlelen, _("Directory [%s], File mask: %s"), ++ path, NONULL(Mask.pattern)); ++ } ++ + } + menu->redraw = REDRAW_FULL; + } +@@ -685,7 +705,6 @@ + #endif + ) + { +- char OldLastDir[_POSIX_PATH_MAX]; + + /* save the old directory */ + strfcpy (OldLastDir, LastDir, sizeof (OldLastDir)); +--- mutt-1.5.8/mutt_menu.h.orig 2003-10-04 21:29:27.000000000 +0200 ++++ mutt-1.5.8/mutt_menu.h 2005-03-09 16:39:49.000000000 +0100 +@@ -46,6 +46,7 @@ + int offset; /* which screen row to start the index */ + int pagelen; /* number of entries per screen */ + int tagprefix; ++ int is_mailbox_list; + + /* Setting dialog != NULL overrides normal menu behaviour. + * In dialog mode menubar is hidden and prompt keys are checked before + diff --git a/debian/patches/patch-1.5.4.Md.sasl2-1arc b/debian/patches/patch-1.5.4.Md.sasl2-1arc deleted file mode 100644 index ca0fd40..0000000 --- a/debian/patches/patch-1.5.4.Md.sasl2-1arc +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN mutt-1.5.6.orig/configure mutt-1.5.6/configure ---- mutt-1.5.6.orig/configure 2004-02-01 19:22:06.000000000 +0100 -+++ mutt-1.5.6/configure 2004-04-04 10:48:08.000000000 +0200 -@@ -5684,6 +5684,7 @@ - EOF - - need_sasl=yes -+ need_md5=yes - fi - - fi diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e7726b5 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,22 @@ +version.diff + +features/maildir-mtime +features/assumed-charset +features/compressed-folders +features/compressed-folders.ranty-fix +features/compressed-folders.debian + +features-old/patch-1.5.4.vk.pgp_verbose_mime +features-old/patch-1.5.5.1.nt.xtitles.3.ab.1 + +debian-specific/Md.Muttrc.diff +debian-specific/Md.sasl2_needs_md5.diff +debian-specific/Md.etc_mailname_gethostbyname.diff +debian-specific/use_usr_bin_editor.diff +debian-specific/dont_rebuild_po_files.diff +debian-specific/build_doc_adjustments.diff +debian-specific/correct_docdir_in_man_page.diff +debian-specific/dont_document_not_present_features.diff + +misc/define-pgp_getkeys_command.diff +misc/autotools-update.diff diff --git a/debian/patches/version.diff b/debian/patches/version.diff new file mode 100644 index 0000000..c220197 --- /dev/null +++ b/debian/patches/version.diff @@ -0,0 +1,10 @@ +--- mutt-1.5.11+cvs20060126.orig/VERSION ++++ mutt-1.5.11+cvs20060126/VERSION +@@ -1 +1 @@ +-1.5.11 ++1.5.11+cvs20060126 +--- mutt-1.5.11+cvs20060126.orig/reldate.h ++++ mutt-1.5.11+cvs20060126/reldate.h +@@ -1 +1 @@ +-const char *ReleaseDate = "2005-09-15"; ++const char *ReleaseDate = "2006-01-26"; diff --git a/debian/rules b/debian/rules index 0045059..f685c0c 100755 --- a/debian/rules +++ b/debian/rules @@ -1,145 +1,195 @@ #!/usr/bin/make -f -SHELL+= -e -export LC_ALL=C -include debian/scripts/vars +### -BUILD_DIR := $(SOURCE_DIR)/$(TAR_DIR) -B := $(BUILD_DIR) -D := $(CURDIR)/debian/mutt +# Uncomment one of these if you're rebuilding using them instead of libdb4.X +# HCACHE_DB := gdbm +# HCACHE_DB := qdbm -# Comment this line if you want the header cache with qdbm or gdbm -HCACHE_WITH_DB := --without-qdbm --without-gdbm +### -clean: - $(MAKE) -f debian/sys-build.mk source.clean - dh_clean +# Configure arguments -# target used by the maintainer -unpack.nopatch: - $(MAKE) -f debian/sys-build.mk source.build - rm -f $B/Muttrc $B/doc/muttrc.man \ - $B/doc/manual.sgml $B/doc/manual.txt $B/doc/*.html +confflags = --prefix=/usr \ + --sysconfdir=/etc \ + --mandir=/usr/share/man \ + --with-sharedir=/usr/share/mutt \ + --with-docdir=/usr/share/doc \ + --with-mailpath=/var/mail \ + \ + --disable-dependency-tracking \ + \ + --enable-compressed \ + --enable-debug \ + --enable-fcntl \ + --enable-hcache \ + --enable-imap \ + --enable-inodesort \ + --enable-pop \ + \ + --with-curses \ + --with-gnutls \ + --with-idn \ + --with-mixmaster \ + --with-sasl \ + \ + $(hcache_db) -diff: - $(MAKE) -f debian/sys-build.mk make-diff +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -unpack: $(STAMP_DIR)/source.make -$(STAMP_DIR)/source.make: - $(MAKE) -f debian/sys-build.mk source.make - - # sort the patches list - sort $B/PATCHES > $B/PATCHES.temp - mv $B/PATCHES.temp $B/PATCHES +confflags += --build $(DEB_BUILD_GNU_TYPE) + +# Only specify --host when cross-compiling +ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE)) + confflags += --host $(DEB_HOST_GNU_TYPE) +endif + +# + +hcache_db := --without-gdbm --without-qdbm + +ifeq ($(HCACHE_DB),gdbm) + hcache_db := --without-qdbm --without-bdb +endif + +ifeq ($(HCACHE_DB),qdbm) + hcache_db := --without-gdbm --without-bdb +endif + +### + +# Directory to make the build on + +objdir = $(CURDIR)/obj-$(DEB_HOST_GNU_TYPE) + +### - # rebuild these files - rm -f $B/Muttrc $B/doc/muttrc.man \ - $B/doc/manual.sgml $B/doc/manual.txt $B/doc/*.html +# CFLAGS - # we include some #defines in debian-config.h - echo '#include "debian-config.h"' >> $B/config.h.in +CFLAGS = -Wall -g +CPPFLAGS = -I/usr/include/qdbm +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +### + +configure: $(objdir)/configure-stamp +$(objdir)/configure-stamp: + dh_testdir + + ln -sf /usr/share/misc/config.sub . + ln -sf /usr/share/misc/config.guess . + + ln -sf debian/patches + quilt push -a || test $$? = 2 + + # sort the patches as printed by mutt -v + [ -e PATCHES.unsorted ] || mv PATCHES PATCHES.unsorted && \ + env LC_COLLATE=C sort PATCHES.unsorted >PATCHES + # do not rebuild these files - touch $B/configure.in $B/aclocal.m4 $B/Makefile.in $B/configure \ - $B/stamp-h.in $B/config.h.in + touch configure.in aclocal.m4 Makefile.in configure stamp-h.in config.h.in + + -mkdir $(objdir) + cd $(objdir) && \ + env CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" \ + ../configure $(confflags) + + echo '#include "config-debian.h"' >>$(objdir)/config.h + touch $@ - # update config.guess and config.sub - -test -r /usr/share/misc/config.sub && \ - cp -f /usr/share/misc/config.sub $B/config.sub - -test -r /usr/share/misc/config.guess && \ - cp -f /usr/share/misc/config.guess $B/config.guess - -configure: $(STAMP_DIR)/configure -$(STAMP_DIR)/configure: $(STAMP_DIR)/source.make - CPPFLAGS=-I/usr/include/qdbm \ - CC=cc ac_cv_path_ISPELL=ispell \ - SENDMAIL=/usr/sbin/sendmail PERL=/usr/bin/perl \ - $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ - ./configure --prefix=/usr --sysconfdir=/etc --mandir=/usr/share/man \ - --with-sharedir=/usr/share/mutt --with-docdir=/usr/share/doc \ - --with-mailpath=/var/mail \ - --enable-fcntl --enable-pop --enable-imap \ - --with-mixmaster --with-sasl --with-idn \ - --with-curses \ - --with-gnutls \ - --enable-debug \ - --enable-inodesort \ - --enable-compressed \ - --enable-hcache $(HCACHE_WITH_DB) \ - " - touch $@ +# -build: $(STAMP_DIR)/build -$(STAMP_DIR)/build: $(STAMP_DIR)/configure $(STAMP_DIR)/source.make - GROFF_NO_SGR=1 \ - $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ - make keymap_defs.h all CFLAGS=\"-O2 -g\" \ - " +build: $(objdir)/build-stamp +$(objdir)/build-stamp: $(objdir)/configure-stamp + cd $(objdir) && \ + $(MAKE) + touch $@ -binary-arch: $(STAMP_DIR)/build checkroot +# + +clean: dh_testdir - dh_clean -k - $(MAKE) -f debian/sys-build.mk source.command SOURCE_CMD=" \ - $(MAKE) install DESTDIR=$D SUBDIRS=\"intl po\" \ - " + dh_testroot + + [ ! -e PATCHES.unsorted ] || mv PATCHES.unsorted PATCHES + quilt pop -a -R || test $$? = 2 + + # quilt cruft + rm -f patches + rm -rf .pc + + # please dpkg-source + rm -f po/*.gmo + rm -f config.guess config.sub + + # remove build tree + rm -rf $(objdir) + + dh_clean + +# - dh_installdirs -p mutt usr/share/pixmaps usr/lib/mutt/ \ - usr/bin/ usr/share/doc/mutt/html/ - dh_installmenu - dh_installdocs $B/README $B/README.SECURITY $B/README.SSL $B/NEWS \ - $B/doc/manual.txt $B/doc/PGP-Notes.txt extra/README.SMIME - cp $B/doc/*.html $D/usr/share/doc/mutt/html/ - for file in README BUGS TODO; do \ - cp $B/imap/$$file $D/usr/share/doc/mutt/$$file.IMAP; \ - done - # generate README.Patches - for file in $(EXTRA_PATCHES)/*; do \ - mawk -f debian/gen-README.Patches $$file >> \ - $D/usr/share/doc/mutt/README.Patches; \ - done - dh_installexamples \ - $B/contrib/*rc $B/contrib/sample.muttrc-tlr \ - extra/ray.muttrc extra/colors.angdraug - dh_installman \ - $B/doc/mutt.1 $B/doc/dotlock.man \ - $B/doc/muttrc.man $B/doc/mbox.man - - install --mode=755 extra/debian-ldap-query extra/mailspell \ - extra/source-muttrc.d $D/usr/lib/mutt/ - cp extra/mutt.xpm $D/usr/share/pixmaps/ - -# some fixes to the package structure - mv $D/usr/bin/pgp* $D/usr/lib/mutt/ - mv $D/usr/share/man/man1/dotlock.1 $D/usr/share/man/man1/mutt_dotlock.1 - rm $D/etc/mime.types $D/usr/bin/muttbug $D/usr/bin/flea - -# I think the default config file with the embedded manual is too big - mv $D/etc/Muttrc $D/usr/share/doc/mutt/examples/ - cp $B/Muttrc.head $D/etc/Muttrc - echo "# GnuPG configuration" >> $D/etc/Muttrc - grep ^set $B/contrib/gpg.rc \ +install: debian/tmp/install-stamp +debian/tmp/install-stamp: + dh_testdir + dh_testroot + dh_clean + cd $(objdir) && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp + + rm -rf debian/tmp/usr/share/doc/samples/iconv + rm -rf debian/tmp/usr/share/doc/samples/ca-bundle.crt + + chmod +x debian/extra/lib/* + chmod +x debian/header.awk + debian/header.awk debian/patches/features/* >debian/tmp/README.Patches + + cp $(objdir)/Muttrc.head debian/tmp/Muttrc + echo "# GnuPG configuration" >>debian/tmp/Muttrc + grep '^set' contrib/gpg.rc \ | sed -e 's#pgpewrap#/usr/lib/mutt/pgpewrap#' \ | sed -e 's#/usr/bin/gpg#gpg#' \ - >> $D/etc/Muttrc - cat extra/smime-paths.rc extra/source-Muttrc.d.rc >> $D/etc/Muttrc + >> debian/tmp/Muttrc + cat debian/extra/rc/* >>debian/tmp/Muttrc + + touch $@ + +# - dh_installchangelogs $B/ChangeLog +binary: binary-arch + +binary-arch: build install + dh_testdir + dh_testroot + + dh_install + dh_installman + dh_installmime + dh_installmenu + dh_installdocs + dh_installexamples + dh_installchangelogs ChangeLog + + dh_link dh_strip - dh_compress - dh_fixperms --exclude=usr/bin/mutt_dotlock + dh_compress --exclude usr/share/doc/mutt/README.Patches + dh_fixperms --exclude usr/bin/mutt_dotlock dh_installdeb dh_shlibdeps dh_gencontrol + dh_md5sums dh_builddeb -binary: binary-arch - -extra-clean: - find -type f \( -name "*.orig" -o -name "*.rej" \) -exec rm -v {} \; +binary-indep: + @echo "Nothing to do." -checkroot: - test root = "`whoami`" +# -.PHONY: binary binary-arch build clean configure checkroot extra-clean +.PHONY: configure build clean install binary binary-arch binary-indep diff --git a/debian/scripts/Makefile b/debian/scripts/Makefile deleted file mode 100644 index 907a3d2..0000000 --- a/debian/scripts/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/make -f -all: sh.vars mk.vars - -clean: - rm -f sh.vars mk.vars - -mk.vars: vars.build vars - $(SHELL) vars.build vars make > $@ -sh.vars: vars.build vars - $(SHELL) vars.build vars shell > $@ - diff --git a/debian/scripts/archmap b/debian/scripts/archmap deleted file mode 100644 index 22923c1..0000000 --- a/debian/scripts/archmap +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# i486 i386 i486 i586 pentium pentiumpro -if [ $(basename $0) = archmap ];then - if [ -z $1 ];then - arch=$(dpkg --print-gnu-build-architecture) - else - arch=$1 - fi -else - if [ -z $arch ];then - arch=$(dpkg --print-gnu-build-architecture) - fi -fi -set -- $(egrep ".* $arch( .*|$)" debian/scripts/archmap) -if [ -z $2 ];then - arch=$arch -else - arch=$2 -fi -if [ $(basename $0) = archmap ];then - echo $arch -fi diff --git a/debian/scripts/getglibcversion b/debian/scripts/getglibcversion deleted file mode 100644 index 26e7b46..0000000 --- a/debian/scripts/getglibcversion +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh -# GNU C library version detection shell script. -# Copyright 1999 Branden Robinson. -# Licensed under the GNU General Public License, version 2. See the file -# /usr/share/common-licenses/GPL or . - -# This script probably makes about a billion too many assumptions, but it's -# better than hardcoding the glibc version on a per-architecture basis. - -set -e - -usage () { - echo "Usage: getglibcversion [option]" - echo " Where [option] may be one of:" - echo " --major return major version only" - echo " --minor return minor version only" - echo " --point return ittybitty version only" - echo "With no option, returns major.minor.ittybitty ."; -} - -case $# in - 0) ;; - 1) case $1 in - --help) usage - exit 0 ;; - --major) RETURN=1 ;; - --minor) RETURN=2 ;; - --point) RETURN=3 ;; - *) exec 1>&2 - usage - exit 1 ;; - esac ;; - *) exec 1>&2 - usage - exit 1 ;; -esac - -LIBCLIST=$(cd /lib && ls libc-*.so) - -case $(echo $LIBCLIST | wc -l | awk '{print $1}') in - 0) echo "No GNU C library found! Aborting." >&2 - exit 1 ;; - 1) ;; - *) echo "Multiple versions of GNU C library found! Aborting." >&2 - exit 1 ;; -esac - -LIBCVERSION=$(echo $LIBCLIST | sed 's/libc-//;s/\.so//') - -if [ -z $RETURN ]; then - echo $LIBCVERSION -else - echo $LIBCVERSION | cut -d. -f$RETURN -fi - -exit 0 diff --git a/debian/scripts/lib b/debian/scripts/lib deleted file mode 100644 index 8f1c61e..0000000 --- a/debian/scripts/lib +++ /dev/null @@ -1,198 +0,0 @@ -#!/bin/sh -if [ $(basename $0) = lib ];then - make -C debian/scripts sh.vars - . debian/scripts/sh.vars -fi -fetchmsg() { - local msg - msg=$1;shift - eval echo $(sed -ne "s/^$(BASENAME):$msg://p" debian/scripts/messages) -} -START() { - echo -n "$(fetchmsg START "$@") " -} -OK() { - fetchmsg OK "$@" -} -FAILED() { - fetchmsg FAILED "$@" -} -ALREADY_DONE() { - fetchmsg ALREADY_DONE "$@" -} - -BASENAME() { - local base - if [ "$cmd" ];then - base=$cmd - else - base=${0##*/} - fi - if [ x$base = x ];then - echo "Danger, Will Robinson, Danger!" 1>&2 - echo "Bash is very confused." 1>&2 - exit 1 - fi - if [ x$base = xlib ];then - echo "You can't call this directly." 1>&2 - echo "This is a library that should be sourced." 1>&2 - exit 1 - fi - echo $base -} -file2cat() { - $(decompress_prog $1) $1 -} -debug() { - echo "$@" - eval "$@" -} -decompress_prog() { - local which - which="cat" - [ $1 != ${1%.tgz} -o $1 != ${1%.gz} -o $1 != ${1%.Z} ] && which="gunzip -c" - [ $1 != ${1%.bz2} ] && which="bunzip2 -c" - [ $1 != ${1%.bz} ] && which="bunzip -c" - echo $which -} -compress_ext() { - local which - which="" - [ $1 != ${1%.gz} ] && which=gz - [ $1 != ${1%.Z} ] && which=Z - [ $1 != ${1%.bz2} ] && which=bz2 - [ $1 != ${1%.bz} ] && which=bz - echo $which -} -filetype_detect() { - local which f - which="" - f=$(echo "$1" | sed 's|:::.*||') - [ $f != ${f%.jar} ] && which=jarfile - [ $f != ${f%.zip} ] && which=zipfile - [ $f != ${f%.tgz} ] && which=tarball - [ $f != ${f%.tar.$(compress_ext $f)} ] && which=tarball - [ $f != ${f%.tar} ] && which=tarball - [ $f != ${f%.diff.$(compress_ext $f)} -o $1 != ${1%.patch.$(compress_ext $1)} ] && which=patch - [ $f != ${f%.diff} -o $1 != ${1%.patch} ] && which=patch - [ $f != ${f%.dsc} ] && which=dsc - echo $which -} -extract_tar() { - local which file dir curd - dir="$1" - shift - curd=$(pwd) - while [ $# -gt 0 ];do - file="$1" - [ "$file" = "${1#/}" ] && file="$curd/$file" - case "$(filetype_detect $file)" in - "jarfile") (cd $dir;fastjar -xf $file);; - "zipfile") (cd $dir;miniunzip -x $file);; - "tarball") $(decompress_prog $file) $file | (cd $dir;tar xvf -);; - *) echo "unsupported tarball";; - esac - shift - done -} - -do.patching() { - filetmpl=\$d/\$f - reversesort="" - reversepatch="" - - case "$cmd" in - source.patch) - mkdir -p $SOURCE_DIR/$TAR_DIR - patch_dirs="$SRC_PATCH_DIR $SRC_ADD_PATCH_DIR" - stampfiletmpl=\$STAMP_DIR/\$d/\$f - logtmpl=\$STAMP_DIR/log/\$d/\$f - dirprep="\$STAMP_DIR/log/\$d \$STAMP_DIR/\$d" - patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR - ;; - patch.apply) - mkdir -p $SOURCE_DIR/$TAR_DIR $STAMP_DIR/patches - patch_dirs="$PATCH_DIR $ADD_PATCH_DIR" - stampfiletmpl=\$STAMP_DIR/patches/\$f - logtmpl=\$STAMP_DIR/log/\$d/\$f - dirprep=\$STAMP_DIR/log/\$d - patchapplydirtmpl=\$SOURCE_DIR/\$TAR_DIR - ;; - fix.source.patch) - if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then - exit - fi - mkdir -p $STAMP_DIR/fixpatch - patch_dirs=debian/fixpatch - stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" - logtmpl=\$STAMP_DIR/log/fixpatch/\$f - dirprep=\$STAMP_DIR/log/fixpatch - patchapplydirtmpl=upstream - ;; - unfix.source.patch) - if [ "$DBS_UNIFIED" -o ! -e debian/fixpatch ];then - exit - fi - mkdir -p $STAMP_DIR/fixpatch - patch_dirs=debian/fixpatch - stampfiletmpl="$STAMP_DIR/fixpatch/\$(basename \$f)" - logtmpl=\$STAMP_DIR/log/fixpatch/\$f - dirprep=\$STAMP_DIR/log/fixpatch - patchapplydirtmpl=upstream - reversesort=-r - reversepatch=-R - ;; - esac - for d in $patch_dirs;do - if [ ! -d $d ];then - continue - fi - eval mkdir -p $dirprep - for f in `(cd $d >/dev/null;find -type f ! -name 'chk-*' 2>/dev/null )|sort $reversesort`;do - eval stampfile=$stampfiletmpl - eval log=$logtmpl - eval file=$filetmpl - eval patchapplydir=$patchapplydirtmpl - if [ ! -e $stampfile ];then - START $file - if file2cat $file | (cd $patchapplydir;patch -p1 $reversepatch) > $log;then - OK $file - touch $stampfile - else - FAILED $file - exit 1 - fi - else - ALREADY_DONE $file - fi - done - done - -} -# -# External api functions. -# - -source.clean() { - if [ "$DBS_UNIFIED" ];then - exit - fi - rm -rf $SOURCE_DIR $STAMP_DIR/upstream $STAMP_DIR/patches - rm -f $STAMP_DIR/{source.{clean,build,make}} - return -if [ x$SOURCE_DIR = x ];then - files=`find -type f -maxdepth 1 -mindepth 1` - dirs=`find -type d -maxdepth 1 -mindepth 1 ! -name 'debian' ! -name 'upstream'` - echo files=\"$files\" - echo dirs=\"$dirs\" -fi - -} -source.patch() { cmd=source.patch; do.patching; } -fix.source.patch() { cmd=fix.source.patch; do.patching; } -unfix.source.patch() { cmd=unfix.source.patch; do.patching; } -patch.apply() { cmd=patch.apply; do.patching; } - -if [ $(basename $0) = lib ];then - $1 -fi diff --git a/debian/scripts/messages b/debian/scripts/messages deleted file mode 100644 index 4d35279..0000000 --- a/debian/scripts/messages +++ /dev/null @@ -1,29 +0,0 @@ -fix.source.patch:START:"Fixing upstream patch $1" -fix.source.patch:OK:"successful." -fix.source.patch:FAILED:"failed!" -fix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already applied!" - -unfix.source.patch:START:"Unfixing upstream patch $1 -unfix.source.patch:OK:"successful." -unfix.source.patch:FAILED:"failed! -unfix.source.patch:ALREADY_DONE:"upstream patch fixup $1 already reversed!" - -patch.unapply:START:"Reversing patch $1" -patch.unapply:OK:"successful." -patch.unapply:FAILED:"failed!" -patch.unapply:ALREADY_DONE:"Patch $1 not applied!" - -patch.apply:START:"Applying patch $1" -patch.apply:OK:"successful." -patch.apply:FAILED:"failed!" -patch.apply:ALREADY_DONE:"Patch $1 already applied!" - -source.patch:START:"Applying upstream patch $1" -source.patch:OK:"successful." -source.patch:FAILED:"failed!" -source.patch:ALREADY_DONE:"upstream patch $1 already applied!" - -source.unpack:START:"Extracting upstream tarball $1" -source.unpack:OK:"successful." -source.unpack:FAILED:"failed!" -source.unpack:ALREADY_DONE:"upstream tarball $1 already extracted!" diff --git a/debian/scripts/source.unpack b/debian/scripts/source.unpack deleted file mode 100644 index 2bcc6e5..0000000 --- a/debian/scripts/source.unpack +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh -make -C debian/scripts sh.vars -. debian/scripts/sh.vars -. debian/scripts/lib - -mkdir -p $STAMP_DIR/upstream/tarballs/ $SOURCE_DIR -if [ ! -z "$SRC_TAR_DIR" -a -d "$SRC_TAR_DIR" ];then - files=$(find $SRC_TAR_DIR -type f|sort) -else - VER=$(dpkg-parsechangelog 2>&1|egrep ^Version|cut -d " " -f 2|cut -d "-" -f 1) - SRC=$(dpkg-parsechangelog 2>&1|egrep ^Source|cut -d " " -f 2-) - files=../${SRC}_${VER}.orig.tar.gz -fi -for f in $files;do - stampfile=$STAMP_DIR/upstream/tarballs/`basename $f` - if [ ! -e $stampfile ];then - START $f - if extract_tar ${SOURCE_DIR:-.} $f > $stampfile.log;then - if [ x$SOURCE_DIR = x ];then - mkdir -p $STAMP_DIR/upstream/files/tarballs - cp $stampfile.log $STAMP_DIR/upstream/files/tarballs/`basename $f`.list - fi - OK $f - touch $stampfile - else - FAILED $f - exit 1 - fi - else - ALREADY_DONE $f - fi -done diff --git a/debian/scripts/vars b/debian/scripts/vars deleted file mode 100644 index 8ab82b0..0000000 --- a/debian/scripts/vars +++ /dev/null @@ -1,32 +0,0 @@ -# This file is NOT a shell script. -# -# This file gets included by both debian/rules (make) AND the scripts in -# debian/scripts (bash) -# - -# Where to cd to to unpack all the tarballs. -SOURCE_DIR=build-tree -# For a single pkg, this is the directory that is embedded in the tarball. -# For multiple pkgs, this is null. -TAR_DIR=mutt-1.5.11 -# Where to place all the stamp files. This directory can be removed, and -# all the targets will then be rerun. -STAMP_DIR=debian/stampdir -# When sys-build.mk is used to build the source, this is the target(s) to -# run. -BUILD_TARGET= -# When cleaning the source, during diff generation, if this is set, this -# target will be called in debian/rules. This allows for pkgs that have -# complicated cleaning rules. -CLEAN_TARGET_EXTERNAL=extra-clean -# Whether to die if the source cleaning fails. -CLEAN_IGNORE=yes -# The clean target to run. Defaults to clean. -CLEAN_TARGET=maintainer-clean -# Files to exclude from the diff. -DIFF_EXCLUDE="" -# Where the patches are located(duh!). -PATCH_DIR=debian/patches -EXTRA_PATCHES=upstream/extra-patches -SRC_PATCH_DIR="upstream/patches $EXTRA_PATCHES" -SRC_TAR_DIR=upstream/tarballs diff --git a/debian/scripts/vars.build b/debian/scripts/vars.build deleted file mode 100644 index aae43c9..0000000 --- a/debian/scripts/vars.build +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/make -f - -sed_cmd='' -cat $1 | while read REPLY; do - case "$REPLY" in - \#*|"") continue;; - *) - var=$(echo $REPLY|sed 's/\([^=]*\)=.*/\1/') - eval $REPLY - if [ $2 = "make" ]; then - eval echo "$var=\$$var" - else - eval echo "$var=\\\"\$$var\\\"" - fi - ;; - esac -done diff --git a/debian/sys-build.mk b/debian/sys-build.mk deleted file mode 100644 index 761df99..0000000 --- a/debian/sys-build.mk +++ /dev/null @@ -1,167 +0,0 @@ -#!/usr/bin/make -f -# Separate tarball/patch build system by Adam Heath - -# The magic targets that you need to concern yourself with are: -# -# source.build: Unpacks upstream tarballs, optionally applies patches -# to fix the upstream patches, then applies upstream -# patches. -# source.make: Applies debian patches. -# source.clean: Cleans the build directory, then unfixes the upstream -# patches. -# source.compile: Will compile the source for you. Please check -# debian/scripts/vars. -# source.cmd: When calling this target, if you define a variable -# SOURCE_CMD, it will run that command in the build -# tree. -# make-diff: Generates debian.diff in the current directory which -# contains all edits that are currently in the build -# tree. -# -# Nothing in this file should require any editting. Please look at -# debian/scripts/vars for things to change for the local environment. -# -# debian/rules target command -# ---------------------------------------------------------------- -# clean: $(MAKE) -f debian/sys-build.mk source.clean -# build: $(MAKE) -f debian/sys-build.mk source.compile -# for simple systems. -# build: $(MAKE) -f debian/sys-build.mk source.make -# and, in the rules file, you can -# build the targets you want. -SHELL=/bin/bash -ifndef NOISY -.SILENT: -endif - -include debian/scripts/vars -# remove quotes -DIFF_EXCLUDE:=$(patsubst %,-x %,$(shell echo $(DIFF_EXCLUDE))) - -ifdef TAR_DIR -BUILD_TREE=$(SOURCE_DIR)/$(TAR_DIR) -else -BUILD_TREE=$(SOURCE_DIR) -endif - -SOURCE_CMD=: - -ifdef CLEAN_IGNORE - CLEAN_CMD=- - CLEAN_SH= -else - CLEAN_CMD= - CLEAN_SH= -endif -ifndef CLEAN_TARGET - CLEAN_TARGET=clean -endif - -foo: - echo $(DIFF_EXCLUDE) - -make-diff: - mv $(BUILD_TREE) bak - $(MAKE) -f debian/sys-build.mk source.clean - $(MAKE) -f debian/sys-build.mk source.make - mv $(BUILD_TREE) $(BUILD_TREE).orig - mv bak $(BUILD_TREE) - -ifdef TAR_DIR -ifdef CLEAN_TARGET_EXTERNAL - $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) -else - $(CLEAN_CMD)$(MAKE) -C $(BUILD_TREE) $(CLEAN_TARGET) -endif - -(cd $(SOURCE_DIR);diff -ruN $(TAR_DIR).orig $(TAR_DIR) $(DIFF_EXCLUDE)) > debian.diff -else -ifdef CLEAN_TARGET_EXTERNAL - $(CLEAN_CMD)$(MAKE) -f debian/rules $(CLEAN_TARGET_EXTERNAL) -else - $(CLEAN_CMD)for a in $(BUILD_TREE)/*;do $(MAKE) -C $$a $(CLEAN_TARGET);done -endif - -(diff -ruN $(BUILD_TREE).orig $(BUILD_TREE) $(DIFF_EXCLUDE)) > debian.diff - if [ ! -s debian.diff ];then\ - rm debian.diff;\ - fi -endif - rm -rf $(BUILD_TREE).orig - -patchapply: $(STAMP_DIR)/patchapply -$(STAMP_DIR)/patchapply: $(STAMP_DIR)/source.build $(STAMP_DIR) - $(SHELL) debian/scripts/lib patch.apply - touch $@ - rm -f $(STAMP_DIR)/patchunapply - -patchunapply: $(STAMP_DIR)/patchunapply -$(STAMP_DIR)/patchunapply: $(STAMP_DIR)/source.build $(STAMP_DIR) - $(SHELL) debian/scripts/lib patch.unapply - touch $@ - rm -f $(STAMP_DIR)/patchapply - -.export: SOURCE_TREE - -# -# The rules that really do the work all start with $(STAMPDIR) -# This little trick allows us to use stamp files to keep us from -# having to rerun long targets over and over. It also puts -# all stamp files in one place, for easy cleaning. -# -# If a stampdir rule depends on something else, be sure it is -# another stampdir rule. Depending on base rule won't work. -# - -source.build: $(STAMP_DIR)/source.build -STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.build -$(STAMP_DIR)/source.build: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/source.patch $(STAMP_DIR) - touch $@ - -source.make: $(STAMP_DIR)/source.make -STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.make -$(STAMP_DIR)/source.make: $(STAMP_DIR)/source.build $(STAMP_DIR)/patchapply $(STAMP_DIR) - touch $@ - -source.unpack: $(STAMP_DIR)/source.unpack -STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.unpack -$(STAMP_DIR)/source.unpack: $(STAMP_DIR) - $(SHELL) debian/scripts/source.unpack - touch $@ - -source.patch: $(STAMP_DIR)/source.patch -STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.patch -$(STAMP_DIR)/source.patch: $(STAMP_DIR)/source.unpack $(STAMP_DIR)/fix.source.patch $(STAMP_DIR) - $(SHELL) debian/scripts/lib source.patch - touch $@ - -fix.source.patch: $(STAMP_DIR)/fix.source.patch -STAMP_DIR_TARGETS+= $(STAMP_DIR)/fix.source.patch -$(STAMP_DIR)/fix.source.patch: $(STAMP_DIR) - $(SHELL) debian/scripts/lib fix.source.patch - touch $@ - -unfix.source.patch: $(STAMP_DIR)/unfix.source.patch -STAMP_DIR_TARGETS+= $(STAMP_DIR)/unfix.source.patch -$(STAMP_DIR)/unfix.source.patch: $(STAMP_DIR) - $(SHELL) debian/scripts/lib unfix.source.patch - touch $@ - -source.compile: $(STAMP_DIR)/source.compile -STAMP_DIR_TARGETS+= $(STAMP_DIR)/source.compile -$(STAMP_DIR)/source.compile: $(STAMP_DIR)/source.make $(STAMP_DIR) - $(MAKE) -C $(BUILD_TREE) $(BUILD_TARGET) - touch $@ - -source.command: - (cd $(BUILD_TREE); $(SOURCE_CMD)) - -DIR_TARGETS+=$(STAMP_DIR) -$(STAMP_DIR_TARGETS): $(STAMP_DIR) - -$(DIR_TARGETS)/: - mkdir -p $@ - -source.clean: unfix.source.patch - $(SHELL) debian/scripts/lib source.clean - rm -f $(STAMP_DIR_TARGETS) - rm -rf $(STAMP_DIR) - $(MAKE) -C debian/scripts clean diff --git a/debian/update-autotools.sh b/debian/update-autotools.sh index 4f5fc40..2c0d16d 100644 --- a/debian/update-autotools.sh +++ b/debian/update-autotools.sh @@ -2,23 +2,36 @@ set -e -diff="${1-debian/patches/autotools-update}" -rm -f "$diff" +D="$1" # mutt-1.5.X +PATCH_NAME=misc/autotools-update.diff +cd $D dh_testdir debclean -make -f debian/sys-build.mk source.patch -cd build-tree +quilt delete $PATCH_NAME || test $? -eq 1 +quilt push -aq +ln -sf /usr/share/misc/config.sub . +ln -sf /usr/share/misc/config.guess . +cd - -D=`echo *` cp -al $D $D.orig cd $D aclocal -I m4 autoheader -(cd m4 && make -f Makefile.am.in ) +( cd m4 && make -f Makefile.am.in ) automake autoconf cd .. -diff -ru $D.orig $D >"../$diff" +T=`mktemp $D/diff.XXXXXX` +diff -ru $D.orig $D >$T || test $? -eq 1 +patch -p1 -R -d $D <$T + +cd $D +quilt import -f -n $PATCH_NAME `basename $T` +quilt push +cd - + +rm -f $T +rm -rf $D.orig diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..eb29a9a --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +opts=pasv ftp://ftp.mutt.org/mutt/devel/mutt-(.*).tar.gz diff --git a/upstream/patches/cvs_2005-09-22 b/upstream/patches/cvs_2005-09-22 deleted file mode 100644 index 0ec4fed..0000000 --- a/upstream/patches/cvs_2005-09-22 +++ /dev/null @@ -1,29870 +0,0 @@ -Index: mutt/COPYRIGHT -=================================================================== -RCS file: /home/roessler/cvs/mutt/COPYRIGHT,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/COPYRIGHT 24 Jan 2002 12:10:46 -0000 3.0 -+++ mutt/COPYRIGHT 17 Sep 2005 20:46:09 -0000 3.2 -@@ -27,5 +27,5 @@ Copyright (C) 2000-2001 Edmund Grimley E - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -Index: mutt/ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.573 -retrieving revision 3.607 -diff -u -p -u -a -r3.573 -r3.607 ---- mutt/ChangeLog 14 Sep 2005 14:15:54 -0000 3.573 -+++ mutt/ChangeLog 22 Sep 2005 16:39:10 -0000 3.607 -@@ -1,4 +1,305 @@ --2005-09-14 14:15:06 TAKAHASHI Tamotsu (brendan) -+2005-09-22 16:38:08 Takahashi Tamotsu (brendan) -+ -+ * configure.in, globals.h, hcache.c, init.h: Update QDBM patch to -+ the current state of the art. Closes: #2003 (again). -+ -+2005-09-22 09:06:13 Thomas Roessler (roessler) -+ -+ * send.c: When composing a reply, there might be degenerate cases -+ in which a CC header is created, but no To header. In this case, -+ we now use the auto-generated CC header as the To header. -+ -+2005-09-22 04:05:49 Brendan Cully (brendan) -+ -+ * init.c: Refactor mutt var completion so it can be used for -+ inline expansions (eg $from). Actual expansion not committed yet. -+ -+ * send.c: If ContentType is null, assume text/plain. Stopgap; a -+ better mechanism would sanity-check MuttVars assignments before -+ allowing them. Closes: #2080. -+ -+ * imap/util.c, imap/imap.c: Don't allow imap URLs with empty -+ hosts. Also don't attempt to complete on open connections when -+ there aren't any (diagnosed by Nico Golde). Closes: #2079. -+ -+ * pattern.c: Use ctx instead of Context when checking whether or -+ not to do IMAP search. Resolves a possible segfault in color index -+ ~b operations. I can't remember whether Context vs ctx was -+ intentional - I doubt it. -+ -+2005-09-21 14:17:14 Adeodato Simo (brendan) -+ -+ * curs_main.c: Check for sigwinch in index before calling -+ km_dokey, since for unknown reasons km_dokey seems to eat the -+ signal in some cases. [Not reproducible in my ncurses environments -+ - Brendan]. Closes: #1907. -+ -+2005-09-21 13:23:43 Brendan Cully (brendan) -+ -+ * imap/imap.c, pattern.c: Catch empty substring/regexp search -+ arguments (precludes a segfault from dereferencing a null string -+ pointer later). -+ -+2005-09-21 06:04:37 Thomas Glanzmann (roessler) -+ -+ * init.h, mutt.h, configure.in, hcache.c: QDBM support for the -+ header cache. -+ -+2005-09-21 04:50:31 Adeodato Simo (brendan) -+ -+ * pgp.c: When using GPG agent in classic mode, set GPG_TTY if it -+ isn't already set instead of bailing out. Closes: #2072. -+ -+2005-09-21 03:48:38 Takahashi Tamotsu (brendan) -+ -+ * init.c: Ensure that set doesn't change variables from within the -+ help screen. I think this is a gross approach, and probably -+ overkill, but it's the fault of the original code design, not -+ Tamo's patch. Until a better way falls from the sky, this Closes: -+ #2011. -+ -+2005-09-21 02:58:07 Brendan Cully (brendan) -+ -+ * curs_main.c: Cancelling from within the pager -+ will now keep you in the pager rather than kicking you back to the -+ index. Closes: #2075. -+ -+2005-09-20 23:41:21 Vincent Lefevre (brendan) -+ -+ * muttlib.c: Slight improvement on dgc's warning fix in edge cases. -+ -+2005-09-20 06:43:39 David Champion (brendan) -+ -+ * init.c: Fix a null-pointer-dereference parsing aliases with -+ -d3+. -+ -+ * muttlib.c: Clear a compiler warning. -+ -+2005-09-20 03:56:25 Gero Treuner (brendan) -+ -+ * contrib/gpg.rc, doc/manual.xml.tail: Update locations of -+ gpg-2comp, Gero Treuner. -+ -+2005-09-19 06:14:27 Brendan Cully (brendan) -+ -+ * mkchangelog.sh: I just realised what's been happening to the -+ changelog: I recently got a new version of 'head' that refuses -+ to accept -1 instead of -n 1, but doesn't actually return -+ failure. So mkchangelog was feeding nothing to the cvs date -+ argument, and instead merrily snarfing down the entire changelog -+ every time. I've put in a simple $date != "" check. Thanks, -+ textutils! Thanks for ushering in the future! I'd like to shake -+ your hand. Hard. -+ -+2005-09-19 05:12:29 Brendan Cully (brendan) -+ -+ * doc/manual.xml.head: Remove mention of obsolete -+ --enable-imap-edit-threads configure option. -+ -+2005-09-18 17:49:33 Brendan Cully (brendan) -+ -+ * ChangeLog: Somehow the changelog got mangled (multiple copies -+ of large parts). -+ -+2005-09-18 08:22:49 Vsevolod Volkov (roessler) -+ -+ * po/ru.po: update -+ -+2005-09-18 02:53:18 brendan (brendan) -+ -+ * doc/Makefile.in: More cleanups, slightly better dependencies. -+ -+2005-09-18 02:35:10 Brendan Cully (brendan) -+ -+ * doc/Makefile.in: Stupid hack to synchronise on makedoc for -+ parallel builds. Only works when entered via make all. make -+ stamp-doc-xml directly can fail in pathological conditions. -+ -+ * doc/Makefile.in: Attempt to work around make -j2 -+ breakage. Dependencies are still wrong, but I don't have -+ the brainpower right now to get it right. People talk about -+ imperative, functional, and logic programming, but no one ever -+ mentions make programming. -+ -+2005-09-17 20:46:14 Brendan Cully (brendan) -+ -+ * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, -+ po/uk.po, po/zh_CN.po, po/zh_TW.po, po/ga.po, po/gl.po, -+ po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, -+ po/nl.po, po/pl.po, intl/plural.y, intl/ref-add.sin, -+ intl/ref-del.sin, intl/textdomain.c, po/bg.po, po/ca.po, -+ po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, -+ po/et.po, po/fr.po, doc/dotlock.man, doc/manual.xml.head, -+ doc/mutt.man, doc/muttbug.man, doc/muttrc.man.head, -+ imap/auth.c, imap/auth.h, imap/auth_anon.c, imap/auth_cram.c, -+ imap/auth_gss.c, imap/auth_login.c, imap/auth_sasl.c, -+ imap/browse.c, imap/command.c, imap/imap.c, imap/imap.h, -+ imap/imap_private.h, imap/message.c, imap/message.h, imap/utf7.c, -+ imap/util.c, intl/COPYING.LIB-2, intl/COPYING.LIB-2.1, -+ intl/Makefile.in, intl/bindtextdom.c, intl/config.charset, -+ intl/dcgettext.c, intl/dcigettext.c, intl/dcngettext.c, -+ intl/dgettext.c, intl/dngettext.c, intl/explodename.c, -+ intl/finddomain.c, intl/gettext.c, intl/gettext.h, -+ intl/gettextP.h, intl/hash-string.h, intl/intl-compat.c, -+ intl/l10nflist.c, intl/libgettext.h, intl/libgnuintl.h, -+ intl/libintl.glibc, intl/loadinfo.h, intl/loadmsgcat.c, -+ intl/localcharset.c, intl/locale.alias, intl/localealias.c, -+ intl/ngettext.c, intl/plural.c, pgpkey.c, pgplib.c, pgplib.h, -+ pgpmicalg.c, pgppacket.c, pgppacket.h, pgppubring.c, pop.c, -+ pop.h, pop_auth.c, pop_lib.c, postpone.c, protos.h, query.c, -+ recvattach.c, recvcmd.c, regex.c, remailer.c, remailer.h, -+ resize.c, rfc1524.c, rfc1524.h, rfc2047.c, rfc2047.h, rfc2231.c, -+ rfc2231.h, rfc822.c, rfc822.h, score.c, send.c, sendlib.c, -+ signal.c, smime.c, smime.h, smime_keys.pl, sort.c, sort.h, -+ status.c, system.c, thread.c, url.c, browser.h, buffy.c, buffy.h, -+ charset.c, charset.h, color.c, commands.c, complete.c, compose.c, -+ config.guess, config.sub, copy.c, copy.h, crypt-gpgme.c, -+ crypt-gpgme.h, crypt-mod-pgp-classic.c, crypt-mod-pgp-gpgme.c, -+ crypt-mod-smime-classic.c, crypt-mod-smime-gpgme.c, crypt-mod.c, -+ crypt-mod.h, crypt.c, cryptglue.c, curs_lib.c, curs_main.c, -+ date.c, depcomp, dotlock.c, dotlock.h, edit.c, editmsg.c, -+ enter.c, extlib.c, filter.c, flags.c, from.c, functions.h, -+ globals.h, gnupgparse.c, handler.c, hash.c, hash.h, hcache.c, -+ hdrline.c, headers.c, help.c, history.c, history.h, hook.c, -+ init.c, init.h, keymap.c, keymap.h, lib.c, lib.h, mailbox.h, -+ main.c, makedoc.c, mapping.h, mbox.c, mbyte.c, menu.c, -+ mh.c, mime.h, missing, mutt.h, mutt_crypt.h, mutt_curses.h, -+ mutt_idna.c, mutt_idna.h, mutt_menu.h, mutt_regex.h, mutt_sasl.c, -+ mutt_sasl.h, mutt_socket.c, mutt_socket.h, mutt_ssl.c, mutt_ssl.h, -+ mutt_ssl_gnutls.c, mutt_tunnel.c, mutt_tunnel.h, muttbug.sh.in, -+ muttlib.c, mx.c, mx.h, pager.c, pager.h, parse.c, pattern.c, -+ pgp.c, pgp.h, pgpinvoke.c, COPYRIGHT, _regex.h, account.c, -+ account.h, addrbook.c, alias.c, ascii.c, ascii.h, attach.c, -+ attach.h, base64.c, browser.c: Gah, forgot the zip code when -+ updating the FSF address... -+ -+ * po/zh_CN.po, po/zh_TW.po, po/tr.po, po/uk.po, po/sk.po, -+ po/sv.po, po/ru.po, po/pt_BR.po, po/nl.po, po/pl.po, po/ko.po, -+ po/lt.po, po/ja.po, po/id.po, po/it.po, po/ga.po, po/gl.po, -+ po/hu.po, po/et.po, po/fr.po, po/eo.po, po/es.po, po/de.po, -+ po/el.po, po/da.po, imap/imap.h, imap/imap_private.h, -+ imap/message.c, imap/message.h, imap/utf7.c, imap/util.c, -+ intl/COPYING.LIB-2, intl/Makefile.in, intl/bindtextdom.c, -+ intl/config.charset, intl/dcgettext.c, intl/dcigettext.c, -+ intl/dcngettext.c, intl/dgettext.c, intl/dngettext.c, -+ intl/explodename.c, intl/finddomain.c, intl/gettext.c, -+ intl/gettext.h, intl/gettextP.h, intl/hash-string.h, -+ intl/intl-compat.c, intl/l10nflist.c, intl/libgettext.h, -+ intl/libgnuintl.h, intl/libintl.glibc, intl/loadinfo.h, -+ intl/loadmsgcat.c, intl/localcharset.c, intl/locale.alias, -+ intl/localealias.c, intl/ngettext.c, intl/plural.c, intl/plural.y, -+ intl/ref-add.sin, intl/ref-del.sin, intl/textdomain.c, po/bg.po, -+ po/ca.po, po/cs.po, doc/dotlock.man, doc/manual.xml.head, -+ doc/mutt.man, doc/muttbug.man, doc/muttrc.man.head, imap/auth.c, -+ imap/auth.h, imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c, -+ imap/auth_login.c, imap/auth_sasl.c, imap/browse.c, -+ imap/command.c, imap/imap.c, rfc2047.h, rfc2231.c, rfc2231.h, -+ rfc822.c, rfc822.h, score.c, send.c, sendlib.c, signal.c, -+ smime.c, smime.h, smime_keys.pl, sort.c, sort.h, status.c, -+ system.c, thread.c, url.c, query.c, recvattach.c, recvcmd.c, -+ regex.c, remailer.c, remailer.h, resize.c, rfc1524.c, -+ rfc1524.h, rfc2047.c, pager.h, parse.c, pattern.c, pgp.c, -+ pgp.h, pgpinvoke.c, pgpkey.c, pgplib.c, pgplib.h, pgpmicalg.c, -+ pgppacket.c, pgppacket.h, pgppubring.c, pop.c, pop.h, -+ pop_auth.c, pop_lib.c, postpone.c, protos.h, mbyte.c, menu.c, -+ mh.c, mime.h, missing, mutt.h, mutt_crypt.h, mutt_curses.h, -+ mutt_idna.c, mutt_idna.h, mutt_menu.h, mutt_regex.h, mutt_sasl.c, -+ mutt_sasl.h, mutt_socket.c, mutt_socket.h, mutt_ssl.c, mutt_ssl.h, -+ mutt_ssl_gnutls.c, mutt_tunnel.c, mutt_tunnel.h, muttbug.sh.in, -+ muttlib.c, mx.c, mx.h, pager.c, extlib.c, filter.c, flags.c, -+ from.c, functions.h, globals.h, gnupgparse.c, handler.c, hash.c, -+ hash.h, hcache.c, hdrline.c, headers.c, help.c, history.c, -+ history.h, hook.c, init.c, init.h, keymap.c, keymap.h, lib.c, -+ lib.h, mailbox.h, main.c, makedoc.c, mapping.h, mbox.c, -+ dotlock.h, edit.c, editmsg.c, enter.c, copy.h, crypt-gpgme.c, -+ crypt-gpgme.h, crypt-mod-pgp-classic.c, crypt-mod-pgp-gpgme.c, -+ crypt-mod-smime-classic.c, crypt-mod-smime-gpgme.c, crypt-mod.c, -+ crypt-mod.h, crypt.c, cryptglue.c, curs_lib.c, curs_main.c, -+ date.c, depcomp, dotlock.c, COPYRIGHT, GPL, _regex.h, account.c, -+ account.h, addrbook.c, alias.c, ascii.c, ascii.h, attach.c, -+ attach.h, base64.c, browser.c, browser.h, buffy.c, buffy.h, -+ charset.c, charset.h, color.c, commands.c, complete.c, compose.c, -+ config.guess, config.sub, copy.c: Update FSF address (via sed, -+ I hope nothing got mangled). Closes: #2071. -+ -+2005-09-17 17:39:18 Alain Bench (brendan) -+ -+ * Muttrc.head.in: Clean up some Muttrc macros, and add macro -+ 'y' to jump to the mailboxes view. Closes: #2069. -+ -+2005-09-17 17:27:54 Brendan Cully (brendan) -+ -+ * main.c: Some minor cleanups: tell users to go to bugs.mutt.org -+ instead of using flea; update copyright year in mutt -v; -+ reorganise USE opts a little; break long strings so that -pedantic -+ stops complaining. Not sure that last one is worth the trouble -+ it causes the po team... -+ -+2005-09-17 01:07:54 Vincent Lefevre (brendan) -+ -+ * po/fr.po: Update. -+ -+2005-09-16 23:09:12 Kevin Scannell (brendan) -+ -+ * configure.in, po/ga.po: Irish translation. -+ -+2005-09-16 15:20:59 Brendan Cully (brendan) -+ -+ * build-release, po/Makefile.in.in: Move update-po out of make -+ dist, into build-release. It seems to me that make dist should do -+ as little as possible beyond putting the right files in a tarball. -+ -+2005-09-16 13:43:58 Ronny Haryanto (roessler) -+ -+ * po/id.po: update -+ -+2005-09-16 11:02:00 Ivan Vilata i Balaguer -+(roessler) -+ -+ * po/ca.po: update -+ -+2005-09-16 10:20:20 TAKAHASHI Tamotsu -+(roessler) -+ -+ * po/ja.po: update -+ -+2005-09-16 10:19:46 René Clerc (roessler) -+ -+ * po/nl.po: update -+ -+2005-09-16 02:15:45 Brendan Cully (brendan) -+ -+ * doc/Makefile.in: Add stamp-doc-xml to "all". -+ -+ * doc/Makefile.in: stamp-doc-man is pointless as far as I can -+ tell. Removed. -+ -+ * doc/Makefile.in: Tweak makefile so that the dist tarball -+ doesn't always try to build docs. -+ -+ * configure.in: VERSION should go into CONFIG_STATUS_DEPENDENCIES, -+ not CONFIGURE_DEPENDENCIES. Slap ma fro. -+ -+2005-09-15 23:18:48 Brendan Cully (brendan) -+ -+ * Makefile.am, build-release: Move changelog target to -+ update-changelog so that dist won't automatically invoke it, -+ and have commit and build-release call it. -+ -+ * build-release: Now that 1.5.11 is out, previous versions won't -+ be x.y.zi: adjust diff. -+ -+2005-09-15 14:24:39 roessler (roessler) -+ -+ * po/zh_TW.po, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, -+ po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, -+ po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, -+ po/uk.po, po/zh_CN.po, VERSION, po/bg.po, reldate.h: automatic -+ post-release commit for mutt-1.5.11 -+ -+2005-09-14 14:15:06 TAKAHASHI Tamotsu -+(brendan) - - * init.h: Refer to $use_envelope_from rather than old - $envelope_from in description of $envelope_from_address. -@@ -8,7 +309,8 @@ - * globals.h, init.h, sendlib.c: Add new $envelope_from_address - variable for manually specifying the envelope sender. Rename (with - compatibility synonym) $envelope_from to $use_envelope_from. Make -- $envelope_from subordinate to $use_e_f, as $from is to $use_from. -+ $envelope_from subordinate to $use_e_f, as $from is to -+ $use_from. From a discussion with TLR. - - 2005-09-13 20:36:17 Brendan Cully (brendan) - -@@ -22,7 +324,8 @@ - mutt_progress_bar. Allow progress bar to omit total size if zero - (=unknown). - --2005-09-10 18:47:17 TAKAHASHI Tamotsu (brendan) -+2005-09-10 18:47:17 TAKAHASHI Tamotsu -+(brendan) - - * menu.c: Correct some inconsistencies introduced by - $menu_context. Closes: #2019? -@@ -34,8 +337,15 @@ - - 2005-09-08 16:37:59 Brendan Cully (brendan) - -- * mutt_socket.c: Set CLOEXEC on sockets in IPv4 code path like we -- do in IPv6. -+ * pager.c: Revert bogus change to last message detection in -+ mutt_pager. -+ -+ * pager.c: Forget line number when resolving in pager. This -+ is beginning to get messy - maybe it would be better to only -+ remember on specific operations like sync. -+ -+ * mutt_socket.c: Set CLOEXEC on sockets in IPv4 code path like -+ we do in IPv6. - - * pattern.c: Make stringmatch pattern detection stateless. - -@@ -54,8 +364,8 @@ - * curs_lib.c: Ensure progress bar rounds to $net_inc. - - * curs_lib.c, globals.h, imap/imap.c, imap/imap_private.h, -- imap/message.c, init.h, mutt_curses.h: Display progress meter when -- uploading/fetching IMAP data. Closes: #1772. -+ imap/message.c, init.h, mutt_curses.h: Display progress meter -+ when uploading/fetching IMAP data. Closes: #1772. - - * pager.c: Adjust gross hack to return to the same line in the - pager after an index operation so that it doesn't shoot past the -@@ -67,8 +377,8 @@ - - * build-release, configure.in, mutt.h: Remove international - vs. U.S. distribution distinction. build-release expects the -- previous version to be x.y.zi and should be updated again for -- 1.5.12. -+ previous version to be x.y.zi and should be updated again -+ for 1.5.12. - - 2005-09-06 16:46:44 Brendan Cully (brendan) - -@@ -80,28 +390,30 @@ - - * doc/manual.xml.head, imap/command.c, imap/imap.c, imap/imap.h, - init.c, mutt.h, pattern.c: Extend pattern language to do simple -- string matches as well as regular expressions when the pattern is -- invoked with = instead of ~. And, when possible, perform full body -- searches on the IMAP server instead of locally, for an enormous -- speed boost. -+ string matches as well as regular expressions when the pattern -+ is invoked with = instead of ~. And, when possible, perform -+ full body searches on the IMAP server instead of locally, for -+ an enormous speed boost. - - * imap/utf7.c, init.c, main.c, protos.h: Fix a memory leak in - imap_utf7_decode and do a little cleanup on shutdown. Get a - high five from valgrind. - -- * curs_main.c, main.c: Move SASL and IMAP shutdown hooks into main -- where they belong. -+ * curs_main.c, main.c: Move SASL and IMAP shutdown hooks into -+ main where they belong. - - * init.c: Release pwent after extracting data from it. - -- * mutt_sasl.h, curs_main.c, mutt_sasl.c: Release global SASL state -- when quitting. -+ * mutt_sasl.h, curs_main.c, mutt_sasl.c: Release global SASL -+ state when quitting. - - 2005-09-05 04:22:45 Brendan Cully (brendan) - - * doc/manual.xml.head: Documentation cosmetics (add some line - breaks). - -+2005-09-04 20:10:25 Brendan Cully (brendan) -+ - * init.h: Point $hide_top_limited to $hide_limited instead of - $hide_missing. Likewise for $hide_top_missing. Closes: #2039. - -@@ -110,28 +422,28 @@ - - * doc/manual.xml.head: Add a push example. Closes: #1591. - --2005-09-04 19:46:26 Rupert Levene (brendan) -+2005-09-04 19:46:26 Rupert Levene (brendan) - - * doc/manual.xml.head: Mention $include when describing how mutt -- prepares message replies. Closes: #1471. -+ prepares message replies. Closes: #1471. - - 2005-09-04 19:28:19 Dale Woolridge (brendan) - - * pattern.c, protos.h, parse.c: Unfold message headers before - performing ~h search. Closes: #1865. - --2005-09-04 18:01:57 (brendan) -+2005-09-04 18:01:57 Zardoz@users.sourceforge.net (brendan) - - * keymap.c: Teach keymap.c about KEY_NEXT. Closes: #1588. - - 2005-09-04 06:57:04 Alain Bench (brendan) - -- * doc/manual.xml.head, doc/manual.xml.tail: Note that is -- bound to next-new-then-unread by default, rather than -+ * doc/manual.xml.head, doc/manual.xml.tail: Note that -+ is bound to next-new-then-unread by default, rather than - next-new. Closes: #1637. - -- * curs_main.c, pattern.c: Allow empty limits, and limits in empty -- mailboxes. Closes: #1853, #1906. -+ * curs_main.c, pattern.c: Allow empty limits, and limits in -+ empty mailboxes. Closes: #1853, #1906. - - 2005-09-03 23:22:31 Brendan Cully (brendan) - -@@ -150,17 +462,20 @@ - expressions, instead of any of EXPR, USER, ID and SUBJECT. Noted - by Vincent Lefevre. - -+2005-09-02 18:50:34 Brendan Cully (brendan) -+ - * doc/manual.sgml.head, doc/manual.sgml.tail, doc/manual.xml.head, -- doc/manual.xml.tail, doc/Makefile.in: Rename manual.sgml.* to -- manual.xml.*. -+ doc/manual.xml.tail, doc/Makefile.in: Rename manual.sgml.* -+ to manual.xml.*. - - 2005-09-02 18:18:19 Alain Bench (brendan) - -- * keymap.c: Allow non-ascii characters in push arguments. Closes: #2023. -+ * keymap.c: Allow non-ascii characters in push arguments. Closes: -+ #2023. - - * doc/manual.sgml.head, doc/muttrc.man.head, mutt.h, pattern.c: - Adjust ~l to match all known lists, add ~u to match only -- subscribed lists. Normalise pattern ordering in docs. Closes: -+ subscribed lists. Normalise pattern ordering in docs. Closes: - #2050. - - 2005-09-01 17:07:14 Brendan Cully (brendan) -@@ -175,30 +490,32 @@ - doc/manual.sgml.head, makedoc.c: Convert documentation from - linuxdoc to docbook format. Let the bug avalanche begin. - --2005-08-30 21:34:36 Lars Hecking (brendan) -+2005-08-30 21:34:36 Lars Hecking -+(brendan) - - * configure.in: Don't define domain="no" when configured - --without-domain. Closes: #2046. - - 2005-08-24 15:17:43 Brendan Cully (brendan) - -- * pgp.c: Don't treat PGP inline signature verification errors as -- fatal. -+ * pgp.c: Don't treat PGP inline signature verification errors -+ as fatal. - - 2005-08-22 20:30:11 Brendan Cully (brendan) - - * pgp.c: Pause after error message if PGP decode fails, in case -- mutt_copy_message overwrites. Real error handling cleanup will have -- to wait... -+ mutt_copy_message overwrites. Real error handling cleanup will -+ have to wait... - - * pgp.c: Don't attempt to manipulate null pgp output file handles. - --2005-08-16 18:10:11 Paul Walker (brendan) -+2005-08-16 18:10:11 Paul Walker (brendan) - - * doc/manual.sgml.head, doc/mutt.man, main.c: -D dumps to stdout, - not stderr. - --2005-08-15 08:10:48 Thomas Roessler (roessler) -+2005-08-15 08:10:48 Thomas Roessler -+(roessler) - - * po/id.po: Fix \n mismatch. - -@@ -210,11 +527,12 @@ - - * po/ru.po: update - --2005-08-14 21:32:17 TAKAHASHI Tamotsu (brendan) -+2005-08-14 21:32:17 TAKAHASHI Tamotsu -+(brendan) - - * attach.c, send.c: Don't pass an empty filename to the default - text editor when editing non-plain text. Also don't clobber -- $content_type when parsing it. Closes: #2038. -+ $content_type when parsing it. Closes: #2038. - - 2005-08-14 12:28:52 Roland Rosenfeld (roessler) - -@@ -237,7 +555,8 @@ - in which gnu documentation flagged any extensions to standard - utilities almost makes me cry. - --2005-08-12 12:52:11 TAKAHASHI Tamotsu (roessler) -+2005-08-12 12:52:11 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update - -@@ -247,21 +566,22 @@ - - 2005-08-12 03:57:16 Brendan Cully (brendan) - -- * configure.in: Force configure to depend on VERSION. That's been -- bugging me for a while. -+ * configure.in: Force configure to depend on VERSION. That's -+ been bugging me for a while. - --2005-08-11 21:46:26 Thomas Roessler (roessler) -+2005-08-11 21:46:26 roessler (roessler) - - * po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, - po/uk.po, po/zh_CN.po, po/zh_TW.po, po/bg.po, po/ca.po, po/cs.po, - po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, - po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, -- po/ko.po, po/lt.po, po/nl.po: automatic post-release commit for -- mutt-1.5.10 -+ po/ko.po, po/lt.po, po/nl.po: automatic post-release commit -+ for mutt-1.5.10 -+ -+2005-08-11 21:22:41 Thomas Roessler -+(roessler) - - * Makefile.am, VERSION, reldate.h: Fix Makefile.am. -- (VERSION and reldate.h actually are bad commits -- but that -- doesn't matter. Release imminent.) - - 2005-08-11 21:16:38 Brendan Cully (brendan) - -@@ -272,12 +592,14 @@ - Add error results to mutt_body_handlers, and check them when - doing decode-save. Closes: #1919. - --2005-08-11 21:08:55 Thomas Roessler (roessler) -+2005-08-11 21:08:55 Thomas Roessler -+(roessler) - - * pgp.c: Fix verification of clearsigned PGP messages. - (debugged on IRC, mostly by Brendan) - --2005-08-11 02:15:14 Thomas Glanzmann (brendan) -+2005-08-11 02:15:14 Thomas Glanzmann -+(brendan) - - * configure.in: Don't test against nonexistent cache - variable. Spotted by Torsten Veller. -@@ -298,12 +620,13 @@ - #2030. - - * pgp.c: Move pgp failure check inside the if (invoke pgp) -- block. Really Closes: 2032. -+ block. Should really Close: 2032. - - * pgp.c: Don't ftell pgp output file if there isn't one. Closes: - #2032. - --2005-08-09 16:24:15 TAKAHASHI Tamotsu (brendan) -+2005-08-09 16:24:15 TAKAHASHI Tamotsu -+(brendan) - - * crypt-gpgme.c: Improve translatability of crypt-gpgme. Closes: - #2020. -@@ -312,8 +635,7 @@ - - * copy.c: Remove an unneeded cast, which introduces - type-punning. Modified to use FREE instead of safe_free, since -- that seems to be the convention. I personally don't see the -- point. -+ that seems to be the convention. I personally don't see the point. - - 2005-08-08 18:59:43 Brendan Cully (brendan) - -@@ -329,40 +651,41 @@ - * init.h: Remove undefined reference to unmailboxes - command. Closes #2028. - --2005-08-08 06:44:01 Brendan Cully (brendan) -- - * imap/imap.c: Fix edge case where we might have to wait two - timeouts to check for IMAP mail. - -- * imap/command.c, imap/imap.c, init.h: Fix bug just introduced in -- lsub parsing that could cause mutt to loop indefinitely. Don't -- recheck subscriptions at every mailbox change, just the initial -- connection. -+ * imap/command.c, imap/imap.c, init.h: Fix bug just introduced -+ in lsub parsing that could cause mutt to loop indefinitely. -+ Don't recheck subscriptions at every mailbox change, just the -+ initial connection. - - * imap/imap.c: If imap_check_subscribed is set, mailbox or -- unmailbox folders in response to subscribe/unsubscribe commands in -- the browser. -+ unmailbox folders in response to subscribe/unsubscribe commands -+ in the browser. - -- * imap/browse.c, imap/command.c, imap/imap.c, init.h, mutt.h: New -- option: $imap_check_subscribed. If set, mutt will fetch the set of -- subscribed mailboxes from the server and add them to the buffy -- list. -+2005-08-07 23:52:08 Brendan Cully (brendan) -+ -+ * imap/browse.c, imap/command.c, imap/imap.c, init.h, mutt.h: -+ New option: $imap_check_subscribed. If set, mutt will fetch the -+ set of subscribed mailboxes from the server and add them to the -+ buffy list. - -- * browser.c: Avoid a segfault attempting to browse an invalid IMAP -- URL. -+ * browser.c: Avoid a segfault attempting to browse an invalid -+ IMAP URL. - - * imap/imap.c: Extend IMAP host completion to complete over open -- connections. -+ connections. Next up: account and folder hooks. - -- * imap/imap.c: Allow IMAP tab-completion to complete over defined -- mailboxes, saving a bunch of typing for the hostname part of the -- URL. Should probably be extended to complete over open connections -- and possibly also folder/account hooks. -+ * imap/imap.c: Allow IMAP tab-completion to complete over -+ defined mailboxes, saving a bunch of typing for the hostname -+ part of the URL. Should probably be extended to complete over -+ open connections and possibly also folder/account hooks. - - * account.c, curs_lib.c, protos.h: Reuse mutt_get_field for - mutt_get_field_unbuffered. - --2005-08-07 06:20:37 Anders Helmersson (brendan) -+2005-08-07 06:20:37 Anders Helmersson -+ (brendan) - - * pager.c: Certain versions of libc may segfault during regex - processing if given incomplete multibyte characters. Work around -@@ -383,17 +706,15 @@ - Report non-zero exit status of tunnel command. Closes: #1749. - - * imap/imap.c, imap/util.c, init.h, mutt.h, pop_lib.c: Replace -- pointless imap_force_ssl option with ssl_force_tls, which requires -- any connection (POP or IMAP) to a remote server to be encrypted, -- and attempts to negotiate encryption even if the capability isn't -- advertised (this last bit is of dubious utility, but essentially -- harmless since the connection would otherwise fail -- anyway). Closes: #1284. -+ pointless imap_force_ssl option with ssl_force_tls, which -+ requires any connection (POP or IMAP) to a remote server to -+ be encrypted, and attempts to negotiate encryption even if the -+ capability isn't advertised (this last bit is of dubious utility, -+ but essentially harmless since the connection would otherwise -+ fail anyway). Closes: #1284. - - * imap/browse.c: Kill a warning. - --2005-08-06 19:06:36 Brendan Cully (brendan) -- - * init.c: Use isalnum instead of isalpha when parsing unbraced - environment variable names, per tamo's suggestion. Closes #2022. - -@@ -403,25 +724,27 @@ - pager.h, protos.h: Move some attachment-related prototypes and - structures into attach.h from the global headers. A small step - towards sane dependency tracking and code cleanliness. -- --2005-08-04 01:15:52 Brendan Cully (brendan) -+ -+2005-08-04 01:15:52 brendan (brendan) - - * compose.c: Don't unlink non-mutt files that would have been - unlinked on send if the message is cancelled. -- -+ -+2005-08-03 15:34:14 Brendan Cully (brendan) -+ - * account.c: Fix C precedence buglet in getlogin preventing it - from actually calling getuser. - --2005-08-03 06:51:24 Brendan Cully (brendan) -- - * mutt_ssl.c: Don't double-free X509 certificates. This patch - looks wrong, but it isn't. -- -+ -+2005-08-02 18:15:33 Brendan Cully (brendan) -+ - * Makefile.am, po/Makefile.in.in, po/POTFILES.in: Remove - mutt_ssl_nss.c from POTFILES.in. Also hack the makefiles to build - keymap_alldefs.h in $(top_srcdir), since that's where xgettext -- looks. Not super clean I guess - the other alternative is to sed -- POTFILES. -+ looks. Not super clean I guess - the other alternative is to -+ sed POTFILES. - - * globals.h, init.c, init.h, mutt.h, mutt_sasl.c, mutt_socket.c, - mutt_ssl.h, mutt_ssl_nss.c, pop_lib.c, configure.in: Put moribund -@@ -430,18 +753,16 @@ - * compose.c, mutt.h: In compose menu, detach should be able to - unlink files generated by mutt, but not files that existed before. - --2005-08-02 05:58:18 Brendan Cully (brendan) -- - * commands.c, pgp.c: More fiddling with PGP results. When - rerunning PGP on a message, clear old security result bits to - avoid confusing messages like 'decrypt failed; PGP signature - successfully verified'. - -- * pgp.c: Forget passphrase on PGP/inline decryption error, and -- improve status line messages. -+ * pgp.c: Forget passphrase on PGP/inline decryption error, -+ and improve status line messages. - -- * configure.in: Make $docdir relative to $prefix, like the other -- prefixes. -+ * configure.in: Make $docdir relative to $prefix, like the -+ other prefixes. - - * contrib/Makefile.in, doc/Makefile.in: Be more selective about - what to remove during uninstall. (closes #1625) -@@ -453,30 +774,34 @@ - successfully on fetch, and don't treat a disappearing cache file - as fatal. (closes #1483) - -- * compose.c: Don't unlink attachments that you've decided not to -- send. (closes #1328) -+ * compose.c: Don't unlink attachments that you've decided not -+ to send. (closes #1328) - - * pgp.c: Bump up size of PgpPass to 1024 from 256. Seems crazy, - but it's harmless and it (closes #1207). -- -- * account.c: Fix password prompt for POP (more authentication ID -- fallout). -+ -+ * account.c: Fix password prompt for POP (more authentication -+ ID fallout). -+ -+2005-08-01 22:37:22 Brendan Cully (brendan) - - * doc/manual.sgml.head: Document key. -- -+ - * pgp.c: Automatically forget PGP passphrase on sign or decrypt -- error. (closes #1025). Display "successfully decrypted" message -- instead of nothing. Superseded by signature verification. -- -+ error. (closes #1025) -+ -+ * pgp.c: Display "successfully decrypted" message instead of -+ nothing. Superseded by signature verification. -+ - * commands.c, pgp.c: Don't report PGP signature could not be - verified unless there really is a signature verification problem - (not some other PGP error). - -- * Makefile.am: Install system muttrc from the build directory, not -- the source directory. -+ * Makefile.am: Install system muttrc from the build directory, -+ not the source directory. - -- * mbox.c: Restore Sort immediately after sorting by mailbox order -- in mbox_sync_mailbox. (closes #972) -+ * mbox.c: Restore Sort immediately after sorting by mailbox -+ order in mbox_sync_mailbox. (closes #972) - - * doc/Makefile.in, doc/mutt.man: Insert compile-time paths to - system resources into mutt.man. (closes #854) -@@ -484,46 +809,42 @@ - * commands.c, protos.h: Report errors occuring in - _mutt_save_message. (closes #847) - --2005-08-01 07:35:04 Brendan Cully (brendan) -- - * globals.h, mutt.h, mutt_ssl.c, muttlib.c: Cache SSL certificates - that have been accepted but not saved until mutt exits. (closes -- #643). Create mutt_add_list_n for adding non-character data to -+ #643). Create mutt_add_list_n for adding non-character data to - lists, have mutt_add_list call it. - --2005-08-01 04:57:04 Brendan Cully (brendan) -- - * mx.c: Report error creating FCC when writing to IMAP - server. Addresses #423. - --2005-08-01 01:43:06 Brendan Cully (brendan) -- - * init.c: complete :set mbox_type=. (closes #1649) - --2005-07-30 04:40:45 TAKAHASHI Tamotsu (brendan) -+2005-07-30 04:40:45 TAKAHASHI Tamotsu -+(brendan) - - * pager.c: The builtin pager tries to wrap a line for ever if: -- 0) the line contains a space or a tab character followed by a very -- long word, and -- 1) M_PAGER_NSKIP flag is passed to it, and -- 2) $smart_wrap is set. (default) -+ 0) the line contains a space or a tab character -+ followed by a very long word, and 1) M_PAGER_NSKIP flag is -+ passed to it, and 2) $smart_wrap is set. (default) - - 2005-07-30 04:13:07 Vincent Lefevre (brendan) - -- * curs_main.c, pager.c: When using colors, the status line of the -- index is displayed in a bright color, even when the prefix -+ * curs_main.c, pager.c: When using colors, the status line of -+ the index is displayed in a >bright color, even when the prefix - "bright" is *not* given in the foreground color. The problem - occurs when I have the following additional line: -- color normal brightwhite black -- The problem is that BKGDSET's are missing. -+ color normal brightwhite black The problem is that BKGDSET's -+ are missing. - --2005-07-30 03:59:04 TAKAHASHI Tamotsu (brendan) -+2005-07-30 03:59:04 TAKAHASHI Tamotsu -+(brendan) - - * recvattach.c: Don't refuse to delete attachments just because a - message has been checked for "traditional" PGP encoding. (closes - #2013) - --2005-07-29 18:05:50 TAKAHASHI Tamotsu (brendan) -+2005-07-29 18:05:50 TAKAHASHI Tamotsu -+(brendan) - - * init.c: "nospam foo" causes a segv if you have not set any - "spam", because of a null pointer dereference. -@@ -533,8 +854,6 @@ - * mutt_ssl_gnutls.c: Tweak a poorly-worded error message in the - gnutls glue, pointed out by Vincent Lefevre. - --2005-07-29 01:51:36 Brendan Cully (brendan) -- - * imap/imap.c: Fix bug added in revision 3.26, where - imap_sync_mailbox failed to check whether it was supposed to - expunge before issuing a CLOSE. -@@ -547,8 +866,8 @@ - 2005-07-28 19:47:40 Brendan Cully (brendan) - - * imap/auth_cram.c, imap/auth_login.c: Use mutt_account_getlogin -- instead of getuser for authentication methods that only support an -- authentication ID. As a side-effect, don't display a dangling -+ instead of getuser for authentication methods that only support -+ an authentication ID. As a side-effect, don't display a dangling - authentication name pointer in getpass. - - 2005-07-27 15:08:43 Vincent Lefevre (brendan) -@@ -561,18 +880,12 @@ - po/et.po, po/gl.po, po/lt.po, po/pt_BR.po, po/sk.po: Update - Thomas' address in several out-of-date PO files. (closes #990) - --2005-07-27 04:29:36 Brendan Cully (brendan) -- -- * mutt_ssl_gnutls.c: Silence some harmless warnings. Also, one day -- -pedantic is going to get held up on the causeway. -- --2005-07-27 00:40:15 Brendan Cully (brendan) -+ * mutt_ssl_gnutls.c: Silence some harmless warnings. Also, -+ one day -pedantic is going to get held up on the causeway. - - * imap/command.c: More fiddling with fatal state handling. Not - tested, and probably as wrong as what was already there. - --2005-07-27 00:32:18 Brendan Cully (brendan) -- - * muttlib.c: Rework mutt_save_confirm to support confirmappend - with IMAP mailboxes. I hope I got all cases right. - -@@ -582,7 +895,8 @@ - on the selected mailbox, and have imap_open_mailbox_append use - imap_access instead of rolling its own. - --2005-07-26 18:45:01 TAKAHASHI Tamotsu (brendan) -+2005-07-26 18:45:01 TAKAHASHI Tamotsu -+(brendan) - - * crypt-gpgme.c, mutt_ssl_gnutls.c, po/POTFILES.in: Partial - application of Tamo's translation patch for gpgme and gnutls. -@@ -590,45 +904,45 @@ - 2005-07-26 16:44:20 Brendan Cully (brendan) - - * imap/imap.c: Don't check for the existence of a mailbox we're -- already in when appending. (closes #1842) -+ already in when appending. (closes #1842) - --2005-07-26 16:40:16 Thomas Glanzmann (roessler) -+2005-07-26 16:40:16 Thomas Glanzmann -+(roessler) - - * init.h: Return $menu_move_off default to status quo ante. - --2005-07-26 16:39:17 Thomas Glanzmann (roessler) -- - * init.h: hcache spelling fixes - --2005-07-26 16:37:28 Tamotsu Takahashi (roessler) -+2005-07-26 16:37:28 Tamotsu Takahashi -+(roessler) - - * enter.c: Introduce fall-back from complete-query to complete - for the edit menu, so 'bind editor complete-query' - becomes possible. - --2005-07-26 06:14:34 "Brent J. Nordquist" (brendan) -+2005-07-26 06:14:34 "Brent J. Nordquist" (brendan) - - * doc/manual.sgml.head: Correct a couple of typos (and change - ‐ to -: although the text version of the manual renders - ‐, the web version does not). - --2005-07-26 05:58:29 TAKAHASHI Tamotsu (brendan) -+2005-07-26 05:58:29 TAKAHASHI Tamotsu -+(brendan) - -- * pattern.c: Interpret an empty limit as a request to cancel the -- current limit. (Closes #1854) -+ * pattern.c: Interpret an empty limit as a request to cancel -+ the current limit. (Closes #1854) - - 2005-07-26 05:28:02 Brendan Cully (brendan) - - * mutt_ssl.c: Don't offer to save expired or not-yet-valid - certificates. Closes #1943 as a side-effect. - --2005-07-26 05:04:23 Brendan Cully (brendan) -+ * imap/imap.c, imap/imap_private.h: Rework IMAP CLOSE handling -+ to avoid expunging messages when exiting without saving -+ changes. (closes #1899) - -- * imap/imap.c, imap/imap_private.h: Rework IMAP CLOSE handling to -- avoid expunging messages when exiting without saving changes. -- (closes #1899) -- --2005-07-26 03:09:55 Ralf Wildenhues (brendan) -+2005-07-26 03:09:55 Ralf Wildenhues -+(brendan) - - * mbyte.c, mutt_socket.c: There are some functions without ANSI - prototypes left in mutt-owned sources. -@@ -638,30 +952,41 @@ - * init.h: Update _MAKEDOC macro so that the documentation includes - all variables. - --2005-07-25 15:48:36 Thomas Roessler (roessler) -+2005-07-25 15:48:36 Thomas Roessler -+(roessler) - - * copy.c, imap/imap.c, mh.c, mutt.h, muttlib.c, thread.c: Get rid - of IMAP-related special casing all over the thread editing code. - --2005-07-25 04:56:38 Brendan Cully (brendan) -+2005-07-25 04:56:38 brendan (brendan) - - * imap/message.c: Indentation, mostly - -- * imap/message.c: Minor cosmetic cleanup (fewer #ifdef HCACHE blocks) -+2005-07-25 04:37:20 Brendan Cully (brendan) -+ -+ * imap/message.c: Minor cosmetic cleanup (fewer #ifdef HCACHE -+ blocks) -+ -+2005-07-25 04:31:51 brendan (brendan) - - * muttlib.c: Suppress a printf format warning - -+2005-07-24 18:33:31 Brendan Cully (brendan) -+ - * muttlib.c: Typo in last commit. - - * imap/message.c, muttlib.c, protos.h: Merge full envelope from - message fetch into original sparse envelope, instead of replacing - it. This should be gentler on the various threading hashes and may -- (knock on wood) fix the threading segfault. Threading behaviour is -- observably better. -+ (knock on wood) fix the threading segfault. Threading behaviour -+ is observably better. -+ -+2005-07-24 18:18:29 brendan (brendan) - - * imap/util.c: Revert Glanzmann's imap_parse_mailbox patch. - --2005-07-24 16:53:59 Thomas Roessler (roessler) -+2005-07-24 16:53:59 Thomas Roessler -+(roessler) - - * thread.c: Try to fix threading bug triggered by duplicate - references. -@@ -669,10 +994,10 @@ - 2005-07-24 16:51:38 Cedric Duval (brendan) - - * OPS, copy.c, curs_main.c, doc/manual.sgml.head, functions.h, -- imap/imap.c, mh.c, mutt.h, mx.c, pager.c, protos.h, thread.c: Add -- thread editing commands. -+ imap/imap.c, mh.c, mutt.h, mx.c, pager.c, protos.h, thread.c: -+ Add thread editing commands. - --2005-07-24 16:12:12 Paul Walker (roessler) -+2005-07-24 16:12:12 Paul Walker (roessler) - - * doc/manual.sgml.head, main.c, protos.h, init.c: This patch - adds an option -D to dump mutt's configuration after all -@@ -680,7 +1005,8 @@ - (1) curses isn't initialized; (2) variables are dumped to stdout, - not to stderr. - --2005-07-24 15:46:26 Thomas Roessler (roessler) -+2005-07-24 15:46:26 Thomas Roessler -+(roessler) - - * hash.c, imap/message.c, imap/util.c: This patch includes (1) - a rewrite of hash_delete_hash, and (2) some changes to the IMAP -@@ -694,14 +1020,14 @@ - 2005-07-24 08:59:44 Brendan Cully (brendan) - - * copy.c: Don't assume messages in MMDF mailboxes have From -- separators when copying them. Spotted by William Lovas. Initial -+ separators when copying them. Spotted by William Lovas. Initial - patch by TAKAHASHI Tamotsu. - - 2005-07-23 23:35:17 Byrial Jensen (brendan) - - * curs_main.c, doc/manual.sgml.head, globals.h, main.c, muttlib.c: -- Byrial Jensen and Christoph Berg's current-mailbox shortcut (^). I -- like it, and so does Debian. -+ This is the current shortcut patch patch by Byrial Ole Jensen -+ , updated by Christoph Berg . - - 2005-07-17 00:43:05 Brendan Cully (brendan) - -@@ -712,7 +1038,8 @@ - - * po/fr.po: PO update 20050613. - --2005-07-06 23:49:08 Thomas Glanzmann (brendan) -+2005-07-06 23:49:08 Thomas Glanzmann -+(brendan) - - * BEWARE: this fixes a little typo. - -@@ -721,7 +1048,7 @@ - * hcache.c: Apply Aaron Crane's function pointer bandaid to the - db4 open calls. - --2004-06-28 19:26:54 Brendan Cully (brendan) -+2005-06-28 19:26:54 Brendan Cully (brendan) - - * account.c, account.h, globals.h, init.h, mutt_sasl.c: Add - $imap_login variable to specify which user to authenticate as -@@ -730,26 +1057,30 @@ - a way to do it that wouldn't annoy users where login == user - (the default value of $imap_login). - --2005-06-24 22:32:38 Sébastien Hinderer (brendan) -+2005-06-24 22:32:38 Sébastien Hinderer -+ (brendan) - - * crypt.c: Remove a warning about unused variable 'now' in - crypt_valid_passphrase - --2005-06-22 01:46:49 Sébastien Hinderer (brendan) -+2005-06-22 01:46:49 Sébastien Hinderer -+ (brendan) - - * doc/devel-notes.txt: This patch fixes two small typos in - dev notes. - - 2005-06-18 04:54:39 Brendan Cully (brendan) - -- * main.c: Update copyright dates according to latest activity in -- ChangeLog. -+ * main.c: Update copyright dates according to latest activity -+ in ChangeLog. - --2005-06-12 18:28:29 Tamotsu Takahashi (roessler) -+2005-06-12 18:28:29 Tamotsu Takahashi -+(roessler) - - * menu.c: Fix background colors for $arrow_cursor. - --2005-06-12 18:24:31 Thomas Roessler (roessler) -+2005-06-12 18:24:31 Thomas Roessler -+(roessler) - - * curs_main.c, init.h, menu.c, mutt.h: Add $braille_friendly. - Behavior originally suggested by Sébastien Hinderer -@@ -759,16 +1090,18 @@ - - * po/sv.po: update - --2005-04-03 00:14:51 Daniel Jacobowitz (brendan) -+2005-04-03 00:14:51 Daniel Jacobowitz (brendan) - - * imap/imap.c, imap/imap_private.h, imap/message.c: Synchronise - message flags before moving messages. - --2005-03-31 04:55:09 Thomas Glanzmann (brendan) -+2005-03-31 04:55:09 Thomas Glanzmann -+(brendan) - - * mh.c: Another hcache cygwin portability fix. - --2005-03-23 10:51:11 Thomas Glanzmann (roessler) -+2005-03-23 10:51:11 Thomas Glanzmann -+(roessler) - - * init.h, mh.c, mutt.h: Maildir header cache. - -@@ -789,7 +1122,7 @@ - - * po/de.po: update - --2005-03-22 19:46:59 Paul Walker (roessler) -+2005-03-22 19:46:59 Paul Walker (roessler) - - * init.c, init.h: remove some unused functions. - -@@ -797,15 +1130,17 @@ - - * po/ru.po: update - --2005-03-22 03:40:54 Thomas Glanzmann (brendan) -+2005-03-22 03:40:54 Thomas Glanzmann -+(brendan) - - * hcache.c, imap/imap.c, imap/imap_private.h, imap/message.c, -- protos.h: Thomas graces us with this patch that resolves a -+ protos.h: Thomas graces us with this patch that resolves a - type-size inconsistency in the UIDVALIDITY parser. - -- Edited for correctness. -+ Edited for correctness. - --2005-03-17 09:30:06 Pawel Dziekonski (roessler) -+2005-03-17 09:30:06 Pawel Dziekonski -+(roessler) - - * po/pl.po: update - -@@ -815,15 +1150,13 @@ - patch was incomplete. Note to self: avoid patching on short - sleep. Starting tomorrow. - --2005-03-16 02:49:33 Brendan Cully (brendan) -- - * configure.in, doc/Makefile.in, hcache.c, Makefile.am: Various - cygwin portability fixes - - 2005-03-15 04:40:40 Brendan Cully (brendan) - - * crypthash.h: Don't define uint32_t anywhere but in -- config.h. Spotted by Alain Bench. -+ config.h. Spotted by Alain Bench. - - 2005-03-13 16:35:35 roessler (roessler) - -@@ -838,7 +1171,8 @@ - - * po/da.po: update - --2005-03-05 18:15:20 Christoph Ludwig (roessler) -+2005-03-05 18:15:20 Christoph Ludwig -+ (roessler) - - * crypt.c: The attached patch fixes a segfault I observed - today: mutt failed to check for a possible null pointer in -@@ -850,14 +1184,15 @@ - mutt_ssl.c, mutt_ssl_gnutls.c, mutt_ssl_nss.c, mutt_tunnel.c: - Rename open/close/read/write function pointers to avoid problems - with systems where standard open/close/read/write functions are -- implemented with macros. Thanks to Aaron Crane and others for -+ implemented with macros. Thanks to Aaron Crane and others for - their input about the problem. - - 2005-03-01 15:53:25 Vsevolod Volkov (roessler) - - * po/ru.po: update - --2005-03-01 15:52:33 Thomas Glanzmann (roessler) -+2005-03-01 15:52:33 Thomas Glanzmann -+(roessler) - - * init.h: This is a spelling fix supplied by Cameron Simpson. - -@@ -885,29 +1220,31 @@ - * imap/message.c: Turn brain back on before committing patches - (that modification I made to APPEND was bogus). - --2005-02-27 02:44:45 Dan Hopper (brendan) -+2005-02-27 02:44:45 Dan Hopper (brendan) - -- * imap/message.c: Don't lose N flag when uploading a message to an -- IMAP mailbox. (Slightly modified from the original patch to -+ * imap/message.c: Don't lose N flag when uploading a message to -+ an IMAP mailbox. (Slightly modified from the original patch to - prevent spurious space characters). - - 2005-02-21 04:42:34 Alain Bench (roessler) - - * parse.c, pgp.c, sendlib.c: Bcc should be RFC2047-encoded, too. - --2005-02-19 16:00:24 Thomas Roessler (roessler) -+2005-02-19 16:00:24 Thomas Roessler -+(roessler) - - * sendlib.c: Fix Debian 295528. - - 2005-02-17 03:33:00 Brendan Cully (brendan) - - * OPS, browser.c, doc/manual.sgml.head, functions.h, -- imap/browse.c, imap/imap.c, imap/imap.h, imap/imap_private.h: New -- function: rename-mailbox (bound to 'r' by default). -+ imap/browse.c, imap/imap.c, imap/imap.h, imap/imap_private.h: -+ New function: rename-mailbox (bound to 'r' by default). - -- The lack of a rename-mailbox command for IMAP finally got too annoying. -- It's a bit of a cut-and-paste job, but I've put my dreams of cleaning -- up the IMAP codebase on hold. Gotta grow up some time. -+ The lack of a rename-mailbox command for IMAP finally got too -+ annoying. It's a bit of a cut-and-paste job, but I've put my -+ dreams of cleaning up the IMAP codebase on hold. Gotta grow up -+ some time. - - 2005-02-16 09:34:06 ta_panta_rei <7vvtch802@sneakemail.com> (roessler) - -@@ -917,13 +1254,15 @@ - - * po/id.po: update - --2005-02-15 19:28:24 Thomas Roessler (roessler) -+2005-02-15 19:28:24 Thomas Roessler -+(roessler) - - * doc/Makefile.in: Fix linuxdoc invocation. Thanks to - Tamotsu Takahashi for tracking this down to an idiotic - non-backwards-compatible change to the way groff works. - --2005-02-15 19:03:51 Ivan Vilata i Balaguer (roessler) -+2005-02-15 19:03:51 Ivan Vilata i Balaguer -+(roessler) - - * po/ca.po: update - -@@ -935,28 +1274,29 @@ - - * po/de.po: update - --2005-02-13 09:53:07 Thomas Roessler (roessler) -+2005-02-13 09:53:07 Thomas Roessler -+(roessler) - - * Makefile.am: Include crypt-gpgme.h with the distribution. - - 2005-02-13 00:25:37 Brendan Cully (brendan) -- -- * configure.in, m4/gettext.m4, m4/iconv.m4: Use AC_HELP_STRING to -- pretty print configure --help screen, with mixed results. -- -+ -+ * configure.in, m4/gettext.m4, m4/iconv.m4: Use AC_HELP_STRING -+ to pretty print configure --help screen, with mixed results. -+ - 2005-02-12 21:04:22 Brendan Cully (brendan) -- -+ - * Makefile.am, imap/Makefile.am: Require at least automake 1.6 -- --2005-02-12 20:56:36 Thomas Roessler (roessler) -- -+ -+2005-02-12 20:56:36 roessler (roessler) -+ - * po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, - po/zh_CN.po, po/pt_BR.po, po/ru.po, po/lt.po, po/nl.po, po/pl.po, - po/et.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, - po/ja.po, po/ko.po, po/da.po, po/de.po, po/el.po, po/eo.po, - po/es.po, Makefile.am, VERSION, po/bg.po, po/ca.po, po/cs.po, - reldate.h: automatic post-release commit for mutt-1.5.8 -- -+ - 2005-02-12 20:46:48 Vincent Lefevre (roessler) - - * po/fr.po: update -@@ -965,7 +1305,8 @@ - - * po/ru.po: update - --2005-02-12 20:20:42 Thomas Roessler (roessler) -+2005-02-12 20:20:42 Thomas Roessler -+(roessler) - - * configure.in: Give people more time to profile the inode - sorting code; disabled by default for now. -@@ -975,82 +1316,21 @@ - but where mutt will just try to avoid moving off the bottom. - Complain to mutt-dev if you want this to be optional. - --2005-02-12 19:54:51 TAKAHASHI Tamotsu (brendan) -+2005-02-12 19:54:51 TAKAHASHI Tamotsu -+(brendan) - - * imap/message.c, imap/util.c: Fix debian bug #275060 (editing - on an imap server loses its flags). Remove trailing delimiter - from IMAP folder names. - --2005-02-12 19:52:28 Thomas Roessler (roessler) -- -- * charset.c, mbyte.c: Recognize euc-jp-ms. MORIYAMA Masayuki by -- way of TAKAHASHI Tamotsu. -- --2005-02-12 19:38:14 TAKAHASHI Tamotsu (roessler) -- -- * init.h, main.c: Trivial documentation fixes (TAKAHASHI Tamotsu, -- Brendan Cully, Paul Walker, Derek Martin). -- -- * editmsg.c: Partially fix debian bug #275060 (editing a message -- in a mbox loses its flags). -- -- * TODO: We have $include_onlyfirst. -- --2005-02-12 19:28:26 TAKIZAWA Takashi (roessler) -- -- * muttlib.c, pager.c: column-length and byte-length are different -- --2005-02-12 19:19:25 Derek Martin (roessler) -- -- * mutt.h, commands.c, curs_main.c, init.h: pgp-auto-decode: When -- $pgp_auto_decode is set, then mutt will check for traditional pgp -- on certain operations. This is similar (but NOT identical) to the -- behavior known from PGP/MIME messages. -- --2005-02-12 19:12:40 TAKAHASHI Tamotsu (roessler) -- -- * alias.c, globals.h, hdrline.c, init.c, init.h: unalternates now -- also adds to a list of exceptions; same behavior for unlists, and -- unsubscribe. With some changes from tlr. -- --2005-02-12 19:52:28 Thomas Roessler (roessler) -- -- * charset.c, mbyte.c: Recognize euc-jp-ms. MORIYAMA Masayuki by -- way of TAKAHASHI Tamotsu. -- --2005-02-12 19:38:14 TAKAHASHI Tamotsu (roessler) -- -- * init.h, main.c: Trivial documentation fixes (TAKAHASHI Tamotsu, Brendan Cully, Paul -- Walker, Derek Martin). -- -- * editmsg.c: Partially fix debian bug #275060 (editing a message -- in a mbox loses its flags). -- -- * TODO: We have $include_onlyfirst. -- --2005-02-12 19:28:26 TAKIZAWA Takashi (roessler) -- -- * muttlib.c, pager.c: column-length and byte-length are different -- --2005-02-12 19:19:25 Derek Martin (roessler) -- -- * mutt.h, commands.c, curs_main.c, init.h: pgp-auto-decode: When -- $pgp_auto_decode is set, then mutt will check for traditional pgp -- on certain operations. This is similar (but NOT identical) to the -- behavior known from PGP/MIME messages. -- --2005-02-12 19:12:40 TAKAHASHI Tamotsu (roessler) -- -- * alias.c, globals.h, hdrline.c, init.c, init.h: unalternates now -- also adds to a list of exceptions; same behavior -- for unlists, and unsubscribe. With some changes from tlr. -- --2005-02-12 19:52:28 Thomas Roessler (roessler) -+2005-02-12 19:52:28 Thomas Roessler -+(roessler) - - * charset.c, mbyte.c: Recognize euc-jp-ms. MORIYAMA Masayuki - by way of TAKAHASHI Tamotsu. - --2005-02-12 19:38:14 TAKAHASHI Tamotsu (roessler) -+2005-02-12 19:38:14 TAKAHASHI Tamotsu -+(roessler) - - * doc/manual.sgml.head, doc/manual.sgml.tail, init.h, main.c: - Trivial documentation fixes (TAKAHASHI Tamotsu, Brendan Cully, -@@ -1061,7 +1341,7 @@ - - * TODO: We have $include_onlyfirst. - --2005-02-12 19:28:26 TAKIZAWA Takashi (roessler) -+2005-02-12 19:28:26 TAKIZAWA Takashi (roessler) - - * muttlib.c, pager.c: column-length and byte-length are different - -@@ -1072,7 +1352,8 @@ - pgp on certain operations. This is similar (but NOT identical) - to the behavior known from PGP/MIME messages. - --2005-02-12 19:12:40 TAKAHASHI Tamotsu (roessler) -+2005-02-12 19:12:40 TAKAHASHI Tamotsu -+(roessler) - - * alias.c, doc/manual.sgml.head, globals.h, hdrline.c, init.c, - init.h: unalternates now also adds to a list of exceptions; -@@ -1080,105 +1361,109 @@ - from tlr. - - 2005-02-11 04:12:03 Brendan Cully (brendan) -- -- * configure.in, mutt_ssl_gnutls.c: autoconf support for gnutls -- using a slightly modified version of gnutls' own libgnutls.m4 -- --2005-02-11 01:19:15 Brendan Cully (brendan) -- -+ -+ * configure.in, m4/libgnutls.m4, mutt_ssl_gnutls.c: autoconf -+ support for gnutls using a slightly modified version of gnutls' -+ own libgnutls.m4 -+ - * globals.h, init.h: Only enable ssl_client_cert for openssl - (spotted by Adeodato). -- --2005-02-09 09:05:38 Thomas Roessler (roessler) -+ -+2005-02-09 09:05:38 Thomas Roessler -+(roessler) - - * pattern.c: Don't crash in mutt_pattern_exec when h->env is NULL. - --2005-02-08 17:23:50 TAKAHASHI Tamotsu (roessler) -+2005-02-08 17:23:50 TAKAHASHI Tamotsu -+(roessler) - - * init.h, mutt.h, mutt_idna.c: Make IDN decoding optional. - --2005-02-05 14:11:36 Thomas Roessler (roessler) -+2005-02-05 14:11:36 Thomas Roessler -+(roessler) - - * crypthash.h, imap/util.c, lib.h, mbyte.h, mutt_idna.h, - patchlist.sh, remailer.h, rfc822.h: Remove a number of unnecessary - config.h includes, and add some missing ones. May fix some bugs. - - 2005-02-04 16:54:13 Brendan Cully (brendan) -- -+ - * Makefile.am: Add smime_keys to EXTRA_SCRIPTS (for make dist). -- --2005-02-04 12:56:28 Tamotsu Takahashi (roessler) -- -- * Makefile.am: http://bugs.guug.de/db/17/1769.html -- This is necessary for FreeBSD. -- --2005-02-04 12:56:28 Tamotsu Takahashi (roessler) -+ -+2005-02-04 12:56:28 Tamotsu Takahashi -+(roessler) - - * Makefile.am: http://bugs.guug.de/db/17/1769.html This is - necessary for FreeBSD. - --2005-02-03 19:46:53 Thomas Glanzmann (roessler) -+2005-02-03 19:46:53 Thomas Glanzmann -+(roessler) - - * hcache.c: this is a fix for hcache.c infrastructure which is - about wrongly calculate unique id - --2005-02-03 18:44:27 Thomas Roessler (roessler) -+2005-02-03 18:44:27 Thomas Roessler -+(roessler) - - * pgp.c: Fix PGP clear signature handling. - - 2005-02-03 17:01:44 Brendan Cully (brendan) -- -- * pgpkey.c, pgplib.c, pgpmicalg.c, pgppacket.c, pgppubring.c, -- pop.c, pop_auth.c, pop_lib.c, postpone.c, query.c, recvattach.c, -- recvcmd.c, regex.c, remailer.c, resize.c, rfc1524.c, rfc2047.c, -- rfc2231.c, rfc822.c, score.c, send.c, sendlib.c, sha1.c, signal.c, -- smime.c, snprintf.c, sort.c, status.c, system.c, thread.c, url.c, -- utf8.c, wcwidth.c, crypt-mod-pgp-classic.c, crypt-mod-pgp-gpgme.c, -+ -+ * imap/auth.c, imap/auth_anon.c, imap/auth_cram.c, -+ imap/auth_gss.c, imap/auth_login.c, imap/auth_sasl.c, -+ imap/browse.c, imap/command.c, imap/imap.c, imap/message.c, -+ imap/utf7.c, pgpkey.c, pgplib.c, pgpmicalg.c, pgppacket.c, -+ pgppubring.c, pop.c, pop_auth.c, pop_lib.c, postpone.c, -+ query.c, recvattach.c, recvcmd.c, regex.c, remailer.c, -+ resize.c, rfc1524.c, rfc2047.c, rfc2231.c, rfc822.c, score.c, -+ send.c, sendlib.c, sha1.c, signal.c, smime.c, snprintf.c, -+ sort.c, status.c, system.c, thread.c, url.c, utf8.c, -+ wcwidth.c, crypt-mod-pgp-classic.c, crypt-mod-pgp-gpgme.c, - crypt-mod-smime-classic.c, crypt-mod-smime-gpgme.c, crypt-mod.c, -- crypt.c, cryptglue.c, curs_lib.c, curs_main.c, date.c, dotlock.c, -- edit.c, editmsg.c, enter.c, extlib.c, filter.c, flags.c, from.c, -- getdomain.c, gnupgparse.c, handler.c, hash.c, hdrline.c, -- headers.c, help.c, history.c, hook.c, init.c, keymap.c, lib.c, -- main.c, makedoc.c, mbox.c, mbyte.c, md5c.c, menu.c, mh.c, mutt.h, -- mutt_idna.c, mutt_sasl.c, mutt_socket.c, mutt_ssl.c, -- mutt_ssl_gnutls.c, mutt_ssl_nss.c, mutt_tunnel.c, muttlib.c, mx.c, -- pager.c, parse.c, pattern.c, pgp.c, pgpinvoke.c, account.c, -+ crypt.c, cryptglue.c, curs_lib.c, curs_main.c, date.c, -+ dotlock.c, edit.c, editmsg.c, enter.c, extlib.c, filter.c, -+ flags.c, from.c, getdomain.c, gnupgparse.c, handler.c, hash.c, -+ hdrline.c, headers.c, help.c, history.c, hook.c, init.c, keymap.c, -+ lib.c, main.c, makedoc.c, mbox.c, mbyte.c, md5c.c, menu.c, mh.c, -+ mutt.h, mutt_idna.c, mutt_sasl.c, mutt_socket.c, mutt_ssl.c, -+ mutt_ssl_gnutls.c, mutt_ssl_nss.c, mutt_tunnel.c, muttlib.c, -+ mx.c, pager.c, parse.c, pattern.c, pgp.c, pgpinvoke.c, account.c, - addrbook.c, alias.c, ascii.c, attach.c, base64.c, browser.c, - buffy.c, charset.c, color.c, commands.c, complete.c, compose.c, - copy.c, crypt-gpgme.c: Add config.h to the top of every C file - that could possibly want it. Remove it from mutt.h -- -+ - 2005-02-01 03:36:39 Brendan Cully (brendan) -- -- * protos.h: Pull config.h out of protos.h, add to top of every -- IMAP C file. This should probably be done to every C file, but the -- results need testing in case some files depend on the current -- (broken) includes. This should at least fix the off_t 4/8 bytes -- bug I introduced yesterday. -- --2005-01-31 02:40:14 Brendan Cully (brendan) -- -- * acconfig.h, configure.in, hcache.c, protos.h: Begin removing -- deprecated autoconf 2.13 backward compatibility code. Add -- AC_CHECK_TYPES macros for uin32/64 types, use uint64_t instead of -- long long in hcache code. -- --2005-01-29 19:15:07 Thomas Glanzmann (roessler) -- -- * hcache.c: - make hcache.c conform to mutt codingstyle -- - use Id CVS keyword instead of %K% BitKeeper keyword -- --2005-01-29 19:15:07 Thomas Glanzmann (roessler) -- -- * hcache.c: - make hcache.c conform to mutt codingstyle - use -- Id CVS keyword instead of %K% BitKeeper keyword - --2005-01-28 16:40:33 Thomas Roessler (roessler) -+ * imap/auth.c, imap/auth_anon.c, imap/auth_cram.c, -+ imap/auth_gss.c, imap/auth_login.c, imap/auth_sasl.c, -+ imap/browse.c, imap/command.c, imap/imap.c, imap/message.c, -+ imap/utf7.c, protos.h: Pull config.h out of protos.h, add to -+ top of every IMAP C file. This should probably be done to every -+ C file, but the results need testing in case some files depend -+ on the current (broken) includes. -+ -+2005-01-31 02:40:14 brendan (brendan) -+ -+ * acconfig.h, configure.in, hcache.c, imap/imap_private.h, -+ imap/message.c, m4/types.m4, protos.h: Begin removing deprecated -+ autoconf 2.13 backward compatibility code. Add AC_CHECK_TYPES -+ macros for uin32/64 types, use uint64_t instead of long long in -+ hcache code. -+ -+2005-01-29 19:15:07 Thomas Glanzmann -+(roessler) -+ -+ * hcache.c: - make hcache.c conform to mutt codingstyle - use $Id$ -+ CVS keyword instead of %K% BitKeeper keyword -+ -+2005-01-28 16:40:33 Thomas Roessler -+(roessler) - -- * pgp.c: Adeodato points out on IRC that feof() only works -- after a read. So, we now check for an unsuccessful fgetc(). -+ * pgp.c: Adeotato points out that feof() only works after a read. -+ So, we now check for an unsuccessful fgetc(). - --2005-01-28 14:50:31 Paul Walker (roessler) -+2005-01-28 14:50:31 Paul Walker (roessler) - - * signal.c: Trigger window resizing code when waking up from - suspension. -@@ -1209,11 +1494,13 @@ - po/bg.po, po/ca.po, po/cs.po, po/da.po, po/de.po, reldate.h: - automatic post-release commit for mutt-1.5.7 - --2005-01-27 20:52:13 Thomas Roessler (roessler) -+2005-01-27 20:52:13 Thomas Roessler -+(roessler) - - * main.c: Add USE_INODESORT to main.c's option dump. - --2005-01-27 20:38:02 TAKAHASHI Tamotsu (roessler) -+2005-01-27 20:38:02 TAKAHASHI Tamotsu -+(roessler) - - * commands.c: 0. In compose mode, press Ctrl-t to change - Content-Type. 1. Type "application/octet-stream" for example. -@@ -1222,12 +1509,14 @@ - 5. Press y or n. 6. You will see a strange message: - "Content-Type changed to Convert to us-ascii upon sending?." - --2005-01-27 20:26:52 Thomas Roessler (roessler) -+2005-01-27 20:26:52 Thomas Roessler -+(roessler) - - * pgp.c: Return an error in pgp_decrypt_part when the PGP output - file is empty. - --2005-01-27 20:17:46 Thomas Glanzmann (roessler) -+2005-01-27 20:17:46 Thomas Glanzmann -+(roessler) - - * curs_main.c: this patch doesn't raise an error if you try - to sync an empty mailbox which makes it possible to use such a -@@ -1241,19 +1530,22 @@ - * pgp.c: Detect end of PGP armor header when a line is - whitespace-only. - --2005-01-27 19:18:15 Thomas Roessler (roessler) -+2005-01-27 19:18:15 Thomas Roessler -+(roessler) - - * smime.c: Void the S/MIME passphrase before prompting - the user to re-enter it. Noted by TAKAHASHI Tamotsu - , but with memset replaced by - smime_void_passphrase(). - --2005-01-27 19:00:59 TAKAHASHI Tamotsu (roessler) -+2005-01-27 19:00:59 TAKAHASHI Tamotsu -+(roessler) - - * curs_lib.c: Add terminal newline when it lacks after editing - a message. Originally from TAKIZAWA Takashi. - --2005-01-27 18:58:14 Thomas Roessler (roessler) -+2005-01-27 18:58:14 Thomas Roessler -+(roessler) - - * Makefile.am: Include mutt_ssl_gnutls.c with the distribution. - -@@ -1279,7 +1571,7 @@ - * mh.c, configure.in: Read files in maildir folders in inode - order; this seems to reduce seek overhead on Linux. Enabled by - default; to disable, run configure with --disable-inodesort. -- (By way of Marco d'Itri.) -+ (By way of Mario d'Itri.) - - 2005-01-27 18:28:42 Marco d'Itri (roessler) - -@@ -1300,7 +1592,8 @@ - * contrib/gpg.rc: A gpg command line contains both --verbose - and --no-verbose, remove the first. - --2005-01-26 14:33:08 Thomas Roessler (roessler) -+2005-01-26 14:33:08 Thomas Roessler -+(roessler) - - * status.c: And, thinking about it further, this should just be - an empty string, not "(null)". -@@ -1308,84 +1601,73 @@ - * status.c: The last Context->pattern fix was still crap. - Ooooops. (Thanks Ralf.) - --2005-01-26 13:36:44 Thomas Glanzmann (roessler) -+2005-01-26 13:36:44 Thomas Glanzmann -+(roessler) - - * Makefile.am, configure.in, globals.h, hcache.c, imap/imap.c, - imap/imap_private.h, imap/message.c, init.h, main.c, protos.h: - IMAP header cache. - --2005-01-26 12:37:38 Ralf Wildenhues (roessler) -+2005-01-26 12:37:38 Ralf Wildenhues -+(roessler) - - * addrbook.c, browser.c, commands.c, compose.c, imap/utf7.c: - Make some functions static. - --2005-01-26 12:36:36 Ralf Wildenhues (roessler) -- - * imap/command.c, imap/message.c: Fix some printf arguments. - --2005-01-26 12:21:46 Thomas Roessler (roessler) -+2005-01-26 12:21:46 Thomas Roessler -+(roessler) - -- * status.c: Really fix it. Thanks to Ralf for noting the -- typo in my earlier commit. -- -- * status.c: A variant of -+ * status.c: * status.c: A variant of - . - Spotted by Ralf Wildenhues . - - 2005-01-17 02:24:49 Brendan Cully (brendan) - -- * cvslog2changelog.pl: cvs log emits a timezone after the -- hour, at least here. Adjust date regexp to handle that case. -- --2005-01-15 09:52:44 Adeodato Simó (brendan) -+ * cvslog2changelog.pl: cvs log emits a timezone after the hour, -+ at least here. Adjust date regexp to handle that case. -+ -+2005-01-15 17:45:01 Adeodato Simó (brendan) - - * po/cs.po: Major translation updates forgotten in mutt-po. -+ (I missed cs in the last commit). - - 2005-01-15 08:01:35 Brendan Cully (brendan) - -- * Makefile.am: Update commit targets to work when -- builddir != srcdir. -- --2005-01-15 07:36:37 Adeodato Simó (brendan) -- -- * init.h: Document the interaction between $reverse_name and -- the alternates. Debian #210679. -+ * Makefile.am: Update commit targets to work when builddir != -+ srcdir. - -- * doc/manual.sgml.head, doc/muttrc.man.head: Include reply-hook -- in the reference section of the manual. -- Debian 254294. -+2005-01-15 07:43:30 Adeodato Simó (brendan) - -- * doc/mutt.man: Small typo in the mutt.1 manpage: Qeury -> Query. -- Debian #258621. -+ * po/sv.po, po/ca.po, po/de.po, po/it.po: i18n updates. - -- * doc/muttrc.man.head: Minor formatting issue in the muttrc.5 -- manpage. -- Debian #272579. -+ * doc/manual.sgml.head, doc/mutt.man, doc/muttrc.man.head, -+ init.h: Sundry documentation nits fixed. Debian #210679, #254294, -+ #258621, #272579 - -- * po/ca.po, po/sv.po: Minor corrections in these translations, -- checked with their authors. -- -- * po/de.po, po/it.po: Major translation updates forgotten in -- mutt-po. -- --2005-01-11 12:15:13 Thomas Roessler (roessler) -+2005-01-11 12:15:13 Thomas Roessler -+(roessler) - - * doc/manual.sgml.head, doc/muttrc.man.head: Document send2-hook. - - * send.c: send2-hook should also be executed after the first - time the message is edited by the user. - --2005-01-09 15:35:51 Thomas Roessler (roessler) -+2005-01-09 15:35:51 Thomas Roessler -+(roessler) - - * doc/muttbug.man, muttbug.sh.in: Replace muttbug and its - documentation by a note that acknowledges the shut down of the - bug tracking system. - --2004-12-21 09:46:24 Thomas Roessler (roessler) -+2004-12-21 09:46:24 Thomas Roessler -+(roessler) - - * pgp.c: Fix Debian #275188. - --2004-12-07 19:50:04 Thomas Roessler (roessler) -+2004-12-07 19:50:04 Thomas Roessler -+(roessler) - - * compose.c, hook.c, init.c, init.h, mutt.h, send.c: Add - send2-hook and fix alternates handling. -@@ -1395,7 +1677,8 @@ - * doc/manual.sgml.tail, doc/manual.sgml.head: Document - tag-prefix-cond. - --2004-11-08 08:43:17 Ralf Wildenhues (roessler) -+2004-11-08 08:43:17 Ralf Wildenhues -+(roessler) - - * imap/imap_private.h: Having a signed one-bit bitfield is quite - odd -- its value is either 0 or -1. Although the current code -@@ -1405,11 +1688,13 @@ - * imap/message.c: There's a size_t in imap_append_message not - printed out portably. - --2004-11-02 13:30:58 Thomas Roessler (roessler) -+2004-11-02 13:30:58 Thomas Roessler -+(roessler) - - * copy.h: Fix flag confusion. Noted by Vincent Lefevre. - --2004-10-30 21:59:00 Thomas Roessler (roessler) -+2004-10-30 21:59:00 Thomas Roessler -+(roessler) - - * browser.c, buffy.c, check_sec.sh, commands.c, edit.c, - imap/auth_cram.c, imap/auth_gss.c, imap/imap.c, imap/message.c, -@@ -1420,16 +1705,18 @@ - * smime.c: Fix bad code in smime_get_field_from_db. Problem noted - by Ulf Härnhammar . - --2004-09-29 11:27:33 Thomas Roessler (roessler) -+2004-09-29 11:27:33 Thomas Roessler -+(roessler) - - * lib.c: Fix mutt_unlink race condition for systems without - O_NOFOLLOW. Noted by Jarno Huuskonen . - --2004-09-07 08:09:39 Matthias Andree (roessler) -+2004-09-07 08:09:39 Matthias Andree (roessler) - - * prepare: Fix parameter passing. - --2004-08-31 15:41:03 Thomas Roessler (roessler) -+2004-08-31 15:41:03 Thomas Roessler -+(roessler) - - * configure.in: Add AC_GNU_SOURCE. - -@@ -1437,15 +1724,11 @@ - before building the attachment tree. A generic solution would - remove intransparent encodings all the way down the tree. - --2004-08-30 20:10:10 Moritz Schulte (roessler) -+2004-08-30 20:10:10 Brendan Cully (roessler) - - * compose.c: Only print additional information related to PGP - in case the current message is indeed to be encrypted/signed - with PGP. -- -- (This change is misattributed to Brendan Cully in the CVS.) -- --2004-08-30 20:05:40 Brendan Cully (roessler) - - * globals.h, init.h, mutt_sasl.c, mutt_ssl.c: Here's a patch - to allow mutt to use SSL client certificates to authenticate -@@ -1454,18 +1737,21 @@ - key). It works with the SASL EXTERNAL authentication mechanism, - so you'll need to have SASL enabled as well. - --2004-08-30 20:03:35 Thomas Glanzmann (roessler) -+2004-08-30 20:03:35 Thomas Glanzmann -+(roessler) - - * init.c: Fix a memory leak in the generic spam detection code. - - * muttlib.c, protos.h: This wipes duplicated code, which I - introduced a while ago. - --2004-08-30 19:47:47 TAKAHASHI Tamotsu (roessler) -+2004-08-30 19:47:47 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update - --2004-08-21 07:35:16 Ivan Vilata i Balaguer (roessler) -+2004-08-21 07:35:16 Ivan Vilata i Balaguer -+(roessler) - - * po/ca.po: update - -@@ -1473,11 +1759,10 @@ - - * po/nl.po: update - --2004-08-17 15:56:23 Thomas Roessler (roessler) -- -- * configure.in: Check for ssize_t, really. -+2004-08-17 15:56:23 Thomas Roessler -+(roessler) - -- * configure.in: Check for ssize_t. -+ * configure.in, configure.in: Check for ssize_t. - - 2004-08-17 15:25:31 Ronny Haryanto (roessler) - -@@ -1522,7 +1807,8 @@ - - * po/pl.po: update - --2004-08-11 12:31:21 Thomas Glanzmann (roessler) -+2004-08-11 12:31:21 Thomas Glanzmann -+(roessler) - - * imap/imap.c: Fix two IMAP memory leaks. - -@@ -1530,11 +1816,13 @@ - - * menu.c: Fix a memory leak in mutt_menuDestroy. - --2004-08-08 16:20:37 Thomas Glanzmann (roessler) -+2004-08-08 16:21:16 Thomas Glanzmann -+(roessler) - -- * muttlib.c, protos.h: Fix a memory leak. -+ * ChangeLog, muttlib.c, protos.h: Fix a memory leak. - --2004-08-08 16:19:15 Thomas Roessler (roessler) -+2004-08-08 16:19:15 Thomas Roessler -+(roessler) - - * pgp.c, smime.c: Fix the PGP and S/MIME menus. Complaints - and suggestions of many lead to these changes. See mutt-dev -@@ -1547,7 +1835,7 @@ - - * po/sv.po: update - --2004-08-02 08:03:46 Nathan Dushman (roessler) -+2004-08-02 08:03:46 Nathan Dushman (roessler) - - * imap/command.c: Fix the improvement to address #1655. - -@@ -1555,7 +1843,7 @@ - - * imap/message.c: Quick fix for IMAP breakage. - --2004-07-21 22:15:40 Nathan Dushman (roessler) -+2004-07-21 22:15:40 Nathan Dushman (roessler) - - * imap/command.c: This is a one-line patch that increases the - speed at which mutt opens IMAP mailboxes, and addresses bug #1655. -@@ -1564,12 +1852,14 @@ - - * po/pl.po: update - --2004-07-20 08:17:21 Thomas Roessler (roessler) -+2004-07-20 08:17:21 Thomas Roessler -+(roessler) - - * imap/message.c, mutt.h, parse.c, send.c, url.c: Use List-Post - headers when doing list-reply. - --2004-07-19 21:44:23 TAKAHASHI Tamotsu (roessler) -+2004-07-19 21:44:23 TAKAHASHI Tamotsu -+(roessler) - - * globals.h, imap/message.c, init.h: Fix #1548. (The first - variant, with $imap_headers specifying headers that are downloaded -@@ -1583,7 +1873,8 @@ - - * doc/manual.sgml.head: Fixing a missing newline. - --2004-07-19 21:36:46 Thomas Glanzmann (roessler) -+2004-07-19 21:36:46 Thomas Glanzmann -+(roessler) - - * Makefile.am: Fix IMAP breakage. - -@@ -1596,15 +1887,18 @@ - - * pgp.c: Do not forget to handle special-case for gpg-agent. - --2004-07-14 05:55:40 Thomas Roessler (roessler) -+2004-07-14 05:55:40 Thomas Roessler -+(roessler) - - * ChangeLog: Fix an earlier commit message. - --2004-07-14 05:45:18 TAKAHASHI Tamotsu (roessler) -+2004-07-14 05:45:18 TAKAHASHI Tamotsu -+(roessler) - - * browser.c: Fix Debian#237426. (Experimental.) - --2004-07-14 05:39:23 Thomas Roessler (roessler) -+2004-07-14 05:39:23 Thomas Roessler -+(roessler) - - * compose.c: Don't invoke "builtin" as an external editor. Note: - It's not clear to me that this is really the right approach. -@@ -1618,24 +1912,27 @@ - makes this optional, introducing the hide_thread_subject boolean - setting which defaults to the old behaviour. - --2004-07-14 05:07:18 Thomas Roessler (roessler) -+2004-07-14 05:07:18 Thomas Roessler -+(roessler) - - * mh.c: Some eye-candy during the delayed parsing of maildir - folders. - --2004-07-14 04:50:19 TAKAHASHI Tamotsu (roessler) -+2004-07-14 04:50:19 TAKAHASHI Tamotsu -+(roessler) - - * init.h, sort.h: Hack to fix $sort_browser documentation. - - * copy.c, copy.h, handler.c, init.h, mutt.h, send.c: - $include_onlyfirst, again. - --2004-07-14 04:34:07 Thomas Roessler (roessler) -+2004-07-14 04:34:07 Thomas Roessler -+(roessler) - - * copy.c, copy.h, handler.c, init.h, mutt.h, send.c: Fix a cvs - commit SNAFU: This commit undoes the include_onlyfirst patch, - but leaves the generic spam detection by David Champion in place -- (which, erroneously, hadn't been committed separately). -+ (which, erroneously, hadn't been committed automatically). - - 2004-07-14 04:16:58 ttakah@lapis.plala.or.jp (roessler) - -@@ -1644,36 +1941,40 @@ - init.h, mutt.h, muttlib.c, parse.c, pattern.c, protos.h, send.c, - sort.c, sort.h: Introduce $include_onlyfirst. - --2004-07-12 13:35:27 Thomas Roessler (roessler) -+2004-07-12 13:35:27 Thomas Roessler -+(roessler) - - * pager.c: The limitations for OP_MAIL and OP_RECALL should - be identical. - --2004-07-12 13:22:24 Thomas Roessler (roessler) -- - * init.c, sendlib.c: Add some debugging code, and rewrite the - previously-ununderstandable mutt_remove_duplicates. (All this - done on the search for a problem that ultimately turned out to - be a configuration issue. Still, the changed code could come in - handy some day.) - --2004-07-11 16:25:00 TAKAHASHI Tamotsu (roessler) -+2004-07-11 16:25:00 TAKAHASHI Tamotsu -+(roessler) - - * pager.c: Fix #1882. - --2004-06-27 13:54:51 Thomas Roessler (roessler) -+2004-06-27 13:54:51 Thomas Roessler -+(roessler) - - * postpone.c: Experimental code for #1910. - --2004-06-26 08:45:29 Thomas Roessler (roessler) -+2004-06-26 08:45:29 Thomas Roessler -+(roessler) - - * commands.c: Fix #1909. - --2004-06-23 08:09:43 Thomas Roessler (roessler) -+2004-06-23 08:09:43 Thomas Roessler -+(roessler) - - * pgp.c: Zero out the PGP passphrase before asking for a new one. - --2004-06-17 20:39:20 Thomas Roessler (roessler) -+2004-06-17 20:39:20 Thomas Roessler -+(roessler) - - * smime.c: Change S/MIME send menu behavior to xor instead of or, - so it behaves the same way as the PGP send menu. -@@ -1744,13 +2045,15 @@ - change the default; change the error message given if that - variable is set to "no." - --2004-04-12 21:43:33 Thomas Roessler (roessler) -+2004-04-12 21:43:33 Thomas Roessler -+(roessler) - - * lib.c, attach.c: Don't open a file for writing that we have - unlinked before. Reported embarassingly long ago by Jarno - Huuskonen . - --2004-04-12 21:19:31 Dale Woolridge (roessler) -+2004-04-12 21:19:31 Dale Woolridge -+(roessler) - - * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/ru.po, - po/sk.po, po/sv.po, po/tr.po, po/gl.po, po/hu.po, po/id.po, -@@ -1760,9 +2063,10 @@ - mutt_crypt.h, po/ca.po, postpone.c, send.c, sendlib.c: See: - http://does-not-exist.org/mail-archives/mutt-dev/msg00843.html - --2004-04-12 20:37:19 Thomas Roessler (roessler) -+2004-04-12 20:37:19 Thomas Roessler -+(roessler) - -- * copy.c: Fix #1804. (From vincent@vinc17.org) -+ * copy.c: Fix #1804. - - * commands.c, curs_main.c, mutt.h, mutt_crypt.h, pager.c, - recvattach.c: A belated fix for #1808 (Debian #233106): Make -@@ -1772,7 +2076,8 @@ - message-hook '!(~g|~G) ~b"^-----BEGIN\ PGP\ (SIGNED\ )?MESSAGE"' - \ "exec check-traditional-pgp" - --2004-04-12 19:53:29 TAKAHASHI Tamotsu (roessler) -+2004-04-12 19:53:29 TAKAHASHI Tamotsu -+(roessler) - - * doc/manual.sgml.head, init.h: Various documentation fixes, - #1790. -@@ -1781,7 +2086,7 @@ - - * doc/mbox.man, doc/muttbug.man: Fix #1831, Debian#237827. - --2004-04-12 19:42:10 Joël Riou (roessler) -+2004-04-12 19:42:10 Joël Riou (roessler) - - * globals.h, init.c, init.h: Introduce config_charset. - -@@ -1789,7 +2094,7 @@ - - * po/ru.po: update - --2004-04-12 19:37:23 Im Eunjea (roessler) -+2004-04-12 19:37:23 Im Eunjea (roessler) - - * po/ko.po: update - -@@ -1798,11 +2103,12 @@ - * doc/manual.sgml.head, doc/muttrc.man.head, mutt.h, pattern.c: - Unreferenced messages pattern: ~$ - --2004-04-12 19:20:13 Paul WALKER (roessler) -+2004-04-12 19:20:13 Paul WALKER (roessler) - - * mutt_sasl.c: SASL2 needs errno.h. - --2004-04-12 19:17:32 Thomas Roessler (roessler) -+2004-04-12 19:17:32 Thomas Roessler -+(roessler) - - * muttlib.c: Include the user ID with temporary file names. - Suggested by eravin@panix.com in #1833. -@@ -1815,11 +2121,12 @@ - * imap/auth_sasl.c: Fix Debian #206078, #214758; patch submitted - by Artur Czechowski as #1845. - --2004-03-21 16:02:10 Ivan Vilata i Balaguer (roessler) -+2004-03-21 16:02:10 Ivan Vilata i Balaguer -+(roessler) - - * po/ca.po: update - --2004-02-12 08:51:07 Thomas Roessler (roessler) -+2004-02-12 08:51:07 roessler (roessler) - - * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, - po/tr.po, po/pt_BR.po, po/ru.po, po/nl.po, po/pl.po, po/ja.po, -@@ -1828,10 +2135,13 @@ - po/de.po, VERSION, po/bg.po, po/ca.po, po/cs.po, reldate.h, - ChangeLog: automatic post-release commit for mutt-1.4.2.1 - -+2004-02-12 08:46:17 Thomas Roessler -+(roessler) -+ - * Makefile.am: (stable) Include regex.c and snprintf.c with - the distribution. - --2004-02-11 14:03:38 Thomas Roessler (roessler) -+2004-02-11 14:03:38 roessler (roessler) - - * po/zh_TW.po, po/uk.po, po/zh_CN.po, po/tr.po, po/sv.po, - po/ru.po, po/sk.po, po/pt_BR.po, po/pl.po, po/nl.po, po/ko.po, -@@ -1840,6 +2150,9 @@ - po/cs.po, po/da.po, po/ca.po, VERSION, po/bg.po, reldate.h, - ChangeLog: automatic post-release commit for mutt-1.4.2 - -+2004-02-11 10:07:17 Thomas Roessler -+(roessler) -+ - * configure.in, menu.c: Backport an old bug fix, and make sure - configure can be created on recent systems. - -@@ -1852,24 +2165,28 @@ - * charset.c: Fix a CP1255/8-related problem that's caused by a - glibc/iconv bug. - --2004-02-08 09:38:38 Thomas Roessler (roessler) -+2004-02-08 09:38:38 Thomas Roessler -+(roessler) - - * muttlib.c: Change the logic in mutt_open_read to only - catch directories -- mutt may legitimately read devices (think - /dev/null) or named pipes. Also delegate error reporting to the - calling function by setting errno. - --2004-02-07 21:40:11 TAKAHASHI Tamotsu (roessler) -+2004-02-07 21:40:11 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update - --2004-02-07 21:38:32 Juan Altmayer Pizzorno (roessler) -+2004-02-07 21:38:32 Juan Altmayer Pizzorno -+(roessler) - - * mbox.c: Hi, off_t is a 64-bit number (like on Mac OS X/darwin), - the percentages don't show right while mutt is reading/parsing - a mailbox. Here's a patch (against 1.5.6i) to fix that. - --2004-02-07 21:36:41 David Yitzchak Cohen (roessler) -+2004-02-07 21:36:41 David Yitzchak Cohen -+ (roessler) - - * init.c, muttlib.c: Looking at the code, the problem is pretty - obvious. A recent patch to init.c (the one that was supposed -@@ -1880,7 +2197,8 @@ - is a file or a command. I'm attaching a patch that fixes the - problem in what I believe is the right way. - --2004-02-05 14:17:25 Thomas Roessler (roessler) -+2004-02-05 14:17:25 Thomas Roessler -+(roessler) - - * menu.c: Back out the patch for #1697. - -@@ -1892,7 +2210,7 @@ - - * po/pl.po: update - --2004-02-02 10:24:32 Im Eunjea (roessler) -+2004-02-02 10:24:32 Im Eunjea (roessler) - - * po/ko.po: update - -@@ -1900,7 +2218,7 @@ - - * po/fr.po: update - --2004-02-01 18:26:13 Thomas Roessler (roessler) -+2004-02-01 18:26:13 roessler (roessler) - - * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, - po/zh_CN.po, po/zh_TW.po, po/id.po, po/it.po, po/ja.po, po/ko.po, -@@ -1909,7 +2227,8 @@ - po/et.po, po/fr.po, po/gl.po, po/hu.po, reldate.h: automatic - post-release commit for mutt-1.5.6 - --2004-02-01 18:00:16 Mike Schiraldi <1074468571@schiraldi.org> (roessler) -+2004-02-01 18:00:16 Mike Schiraldi <1074468571@schiraldi.org> -+(roessler) - - * init.c: As you all know, running "mutt -F foo.rc" will have - mutt read foo.rc as its config file. However, there is a bug -- -@@ -1929,7 +2248,8 @@ - - * po/cs.po: update - --2004-02-01 17:45:33 Thomas Roessler (roessler) -+2004-02-01 17:45:33 Thomas Roessler -+(roessler) - - * doc/manual.sgml.head: A cross-reference was missing. - -@@ -1940,41 +2260,50 @@ - protos.h: Turn alternates, lists, and subscribe into regular - expression lists. - --2004-01-12 22:56:58 Christoph Ludwig (roessler) -+2004-01-12 22:56:58 Christoph Ludwig -+ (roessler) - - * smime_keys.pl: Avoid a Perl warning. - - 2004-01-12 20:24:09 Matt Kraai (roessler) - -- * doc/manual.sgml.head: A newline was missing from the -- documentation; #1754. (The actual commit message for this -- change is garbage; wrong window.) -+ * doc/manual.sgml.head: Thanks. The patch is committed to -+ the CVS. - --2004-01-12 19:59:38 Thomas Roessler (roessler) -+2004-01-12 19:59:38 Thomas Roessler -+(roessler) - - * crypt.c: Retainable PGP signatures were broken badly. #1757. - --2004-01-05 11:55:14 Robert Schiele (roessler) -+2004-01-05 11:55:14 Robert Schiele -+(roessler) - - * mutt_sasl.c: Back out part of the previous SASL/IPv6 patch - due to portability issues. - -+2004-01-04 11:10:21 Thomas Roessler -+(roessler) -+ -+ * init.c: Strike that. -+ -+ * init.c: Fix a memory management error. Ouch. -+ - 2004-01-04 10:55:20 René Clerc (roessler) - - * init.h: Fix hide_missing / hide_limited documentation. - --2004-01-04 10:51:49 Thomas Roessler (roessler) -+2004-01-04 10:51:49 Thomas Roessler -+(roessler) - - * hdrline.c: Permit list patterns that match the domain name of - an address; these patterns begin with '@'. Example: subscribe - @bugs.guug.de matches all messages sent to the bug tracking - system. - --2004-01-04 10:30:52 Thomas Roessler (roessler) -- - * po/ru.po: Argh, I shouldn't replace files by patches. - --2004-01-04 10:25:13 Cameron Patrick (roessler) -+2004-01-04 10:25:13 Cameron Patrick -+(roessler) - - * menu.c: Fix #1697 (Debian #219594.) - -@@ -1982,7 +2311,8 @@ - - * po/de.po: update - --2004-01-04 10:19:45 TAKAHASHI Tamotsu (roessler) -+2004-01-04 10:19:45 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update - -@@ -1995,7 +2325,8 @@ - * send.c: Fix #1488 (Debian#1882526): Honor Reply-To while - generating Mail-Followup-To headers. - --2004-01-04 09:59:42 Thomas Roessler (roessler) -+2004-01-04 09:59:42 Thomas Roessler -+(roessler) - - * init.h: Fix #1738; documentation issue re $from, $use_from. - -@@ -2015,12 +2346,14 @@ - - * imap/imap.c: Fix #1703. - --2004-01-04 09:42:35 Thomas Roessler (roessler) -+2004-01-04 09:42:35 Thomas Roessler -+(roessler) - - * smime.c: Fix a NULL pointer deference noted by Will Fiveash - . - --2003-12-30 13:04:20 Thomas Roessler (roessler) -+2003-12-30 13:04:20 Thomas Roessler -+(roessler) - - * commands.c, crypt.c, mutt.h, mutt_crypt.h, smime.c: Handle - partially signed messages more reasonably. See #1743. -@@ -2036,7 +2369,8 @@ - imap server over ipv6 it stores the address in a sockaddr which - may not be large enough to hold the ipv6 address. - --2003-12-17 17:42:02 Scott Koranda (roessler) -+2003-12-17 17:42:02 Scott Koranda -+(roessler) - - * crypt.c: pkcs7-signature wasn't recognized properly in one - more place. -@@ -2046,7 +2380,8 @@ - * rfc1524.c: Fix possible core dump in mailcap nametemplate - handling. - --2003-12-10 00:48:57 Thomas Roessler (roessler) -+2003-12-10 00:48:57 Thomas Roessler -+(roessler) - - * thread.c: Avoid NULL pointer deference in threading code. - -@@ -2054,7 +2389,8 @@ - - * pager.c: Fix 1716. - --2003-11-15 09:32:30 Velko Hristov (roessler) -+2003-11-15 09:32:30 Velko Hristov -+(roessler) - - * po/bg.po: updat - -@@ -2066,7 +2402,8 @@ - - * po/nl.po: update - --2003-11-12 13:49:32 Thomas Roessler (roessler) -+2003-11-12 13:49:32 Thomas Roessler -+(roessler) - - * configure.in, mutt_idna.c, mutt_idna.h, mutt_socket.c: Fix - IDN API incompatibility problems. -@@ -2075,15 +2412,12 @@ - - * configure.in: Fix 1515, 1693. - --2003-11-12 11:40:27 Thomas Roessler (roessler) -+2003-11-12 11:40:27 Thomas Roessler -+(roessler) - - * mh.c, sort.c: Fix dangling pointer problems in threading code. - Noted and tracked down by q4xk3j002@sneakemail.com who also - provided the initial fix. -- -- CORRECTION: q4xk3j002 (whoever that is) reported the bug, -- but thr problem was tracked down and fixed by YONETANI -- Tomokazu - - 2003-11-11 10:19:22 Ronny Haryanto (roessler) - -@@ -2097,16 +2431,15 @@ - - * po/fr.po: update - --2003-11-09 21:41:28 Thomas Roessler (roessler) -+2003-11-09 21:41:28 Thomas Roessler -+(roessler) - - * mh.c: Fix #1692. - --2003-11-09 09:38:32 Thomas Roessler (roessler) -- - * send.c: Commit the fix for #1509. This must have been lost - earlier this year. - --2003-11-05 20:09:36 Thomas Roessler (roessler) -+2003-11-05 20:09:36 roessler (roessler) - - * po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, - po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, -@@ -2115,13 +2448,16 @@ - po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po: automatic - post-release commit for mutt-1.5.5.1 - --2003-11-05 12:17:10 Thomas Roessler (roessler) -+2003-11-05 12:17:10 Thomas Roessler -+(roessler) - - * Makefile.am: Include regex.c and snprintf.c with the - distribution. Noted by Lars Hecking. - - * build-release: Ups, we don't upload the CVS any more. - -+2003-11-05 09:51:10 roessler (roessler) -+ - * po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, - po/uk.po, po/zh_CN.po, po/zh_TW.po, ChangeLog, VERSION, po/bg.po, - po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, -@@ -2129,50 +2465,51 @@ - po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, reldate.h: - automatic post-release commit for mutt-1.5.5 - --2003-11-05 09:27:43 Thomas Roessler (roessler) -+2003-11-05 09:27:43 Thomas Roessler -+(roessler) - - * build-release: Use gpg for signing releases. - --2003-11-03 10:30:58 Thomas Roessler (roessler) -+2003-11-03 10:30:58 Thomas Roessler -+(roessler) - - * attach.c: Fix a logic flaw in attachment saving. - --2003-10-08 19:55:39 Thomas Roessler (roessler) -+2003-10-08 19:55:39 Thomas Roessler -+(roessler) - - * pgpkey.c: KeyTable is pgp_uid_t **, not pgp_key_t *. Fix some - sizeof statements accordingly. Note that pgp_key_t is also a - pointer, though, so this should not have broken things. - --2003-10-06 09:58:35 Thomas Roessler (roessler) -+2003-10-06 09:58:35 Thomas Roessler -+(roessler) - - * query.c: Fiy memory corruption. (# 1659) - --2003-10-04 22:12:10 Thomas Roessler (roessler) -+2003-10-04 22:12:10 Thomas Roessler -+(roessler) - - * lib.c: mutt_basename() was garbage. - --2003-10-04 20:54:37 Thomas Roessler (roessler) -- - * doc/manual.sgml.head: Fix some tags. Noted by Todd - . - --2003-10-04 20:35:00 Thomas Roessler (roessler) -- - * recvattach.c, attach.h, commands.c, compose.c, keymap.h, lib.c, - lib.h, menu.c, mutt.h, mutt_menu.h, muttlib.c, pager.c, protos.h: - This patch fixes various aspects of the attachment-saving user - interface. Changes include: - -- - When tagging and saving multiple attachments, you can now use -+ * When tagging and saving multiple attachments, you can now use - the same target directory for multiple attachments. - -- - When you can't save an attachment, you get an opportunity to -+ * When you can't save an attachment, you get an opportunity to - enter a new file name. - -- - The menu cursor will highlight the attachment that you are -+ * The menu cursor will highlight the attachment that you are - currently discussing with mutt. - -- - Various bug fixes. -+ * Various bug fixes. - - This does, in particular, address #1619 (Debian#208430). - -@@ -2182,12 +2519,14 @@ - - * doc/muttrc.man.head: Fix typo. - --2003-09-29 15:05:52 Thomas Roessler (roessler) -+2003-09-29 15:05:52 Thomas Roessler -+(roessler) - - * doc/dotlock.man, doc/mutt.man, doc/muttrc.man.head: Fix #1652 - (Debian #213007), noted by Jens Seidel . - --2003-09-20 06:24:10 Thomas Roessler (roessler) -+2003-09-20 06:24:10 Thomas Roessler -+(roessler) - - * muttbug.sh.in: Adapt to new GNU coreutils by not using head (1). - -@@ -2195,7 +2534,8 @@ - - * po/nl.po: update - --2003-09-19 13:05:13 Thomas Roessler (roessler) -+2003-09-19 13:05:13 Thomas Roessler -+(roessler) - - * imap/utf7.c: Fix remaining (void **) casts. - -@@ -2212,7 +2552,8 @@ - double-check, one might have slipped through the cracks), I can - make one for 1.4 CVS branch as well if wanted. - --2003-09-19 12:56:49 Thomas Roessler (roessler) -+2003-09-19 12:56:49 Thomas Roessler -+(roessler) - - * send.c: Change abort_unmodified so it doesn't abort a message - that has an attachment. Catches the "send a file from the -@@ -2223,28 +2564,31 @@ - * mutt_sasl.c: This trivial patch closes #1516 (NI_WITHSCOPEID - undefined). Thanks to Mads for the initial patch. - --2003-09-11 07:27:23 Velko Hristov (roessler) -+2003-09-11 07:27:23 Velko Hristov -+(roessler) - - * po/bg.po: Bulgarian translation. (Seems like I screwed up an - earlier commit. -tlr) - --2003-09-10 13:20:49 Jon Miles (roessler) -+2003-09-10 13:20:49 Jon Miles (roessler) - - * pop_auth.c: In pop_auth.c:pop_auth_sasl(), if the main loop - received anything back from the server that didnt begin with '+ - ', it was bailing out and skipping the checks to see if there - was a +OK response. - --2003-09-07 10:11:49 Im Eunjea (roessler) -+2003-09-07 10:11:49 Im Eunjea (roessler) - - * po/ko.po: update. - --2003-09-04 15:10:09 Thomas Roessler (roessler) -+2003-09-04 15:10:09 Thomas Roessler -+(roessler) - - * init.h: Fix some formatting glitches that lead to error messages - when viewing the muttrc(5) manual page. - --2003-09-04 14:59:57 Christoph Ludwig (roessler) -+2003-09-04 14:59:57 Christoph Ludwig -+ (roessler) - - * smime.c: Fix verification bug when messages are S/MIME signed - & encrypted. -@@ -2267,11 +2611,13 @@ - - * po/pl.po: update. - --2003-09-03 17:15:20 TAKAHASHI Tamotsu (roessler) -+2003-09-03 17:15:20 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: New ja.po. - --2003-09-03 17:12:52 Velko Hristov (roessler) -+2003-09-03 17:12:52 Velko Hristov -+(roessler) - - * configure.in: Bulgarian translation. - -@@ -2298,7 +2644,8 @@ - The attached patch reverts that change. Let me know if it solves - the problem. - --2003-08-11 14:05:13 Thomas Roessler (roessler) -+2003-08-11 14:05:13 Thomas Roessler -+(roessler) - - * doc/muttrc.man.head: Fix a formatting bug. - -@@ -2308,7 +2655,8 @@ - mbox.c, mx.c, mx.h, sendlib.c: This patch removes the Kendra - format from mutt. (The support was broken anyways.) - --2003-08-02 11:01:09 Horvath Szabolcs (roessler) -+2003-08-02 11:01:09 Horvath Szabolcs -+(roessler) - - * po/hu.po: update - -@@ -2376,7 +2724,7 @@ - - * configure.in, .cvsignore: autoconf 2.5 compatibility. - --2003-07-14 12:40:03 Hugo Haas (roessler) -+2003-07-14 12:40:03 Hugo Haas (roessler) - - * send.c: Fix #1520. - -@@ -2386,14 +2734,13 @@ - - 2003-07-14 12:19:07 Brendan Cully (roessler) - -- * imap/command.c, imap/imap.c: -- -- On Sunday, 13 July 2003 at 18:09, Brendan Cully wrote: -+ * imap/command.c, imap/imap.c: On Sunday, 13 July 2003 at 18:09, -+ Brendan Cully wrote: - - > The attached patch should help when the connection to your -- > postponed folder times out and you can't reconnect without -- > restarting mutt. I'd like anyone who has that problem to -- > try it and let me know how it works. -+ postponed > folder times out and you can't reconnect without -+ restarting mutt. I'd > like anyone who has that problem to try -+ it and let me know how it > works. - - I dug a little deeper. The attached patch seems to work better. It - complains the first time you try to recall a message, but works -@@ -2404,11 +2751,12 @@ - push buffer when asking for passwords. This is a proper fix for - bug 1312. I think it's uncontroversial. - --2003-07-04 17:15:34 Thomas Roessler (roessler) -+2003-07-04 17:15:34 Thomas Roessler -+(roessler) - - * imap/auth_sasl.c: Increase a buffer's size. - --2003-07-04 17:07:22 Nicolas Rachinsky (roessler) -+2003-07-04 17:07:22 Nicolas Rachinsky (roessler) - - * OPS, curs_lib.c, curs_main.c, functions.h, menu.c: Introduce - tag-prefix-cond and end-cond. This makes simple conditional -@@ -2419,31 +2767,25 @@ - * curs_main.c, pattern.c: Display an empty index when no messages - match search criteria. - --2003-07-04 16:57:56 Thomas Roessler (roessler) -+2003-07-04 16:57:56 Thomas Roessler -+(roessler) - - * init.h, muttlib.c: Add a ':' flag to % expandos. This will - make sure that any dots are converted into underscores. (_ - is already used for lowercasing the result of an expando.) - --2003-06-04 14:01:39 Thomas Roessler (roessler) -+2003-06-04 14:01:39 Thomas Roessler -+(roessler) - - * muttlib.c: Don't colorize empty lines generated with - state_attach_puts(); - --2003-05-29 17:49:00 Thomas Roessler (roessler) -- -- * po/id.po, po/eo.po: Updates from the respective authors. -- - 2003-05-29 17:48:28 David Shaw (roessler) - -- * pgp.c: Fix part of #1564. -- --2003-05-29 17:47:10 Matt Larson (roessler) -- -- * imap/imap.c: Look at UNSEEN, not RECENT in -- imap_check_mailbox(). -+ * imap/imap.c, pgp.c, po/eo.po, po/id.po: Fix part of #1564. - --2003-05-29 17:47:10 Thomas Roessler (roessler) -+2003-05-29 17:47:10 Thomas Roessler -+(roessler) - - * init.c: Fix a segmentation fault which would occur when - pgp_sort_keys is set in a configuration file, but mutt is compiled -@@ -2453,23 +2795,27 @@ - capabilities. This should take care of the recent "mutt does - not see all keys" problems. - --2003-05-13 13:06:16 Dale Woolridge (roessler) -+2003-05-13 13:06:16 Dale Woolridge -+(roessler) - - * crypt.c: Fix gpg-agent use. - --2003-05-13 12:53:20 Thomas Roessler (roessler) -+2003-05-13 12:53:20 Thomas Roessler -+(roessler) - - * doc/manual.sgml.head: Remove useless examples about treating - text/enriched externally. #1549; Debian #190309. - --2003-05-13 12:50:04 Juan Altmayer Pizzorno (roessler) -+2003-05-13 12:50:04 Juan Altmayer Pizzorno -+(roessler) - - * recvattach.c: view-attachments does not extract the message - within a x-pkcs7-mime if it's only signed, but not encrypted. - Such a message results, for example, from a decrypt-save if the - message was previously encrypted and signed. - --2003-05-13 12:45:35 Thomas Glanzmann (roessler) -+2003-05-13 12:45:35 Thomas Glanzmann -+(roessler) - - * doc/manual.sgml.head: Fix an inconsistency between manual - and code. -@@ -2492,7 +2838,8 @@ - the key algorithm as they are now, but the GnuPG users will see - an improvement. - --2003-05-12 16:21:26 Thomas Roessler (roessler) -+2003-05-12 16:21:26 Thomas Roessler -+(roessler) - - * enter.c: Fix alias completion when the alias is entered as - part of a group. (E.g., The Tea Party: alias1, alias2, alias3;) -@@ -2507,7 +2854,8 @@ - * compose.c: Fix two more cases in which ctrl-G is interpreted - as M_YES. - --2003-04-15 09:52:06 Dale Woolridge (roessler) -+2003-04-15 09:52:06 Dale Woolridge -+(roessler) - - * compose.c: The "sign (a)s" code strips the pgp application - bit causing drawing issues in redraw_crypt_lines(). Other bits -@@ -2515,7 +2863,8 @@ - with pgp, but the same problem exists in the smime code too. - This inline patch (against cvs head revision) fixes the problem. - --2003-04-14 09:09:53 Thomas Roessler (roessler) -+2003-04-14 09:09:53 Thomas Roessler -+(roessler) - - * init.h, mutt.h, send.c: Fix the PGP / S/MIME selection mess - in send.c. This patch adds two new configuration variables, -@@ -2524,7 +2873,8 @@ - selection of one or both mechanisms. (Useful when your mutt is - PGP- and S/MIME enabled, but you only use, say S/MIME.) - --2003-04-11 15:15:04 Thomas Roessler (roessler) -+2003-04-11 15:15:04 Thomas Roessler -+(roessler) - - * send.c: Backing out the previous change. It was nonsense. - -@@ -2533,7 +2883,8 @@ - * config.guess, config.sub, depcomp, install-sh, missing, - mkinstalldirs: updates. - --2003-04-11 11:56:22 Thomas Roessler (roessler) -+2003-04-11 11:56:22 Thomas Roessler -+(roessler) - - * send.c: Try to fix a PGP / S/MIME-related problem. Found by - Matt Larson , tracekd down by René Clerc -@@ -2545,7 +2896,8 @@ - - * recvcmd.c: Fix #1531. (recvcmd.c duplicate of #1528) - --2003-04-08 22:32:56 Thomas Roessler (roessler) -+2003-04-08 22:32:56 Thomas Roessler -+(roessler) - - * lib.c: Avoid a division by zero. - -@@ -2558,11 +2910,10 @@ - in which parameters for malloc calls could overflow. Thanks to - Timo Sirainen for the heads-up. - --2003-04-08 10:18:15 Thomas Roessler (roessler) -- - * po/es.po: Mark a translation as fuzzy in order to fix #1522. - --2003-04-07 20:08:10 Thomas Roessler (roessler) -+2003-04-07 20:08:10 Thomas Roessler -+(roessler) - - * commands.c: Fix #1528. - -@@ -2570,7 +2921,8 @@ - - * po/nl.po: update - --2003-04-06 11:00:59 Ivan Vilata i Balaguer (roessler) -+2003-04-06 11:00:59 Ivan Vilata i Balaguer -+(roessler) - - * po/ca.po: update - -@@ -2579,18 +2931,16 @@ - * smime_keys.pl: - add a missing filehandle closure - some - cleanups of unused/bogous code - --2003-04-02 08:47:28 Thomas Roessler (roessler) -+2003-04-02 08:47:28 Thomas Roessler -+(roessler) - - * contrib/Makefile.in, contrib/colors.default, - contrib/colors.linux: sample.muttrc-tlr would try to include -- my color configurations, which weren't distrubted. Fix -- that. (Bug noted while helping someone else to configure -- mutt during a conference.) -- --2003-04-02 08:43:24 Thomas Roessler (roessler) -+ my color configurations, which weren't distrubted. Fix that. -+ (Bug noted while helping someone else to configure mutt during -+ a conference.) - -- * contrib/sample.muttrc: Fix sample.muttrc. (Error noted by -- Thomas Glanzmann.) -+ * contrib/sample.muttrc: Fix sample.muttrc. - - 2003-04-02 08:40:50 Gary Johnson (roessler) - -@@ -2603,7 +2953,8 @@ - - * po/fr.po: update - --2003-04-02 08:34:49 TAKAHASHI Tamotsu (roessler) -+2003-04-02 08:34:49 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update - -@@ -2629,7 +2980,7 @@ - - * po/ru.po: update. - --2003-03-19 22:43:08 Thomas Roessler (roessler) -+2003-03-19 22:43:08 roessler (roessler) - - * po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, - po/uk.po, po/zh_CN.po, po/zh_TW.po, po/et.po, po/fr.po, po/gl.po, -@@ -2638,8 +2989,6 @@ - po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, - po/es.po, reldate.h: automatic post-release commit for mutt-1.5.4 - --2003-03-19 22:18:43 Thomas Roessler (roessler) -- - * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, - po/sv.po, po/pl.po, po/pt_BR.po, po/ru.po, po/ja.po, po/ko.po, - po/lt.po, po/nl.po, po/gl.po, po/hu.po, po/id.po, po/it.po, -@@ -2647,6 +2996,9 @@ - po/es.po, VERSION, po/bg.po, po/ca.po, po/cs.po, reldate.h, - ChangeLog: automatic post-release commit for mutt-1.4.1 - -+2003-03-19 21:56:29 Thomas Roessler -+(roessler) -+ - * pgppubring.c: Fix some memory management calls. (Stable branch.) - - 2003-03-19 21:33:30 Edmund GRIMLEY EVANS (roessler) -@@ -2656,15 +3008,15 @@ - - * imap/utf7.c: Fix a buffer overflow in utf8_to_utf7. - --2003-03-18 14:51:52 Andrew W. Nosenko (roessler) -+2003-03-18 14:51:52 Andrew W. Nosenko (roessler) - -- * buffy.c (test_last_status_new): Fix memory leak. Envelope -- structure allocated by mutt_read_rfc822_header() was never -- deallocated. -- -- * parse.c (mutt_read_rfc822_header): Comment added about -- needing deallocate envelope structure returned by -- mutt_read_rfc822_header(). -+ * buffy.c, parse.c: - buffy.c (test_last_status_new): Fix memory -+ leak. Envelope structure allocated by mutt_read_rfc822_header() -+ was never deallocated. -+ -+ - parse.c (mutt_read_rfc822_header): Comment added about -+ needing deallocate envelope structure returned by -+ mutt_read_rfc822_header(). - - * mutt_idna.c: (mutt_addr_for_display): Fix memory leak. `user' - and `domain' buffers was never deallocated. -@@ -2673,7 +3025,8 @@ - deallocated when `mbx' doesn't contain '@'. Also rewritten for - allocating memory only when needed and only how many as needed. - --2003-03-12 13:00:03 Thomas Roessler (roessler) -+2003-03-12 13:00:03 Thomas Roessler -+(roessler) - - * copy.c, sendlib.c: We need to re-format address headers instead - of just decoding them. -@@ -2687,7 +3040,8 @@ - problems before. Since it segfaults reliably on OS X for me now, - I thought a patch would be in order. - --2003-03-07 08:23:27 Thomas Roessler (roessler) -+2003-03-07 08:23:27 Thomas Roessler -+(roessler) - - * crypt.c, pgp.h: Don't use functions without importing the - corresponding prototype. -@@ -2700,20 +3054,22 @@ - * globals.h: globals.h is looking for crypt.h instead of - mutt_crypt.h. - --2003-03-06 21:23:53 Thomas Roessler (roessler) -+2003-03-06 21:23:53 Thomas Roessler -+(roessler) - -- * send.c: Fixing a segmentation fault. Here's how to -- reproduce it: Start mutt. Compose a new message, with an -- attachment. Turn on PGP signing. Press C-G on the pass -- phrase prompt. Turn off PGP signing. Send the message. -+ * send.c: Fixing a segmentation fault. Here's how to reproduce -+ it: Start mutt. Compose a new message, with an attachment. -+ Turn on PGP signing. Press C-G on the pass phrase prompt. -+ Turn off PGP signing. Try to send the message. - --2003-03-05 21:18:24 Andrew W. Nosenko (roessler) -+2003-03-05 21:18:24 Andrew W. Nosenko (roessler) - - * protos.h, sort.c: Fix a warning. - - * mutt_idna.c: Fix tlr's pre-processor screw-up. - --2003-03-04 09:51:07 Thomas Roessler (roessler) -+2003-03-04 09:51:07 Thomas Roessler -+(roessler) - - * mutt_idna.c, mutt_socket.c: Unset UseSTD3ASCIIRules, and set - AllowUnassigned. (Just reading some standards.) -@@ -2724,7 +3080,8 @@ - bodies; #1478. Note that the relevant standards explicitly - *forbid* nested MIME encodings. - --2003-03-04 09:27:21 Thomas Roessler (roessler) -+2003-03-04 09:27:21 Thomas Roessler -+(roessler) - - * copy.c: Fix another stupid error, and decode IDNs in the - CC header. -@@ -2734,7 +3091,8 @@ - - * addrbook.c, alias.c, send.c: Fixing more IDN bugs. - --2003-03-03 14:25:14 Thomas Roessler (roessler) -+2003-03-03 14:25:14 Thomas Roessler -+(roessler) - - * copy.c, sort.c: Fixing some nits. - -@@ -2753,15 +3111,14 @@ - code may, at this point, not even compile on machines without - libidn. Will start working on that ASAP. - --2003-03-03 08:26:21 Thomas Roessler (roessler) -- - * contrib/sample.muttrc, doc/manual.sgml.head, recvcmd.c, - commands.c, init.h, mutt.h: Introduce a new option named - $bounce, and fix some inconsistencies in the messages created - when bouncing. Based on work done by Thomas Glanzmann - . - --2003-02-25 22:00:38 Thomas Roessler (roessler) -+2003-02-25 22:00:38 Thomas Roessler -+(roessler) - - * commands.c, recvcmd.c: Fix some (too lazy and tired to do all) - of the inconsistencies between message and attachment bouncing. -@@ -2782,7 +3139,8 @@ - - * po/es.po: Fix a typo. (#1482) - --2003-02-25 21:33:16 Thomas Roessler (roessler) -+2003-02-25 21:33:16 Thomas Roessler -+(roessler) - - * doc/manual.sgml.head: Remove some ftp.guug.de URLs from the - manual. (#1485) -@@ -2797,7 +3155,8 @@ - numbers in 2440bis. Here is a patch to add values for pgp-sha256, - pgp-sha384, and pgp-sha512 so mutt can properly handle them. - --2003-02-19 21:31:19 Thomas Roessler (roessler) -+2003-02-19 21:31:19 Thomas Roessler -+(roessler) - - * parse.c: Fix a memory leak observed by Vineet Kumar - . -@@ -2808,12 +3167,14 @@ - language tweaks, etc). No functional changes - this is just - language stuff. - --2003-02-13 09:50:00 Thomas Roessler (roessler) -+2003-02-13 09:50:00 Thomas Roessler -+(roessler) - - * pgp.c: Fix #1444, Debian #178563. The details of this problem - were tracked down by Steven Barker . - --2003-01-31 00:15:03 Thomas Roessler (roessler) -+2003-01-31 00:15:03 Thomas Roessler -+(roessler) - - * init.h: Change the default for crypt_replyencrypt back to "yes". - Noted by Thomas Poindessous in Debian bug #178899; also #1448. -@@ -2826,11 +3187,12 @@ - * crypt.c, init.h, mutt.h, mutt_crypt.h, send.c: Introduce - $pgp_auto_traditional. - --2003-01-30 23:48:36 Thomas Roessler (roessler) -+2003-01-30 23:48:36 Thomas Roessler -+(roessler) - - * flags.c: The IMAP ACL patch broke things. - --2003-01-23 22:05:02 Nathan Dushman (roessler) -+2003-01-23 22:05:02 Nathan Dushman (roessler) - - * pop_auth.c: SASL2 support for popo_auth.c. - -@@ -2840,12 +3202,14 @@ - flag in mailboxes that allow it, even if the mailbox doesn't - allow other changes. - --2003-01-23 22:01:03 Thomas Roessler (roessler) -+2003-01-23 22:01:03 Thomas Roessler -+(roessler) - - * handler.c: Automatically use the text/plain handler for text/* - body parts which don't have a handler of their own. - --2003-01-21 18:56:10 Thomas Roessler (roessler) -+2003-01-21 18:56:10 Thomas Roessler -+(roessler) - - * cryptglue.c: Fix a typo which broke pgp-extract-traditional. - -@@ -2860,11 +3224,9 @@ - main.c, mutt.h, mutt_crypt.h, muttlib.c, mx.c, pager.c, - parse.c, pattern.c, pgp.c, pgp.h, pgpkey.c, pgplib.c, pgplib.h, - pgppubring.c, pop.c, postpone.c, protos.h, recvattach.c, send.c, -- sendlib.c, smime.c, smime.h, sort.h: -- -- - To cleanup the pgp/smime code and prepare for other -- backends. -- - Support gpg-agent by not asking for a passphrase. -+ sendlib.c, smime.c, smime.h, sort.h: - To cleanup the pgp/smime -+ code and prepare for other backends. - Support gpg-agent by -+ not asking for a passphrase - autconf cleanups. - - This is just a start and probably we need a couple of other things - to do. One drawback is that the help menu does always list all -@@ -2886,11 +3248,192 @@ - runtime configured backends. crypt.h is also new and replaces - pgp.h and smime.h in most files (except for the backend). - -- (Details are in Werner's changelog entries from January 4 -- and January 6 below. Note that the configure update Werner -- had done are not in the CVS at this point. -- T.R.) - --2003-01-09 17:27:25 Thomas Roessler (roessler) -+ -+ 2003-01-06 Werner Koch -+ -+ * crypt.c (crypt_valid_passphrase): Detect gpg-agent and -+ don't ask for the passphrase. * pgp.c (pgp_decrypt_part, -+ pgp_application_pgp_handler) (pgp_sign_message, -+ pgp_encrypt_message) (pgp_traditional_encryptsign): -+ Make sure that we never ever send the passphrase if the -+ gpg-agent has been detected. Likewise. -+ -+ * acconfig.h: Removed all remaining stuff as AC_TEMPLATEs -+ to configure.in. BTW, we should consider to rename -+ configure.in to configure.ac. -+ -+ 2003-01-04 Werner Koch -+ -+ Replaced the use of HAVE_PGP and HAVE_SMIME by a more -+ readable and extendable solution. -+ -+ * pgplib.h: Moved enum pgp_ring and KEYFLAGS_* to * -+ crypt.h: here. * smime.c (mutt_is_application_smime): -+ Moved to * crypt.c (mutt_is_application_smime): -+ here. * pgp.c (mutt_is_application_pgp): Moved to -+ * crypt.c (mutt_is_application_pgp): here. * pgp.c -+ (pgp_is_multipart_encrypted): Removed. Merged code with * -+ crypt.c (mutt_is_multipart_encrypted): this. -+ -+ * mutt.h: Protect against double inclusion. -+ -+ * pgplib.h (struct pgp_keyinfo): Remove the typedef to -+ pgp_key_t. * crypt.h (pgp_key_t): Declare the typedef -+ here. NOTE: This is now a pointer. Changed all usages -+ accordingly. -+ -+ * configure.in: Replace HAVE_PGP and HAVE_SMIME by the -+ new CRYPT_BACKEND macros. Always include all OPS.*. -+ (LIBOBJ): Replaced by AC_LIBOBJ as required by newer -+ autoconfs. * Makefile.am (EXTRA_mutt_SOURCES): Move -+ crypt.c to mutt_SOURCES. (mutt_SOURCES): Add cryptglue.c -+ (EXTRA_DIST): Add crypt.h -+ -+ * pgp.h, pgplib.h, smime.h: Use the header only -+ when the approriate backend has been configured. * -+ pgp.c, pgpkey.c, smime.c: Build only if the approriate -+ CRYPT_BACKEND_ macro is defined. * pgp.h, smime.h, -+ global.h: Moved all variable declarations to global.h -+ because they are now always defined. -+ -+ * sort.h: Always define PgpSortKey, although it does -+ not belong to here. -+ -+ * keymap.h: Unconditionally include all PGP and SMIME -+ stuff. * mutt.h: Ditto. * protos.h: Ditto. -+ -+ * init.h (HAVE_SMIME): Unconditionally include all -+ crypto related definitions. Mark the doc entries with -+ "(Crypto/PGP/SMIME only)". -+ -+ * globals.h: Replace gpg.h and smime.h by crypt.h. -+ -+ * functions.h: Always include all crypto commands. -+ -+ * copy.h: Unconditionally define the crypto related M_CM_ -+ -+ * pgplib.h: Move APPLICATION_PGP and PGP* to crypt.h -+ and include it. * smime.h: Move APPLICATION_SMIME -+ and SMIME* to crypt.h and include it. * mutt_crypt.h -+ (ENCRYPT,SIGN,GOODSIGN, BADSIGN): Move to crypt.h. -+ -+ * crypt.c: Replaced pgp.h and smime.h header by crypt.h. -+ Always include all functions but shortcut them depending -+ on WITHCRYPTO. All over the place use WITHCRYPTO -+ instead of ifdefs. Replaced all direct calls of the -+ backend fucntions by twrapper functions defined in -+ cryptglue.c (crypt_get_keys): Removed prototypes. -+ * pgp.h (pgp_findKeys): New prototype. * smime.h -+ (smime_findKeys): New prototype. * cryptglue.c: New. -+ * crypt.h: New. * mutt_crypt.h: Moved all crypt_* -+ prototypes to gcrypt.h. Unconditionally use this file. -+ -+ * init.c: Replaced pgp.h and smime.h header by crypt.h. -+ (parse_set): Use WITHCRYPTO instead of ifdefs. -+ (mutt_var_value_complete): Ditto. -+ -+ * sendlib.c: Replaced pgp.h and smime.h header by crypt.h. -+ (write_as_text_part): Now one macro using WITHCRYPTO. -+ (mutt_write_mime_body): Use WITHCRYPTO instead of ifdefs. -+ (mutt_make_message_attach): Ditto. (mutt_write_fcc): -+ Ditto. -+ -+ * send.c: Replaced pgp.h and smime.h header by crypt.h. -+ (include_forward): Use WITHCRYPTO and validate -+ passphrases for pgp and smime. (include_reply): Ditto. -+ (generate_body): Use WITHCRYPTO instead of ifdefs. -+ (ci_send_message): Ditto. -+ -+ * recvattach.c: Replaced pgp.h and smime.h header -+ by crypt.h. (mutt_gen_attach_list): Use WITHCRYPTO -+ instead of ifdefs. (mutt_attach_display_loop): Ditto -+ (mutt_view_attachments): Ditto. -+ -+ * postpone.c: Replaced pgp.h and smime.h header by -+ crypt.h. (mutt_get_postponed): Use WITHCRYPTO instead -+ of ifdefs. (mutt_parse_crypt_hdr): Always include and use -+ WITHCRYPTO instead of ifdefs. (mutt_prepare_template): -+ Use WITHCRYPTO instead of ifdefs. -+ -+ * pop.c: Removed pgp.h and smime.h. (pop_fetch_message): -+ Use WITHCRYPTO instead of ifdefs. -+ -+ * pattern.c: Replaced pgp.h and smime.h header by crypt.h. -+ (Flags): Always include the crypto flags. (msg_search): -+ Use WITHCRYPTO instead of ifdefs. (mutt_pattern_exec): -+ Ditto. -+ -+ * parse.c: Removed pgp.h and smime.h. -+ (mutt_parse_mime_message): Use WITHCRYPTO instead -+ of ifdefs. -+ -+ * pager.c: Replaced pgp.h and smime.h header by crypt.h. -+ (mutt_pager): Use WITHCRYPTO instead of ifdefs. -+ -+ * mx.c: Removed smime.h and pgp.h. (mx_update_context): -+ Use WITHCRYPTO instead of ifdefs. -+ -+ * muttlib.c: Replaced pgp.h and smime.h header by crypt.h. -+ (mutt_needs_mailcap): Use WITHCRYPTO. Note, that there -+ used to be an error when PGP was not configured so -+ that TYPEAPPLICATION was not recognized for SMIME. -+ (mutt_is_text_part): Use WITHCRYPTO instead of ifdefs. -+ -+ * main.c: Include crypt.h. (show_version): Remove -+ HAVE_PGP and HAVE_SMIME. Add CRYPT_BACKEND_CLASSIC_PGP, -+ CRYPT_BACKEND_CLASSIC_SMIME. -+ -+ * keymap.c: Include crypt.h so that we can test -+ WITHCRYPTO. (Menus): Always include pgp and smime. -+ (km_init): Create smime and pgp bindings depending -+ on WITHCRYPTO. (km_get_table): Return OpPgp depending -+ on WITHCRYPTO. -+ -+ * hook.c (mutt_parse_hook): Use WITHCRYPTO instead -+ of ifdefs. (mutt_crypt_hook): Always include. -+ -+ * headers.c: Replaced pgp.h and smime.h header by crypt.h. -+ (mutt_edit_headers): Use WITHCRYPTO instead of ifdefs -+ -+ * hdrline.c: Replaced pgp.h and smime.h header by crypt.h. -+ (hdr_format_str): Use WITHCRYPTO. -+ -+ * handler.c: Replaced pgp.h and smime.h header by crypt.h. -+ (mutt_can_decode): Use WITHCRYPTO instead of ifdefs. -+ (mutt_can_decode): Application/smime is now also checked -+ when PGP support is not configured. (mutt_body_handler): -+ Use WITHCRYPTO -+ -+ * curs_main.c: Replaced pgp.h and smime.h header -+ by crypt.h. (mutt_index_menu): Shortcut crypto only -+ operations depending on WITHCRYPTO. -+ -+ * copy.c: Replaced pgp.h and smime.h header by crypt.h. -+ (_mutt_copy_message): -+ -+ * compose.c: Replaced pgp.h and smime.h header by crypt.h. -+ (enum): Always include HDR_CRYPT and HDR_CRYPTINFO. -+ (redraw_crypt_lines): Always include this fnc but shortcut -+ it depending on WITHCRYPT. Draw lines depending on -+ the configured crypto support. (pgp_send_menu): -+ Always include this one. Call wrapper functions. -+ (smime_send_menu): Likewise. (draw_envelope): Use -+ WITHCRYPTO instead of ifdefs. (mutt_compose_menu): -+ Allow pgp/smime commands only when configured. -+ -+ * commands.c: Replaced pgp.h and smime.h header -+ by crypt.h. (mutt_display_message,pipe_msg, -+ _mutt_pipe_message) (set_copy_flags, mutt_save_message, -+ mutt_edit_content_type) (_mutt_check_traditional_pgp): -+ Use pgp wrapper. -+ -+ * attach.c (mutt_view_attachment): Removed HAVE_GPG and -+ HAVE_SMIME and replaced by global variable WITHCRYPTO. -+ Replaced pgp and smime header by crypt.h.x -+ -+2003-01-09 17:27:25 Thomas Roessler -+(roessler) - - * pgppubring.c: Don't make a "hard" transition to the new GnuPG - syntax in pgpring. This change undoes one of David Shaw's -@@ -2909,23 +3452,13 @@ - - Here is a patch so mutt will accept either the old or new syntax. - -+2003-01-09 17:23:23 dshaw@jabberwocky.com (roessler) -+ - * curs_lib.c: A recent change causes all mutt_yesorno prompts - to come out as [yes]/yes or [no]/no. Here's a fix. - --2003-01-06 Werner Koch (Committed 2003-01-21, roessler.) -- -- * crypt.c (crypt_valid_passphrase): Detect gpg-agent and don't ask -- for the passphrase. -- * pgp.c (pgp_decrypt_part, pgp_application_pgp_handler) -- (pgp_sign_message, pgp_encrypt_message) -- (pgp_traditional_encryptsign): Make sure that we never ever send -- the passphrase if the gpg-agent has been detected. Likewise. -- -- * acconfig.h: Removed all remaining stuff as AC_TEMPLATEs to -- configure.in. BTW, we should consider to rename configure.in to -- configure.ac. -- --2003-01-05 22:16:02 Thomas Roessler (roessler) -+2003-01-05 22:16:02 Thomas Roessler -+(roessler) - - * smime_keys.pl: Error checking for the creation of the temporary - directory; also, use file mode 0700. -@@ -2934,7 +3467,8 @@ - - * smime_keys.pl: Improve temporary file handling. - --2003-01-05 22:02:37 Thomas Roessler (roessler) -+2003-01-05 22:02:37 Thomas Roessler -+(roessler) - - * commands.c: Another mutt_yesorno() change, in order to correctly - interpret a C-g. -@@ -2947,177 +3481,8 @@ - constants. Fixes a couple of cases in which C-g would be - mis-interpreted. - --2003-01-04 Werner Koch (Committed 2003-01-21, roessler.) -- -- Replaced the use of HAVE_PGP and HAVE_SMIME by a more readable -- and extendable solution. -- -- * pgplib.h: Moved enum pgp_ring and KEYFLAGS_* to -- * crypt.h: here. -- * smime.c (mutt_is_application_smime): Moved to -- * crypt.c (mutt_is_application_smime): here. -- * pgp.c (mutt_is_application_pgp): Moved to -- * crypt.c (mutt_is_application_pgp): here. -- * pgp.c (pgp_is_multipart_encrypted): Removed. Merged code with -- * crypt.c (mutt_is_multipart_encrypted): this. -- -- * mutt.h: Protect against double inclusion. -- -- * pgplib.h (struct pgp_keyinfo): Remove the typedef to pgp_key_t. -- * crypt.h (pgp_key_t): Declare the typedef here. NOTE: This is -- now a pointer. Changed all usages accordingly. -- -- * configure.in: Replace HAVE_PGP and HAVE_SMIME by the new -- CRYPT_BACKEND macros. Always include all OPS.*. -- (LIBOBJ): Replaced by AC_LIBOBJ as required by newer autoconfs. -- * Makefile.am (EXTRA_mutt_SOURCES): Move crypt.c to mutt_SOURCES. -- (mutt_SOURCES): Add cryptglue.c -- (EXTRA_DIST): Add crypt.h -- -- * pgp.h, pgplib.h, smime.h: Use the header only when the -- approriate backend has been configured. -- * pgp.c, pgpkey.c, smime.c: Build only if the approriate -- CRYPT_BACKEND_ macro is defined. -- * pgp.h, smime.h, global.h: Moved all variable declarations to -- global.h because they are now always defined. -- -- * sort.h: Always define PgpSortKey, although it does not belong to -- here. -- -- * keymap.h: Unconditionally include all PGP and SMIME stuff. -- * mutt.h: Ditto. -- * protos.h: Ditto. -- -- * init.h (HAVE_SMIME): Unconditionally include all crypto related -- definitions. Mark the doc entries with "(Crypto/PGP/SMIME only)". -- -- * globals.h: Replace gpg.h and smime.h by crypt.h. -- -- * functions.h: Always include all crypto commands. -- -- * copy.h: Unconditionally define the crypto related M_CM_ -- -- * pgplib.h: Move APPLICATION_PGP and PGP* to crypt.h and include -- it. -- * smime.h: Move APPLICATION_SMIME and SMIME* to crypt.h and -- include it. -- * mutt_crypt.h (ENCRYPT,SIGN,GOODSIGN, BADSIGN): Move to crypt.h. -- -- * crypt.c: Replaced pgp.h and smime.h header by crypt.h. Always -- include all functions but shortcut them depending on WITHCRYPTO. -- All over the place use WITHCRYPTO instead of ifdefs. Replaced all -- direct calls of the backend fucntions by twrapper functions -- defined in cryptglue.c -- (crypt_get_keys): Removed prototypes. -- * pgp.h (pgp_findKeys): New prototype. -- * smime.h (smime_findKeys): New prototype. -- * cryptglue.c: New. -- * crypt.h: New. -- * mutt_crypt.h: Moved all crypt_* prototypes to gcrypt.h. -- Unconditionally use this file. -- -- * init.c: Replaced pgp.h and smime.h header by crypt.h. -- (parse_set): Use WITHCRYPTO instead of ifdefs. -- (mutt_var_value_complete): Ditto. -- -- * sendlib.c: Replaced pgp.h and smime.h header by crypt.h. -- (write_as_text_part): Now one macro using WITHCRYPTO. -- (mutt_write_mime_body): Use WITHCRYPTO instead of ifdefs. -- (mutt_make_message_attach): Ditto. -- (mutt_write_fcc): Ditto. -- -- * send.c: Replaced pgp.h and smime.h header by crypt.h. -- (include_forward): Use WITHCRYPTO and validate passphrases for pgp -- and smime. -- (include_reply): Ditto. -- (generate_body): Use WITHCRYPTO instead of ifdefs. -- (ci_send_message): Ditto. -- -- * recvattach.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_gen_attach_list): Use WITHCRYPTO instead of ifdefs. -- (mutt_attach_display_loop): Ditto -- (mutt_view_attachments): Ditto. -- -- * postpone.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_get_postponed): Use WITHCRYPTO instead of ifdefs. -- (mutt_parse_crypt_hdr): Always include and use WITHCRYPTO instead -- of ifdefs. -- (mutt_prepare_template): Use WITHCRYPTO instead of ifdefs. -- -- * pop.c: Removed pgp.h and smime.h. -- (pop_fetch_message): Use WITHCRYPTO instead of ifdefs. -- -- * pattern.c: Replaced pgp.h and smime.h header by crypt.h. -- (Flags): Always include the crypto flags. -- (msg_search): Use WITHCRYPTO instead of ifdefs. -- (mutt_pattern_exec): Ditto. -- -- * parse.c: Removed pgp.h and smime.h. -- (mutt_parse_mime_message): Use WITHCRYPTO instead of ifdefs. -- -- * pager.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_pager): Use WITHCRYPTO instead of ifdefs. -- -- * mx.c: Removed smime.h and pgp.h. -- (mx_update_context): Use WITHCRYPTO instead of ifdefs. -- -- * muttlib.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_needs_mailcap): Use WITHCRYPTO. Note, that there used to be -- an error when PGP was not configured so that TYPEAPPLICATION was -- not recognized for SMIME. -- (mutt_is_text_part): Use WITHCRYPTO instead of ifdefs. -- -- * main.c: Include crypt.h. -- (show_version): Remove HAVE_PGP and HAVE_SMIME. Add -- CRYPT_BACKEND_CLASSIC_PGP, CRYPT_BACKEND_CLASSIC_SMIME. -- -- * keymap.c: Include crypt.h so that we can test WITHCRYPTO. -- (Menus): Always include pgp and smime. -- (km_init): Create smime and pgp bindings depending on WITHCRYPTO. -- (km_get_table): Return OpPgp depending on WITHCRYPTO. -- -- * hook.c (mutt_parse_hook): Use WITHCRYPTO instead of ifdefs. -- (mutt_crypt_hook): Always include. -- -- * headers.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_edit_headers): Use WITHCRYPTO instead of ifdefs -- -- * hdrline.c: Replaced pgp.h and smime.h header by crypt.h. -- (hdr_format_str): Use WITHCRYPTO. -- -- * handler.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_can_decode): Use WITHCRYPTO instead of ifdefs. -- (mutt_can_decode): Application/smime is now also checked when PGP -- support is not configured. -- (mutt_body_handler): Use WITHCRYPTO -- -- * curs_main.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_index_menu): Shortcut crypto only operations depending on -- WITHCRYPTO. -- -- * copy.c: Replaced pgp.h and smime.h header by crypt.h. -- (_mutt_copy_message): -- -- * compose.c: Replaced pgp.h and smime.h header by crypt.h. -- (enum): Always include HDR_CRYPT and HDR_CRYPTINFO. -- (redraw_crypt_lines): Always include this fnc but shortcut it -- depending on WITHCRYPT. Draw lines depending on the configured -- crypto support. -- (pgp_send_menu): Always include this one. Call wrapper functions. -- (smime_send_menu): Likewise. -- (draw_envelope): Use WITHCRYPTO instead of ifdefs. -- (mutt_compose_menu): Allow pgp/smime commands only when configured. -- -- * commands.c: Replaced pgp.h and smime.h header by crypt.h. -- (mutt_display_message,pipe_msg, _mutt_pipe_message) -- (set_copy_flags, mutt_save_message, mutt_edit_content_type) -- (_mutt_check_traditional_pgp): Use pgp wrapper. -- -- * attach.c (mutt_view_attachment): Removed HAVE_GPG and HAVE_SMIME -- and replaced by global variable WITHCRYPTO. Replaced pgp and -- smime header by crypt.h.x -- --2003-01-03 18:07:36 Thomas Roessler (roessler) -+2003-01-03 18:07:36 Thomas Roessler -+(roessler) - - * pgp.c: Detect in-line key material when checking for traditional - PGP messages. -@@ -3142,7 +3507,10 @@ - to the reply-to address (if present) or to the author's address - when there's no Reply-To header. - --2002-12-21 20:32:13 Thomas Roessler (roessler) -+2002-12-21 20:32:13 Thomas Roessler -+(roessler) -+ -+ * ChangeLog: ok, gotos suck. - - * curs_main.c: OK, Michael is right: Gotos suck. ;-) - -@@ -3158,7 +3526,8 @@ - - * po/pl.po: update - --2002-12-19 11:48:58 Thomas Roessler (roessler) -+2002-12-19 11:48:58 Thomas Roessler -+(roessler) - - * doc/manual.sgml.head, doc/muttrc.man.head: Improve the - documentation of pgp-hook/crypt-hook. -@@ -3173,19 +3542,21 @@ - - * po/fr.po: update - --2002-12-19 07:37:01 Thomas Roessler (roessler) -+2002-12-19 07:37:01 Thomas Roessler -+(roessler) - - * Makefile.am: Michael doesn't have $VISUAL set. - --2002-12-18 17:29:56 Sahil Tandon -+2002-12-18 17:29:56 Sahil Tandon (me) - -- * init.h: I found a small typo in the manual, specifically -- at this[1] URL. The description of the smart_wrap variable reads: -- "Controls the display of lines longer then the screen width in the -- internal pager." The word _then_ should be _than_ if I'm not -- mistaken. -+ * init.h: I found a small typo in the manual, specifically -+ at this[1] URL. The description of the smart_wrap -+ variable reads: "Controls the display of lines longer -+ then the screen width in the internal pager." The word -+ _then_ should be _than_ if I'm not mistaken. - - 2002-12-18 10:26:35 Thomas Roessler -+(roessler) - - * po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, - po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, -@@ -3200,21 +3571,22 @@ - * keymap.c: Make the messages from the what-key function - internationalizable. - -- * crypt.c, crypt.h, mutt_crypt.h, pgp.c, pgp.h, smime.c, -- smime.h: Rename crypt.h to mutt_crypt.h. -+ * crypt.c, crypt.h, mutt_crypt.h, pgp.c, pgp.h, smime.c, smime.h: -+ Rename crypt.h to mutt_crypt.h. - - * Makefile.am: cvs update ChangeLog before trying to update - it locally. - --2002-12-18 07:37:56 Roland Rosenfeld -+2002-12-18 07:37:56 Roland Rosenfeld (roessler) - - * po/de.po: update - --2002-12-17 13:45:16 Vincent Lefevre -+2002-12-17 13:45:16 Vincent Lefevre (roessler) - - * po/fr.po: update fr.po - - 2002-12-17 13:04:29 Thomas Roessler -+(roessler) - - * .cvsignore: Ignore some more files. - -@@ -3227,6 +3599,8 @@ - * build-release: Adopting the release-building script to the - new changelog process. - -+2002-12-17 10:37:24 roessler (roessler) -+ - * po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, - po/zh_TW.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, - po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/es.po, po/et.po, -@@ -3234,49 +3608,52 @@ - po/da.po, po/de.po, po/el.po, po/eo.po, reldate.h: automatic - post-release commit for mutt-1.5.3 - -+2002-12-17 09:50:26 Thomas Roessler -+(roessler) -+ - * OPS, curs_main.c, functions.h: Experimental: Introduce - {next,previous}-new-then-unread. These functions behave -- like {next,previous}-new as long as new messages are -- visible. When no new messages are visible any more, there's -- a fall-back to {next,prev}-unread. -+ like {next,previous}-new as long as new messages are visible. -+ When no new messages are visibuel any more, there's a fall-back -+ to {next,prev}-unread. - -- Memo to self: Impose a weekly quota on the use of goto -- statements. -+ Memo to self: Impose a weekly quota on the use of goto statements. - --2002-12-16 20:28:46 Edmund GRIMLEY EVANS -+2002-12-16 20:28:46 Edmund GRIMLEY EVANS (roessler) - - * handler.c, rfc2047.c, url.c: Fix #1424. - - 2002-12-16 17:59:51 Thomas Roessler -+(roessler) - - * pgp.c: Experimental short-cut code if the "image" of an address - under a pgp-hook looks like a hexadecimal key id. - --2002-12-13 15:53:36 David Shaw -+2002-12-13 15:53:36 David Shaw (roessler) - - * lib.c: Fixing Thomas' screw-up in mutt_concat_path. - --2002-12-13 11:00:44 René Clerc -+2002-12-13 11:00:44 René Clerc (roessler) - - * po/nl.po: update. - - 2002-12-11 22:47:57 Thomas Roessler -+(roessler) - - * muttlib.c, pgp.c, protos.h, send.c: Fix #1417; thanks to - Derek D. Martin for the excellent observation. - (In addition to the fix proper, some tracking of temporary files - is added to mutt's debugging output.) - --2002-12-11 22:23:42 Thomas Roessler -- - * crypt.c: Call endwin() before calling PGP for traditional - encryption. - --2002-12-11 15:51:57 Vincent Lefevre -+2002-12-11 15:51:57 Vincent Lefevre (roessler) - - * po/fr.po: update. - - 2002-12-11 15:20:21 Thomas Roessler -+(roessler) - - * browser.c, complete.c, hook.c, init.c, lib.c, lib.h: Herbert - Martin Dietze notes that -@@ -3284,7 +3661,7 @@ - for FCCs. The fix in this patch is to include a function named - mutt_concat_path which concatenates path elements, but avoids - the creation of double slashes. (These don't create problems -- when you're just accessing the file system, but apparently they -+ when you're just accessing the file system, but apparently thy - do cause problems with IMAP.) - - * imap/auth.c, imap/command.c, imap/imap.c, imap/imap.h, -@@ -3314,6 +3691,7 @@ - the search string. - - 2002-12-10 20:56:52 Thomas Roessler -+(roessler) - - * imap/command.c, imap/imap.c, imap/message.c, imap/utf7.c, - imap/util.c, score.c, send.c, sendlib.c, smime.c, thread.c, url.c, -@@ -3327,88 +3705,91 @@ - rfc2231.c, rfc822.c: Replace safe_free calls by the FREE macro. - - 2002-12-09 19:06:40 Thomas Roessler -+(roessler) - - * Makefile.am: Minor formatting fix. - -- * cvslog2changelog.pl: Change the ChangeLog format as -- suggested by Martin Michlmayer. -+ * cvslog2changelog.pl: Change the ChangeLog format as suggested -+ by Martin Michlmayer. - -- * send.c: Try to fix another obscure error in S/MIME -- auto-signing upon reply. -+ * send.c: Try to fix another obscure error in S/MIME auto-signing -+ upon reply. - - * rfc822.c: Experimental patch to fix #1318. - --2002/12/09 18:09:49 David Jardine -+2002-12-09 18:09:49 David Jardine (roessler) - -- * init.h: Documentation fix concerning %L in index_format. -- #1313. -+ * init.h: Documentation fix concerning %L in index_format. #1313. - --2002/12/09 18:05:54 David Shaw -+2002-12-09 18:05:54 David Shaw (roessler) - -- * mh.c, parse.c: Reduce the meaning of the mark_old option -- so it only controls whether new messages are marked as old -- when leaving the mailbox. -+ * mh.c, parse.c: Reduce the meaning of the mark_old option so -+ it only controls whether new messages are marked as old when -+ leaving the mailbox. - --2002/12/09 17:54:25 Jesus Climent -+2002-12-09 17:54:25 Jesus Climent -+(roessler) - - * po/es.po: Fix a typo. (#1392) - --2002/12/09 17:52:50 Anders Helmersson -+2002-12-09 17:52:50 Anders Helmersson -+(roessler) - -- * addrbook.c, curs_lib.c, protos.h, query.c: Fix #1390. -- Based on a patch submitted earlier by Edmund Grimley Evans. -+ * addrbook.c, curs_lib.c, protos.h, query.c: Fix #1390. Based on -+ a patch submitted earlier by Edmund Grimley Evans. - --2002/12/09 17:44:54 Thomas Roessler -+2002-12-09 17:44:54 roessler (roessler) - - * PATCHES: Ups. - --2002/12/09 17:44:28 Michael Elkins -+2002-12-09 17:44:28 Michael Elkins (roessler) - - * OPS, PATCHES, curs_main.c, functions.h, keymap.c, keymap.h, - menu.c: This patch adds two features to mutt: - - - you can now specify the octal code of a key in a bind or -- macro function, using the syntax . Eg, bind index -- <541> show-version This allows you to bind to a function -- key for which Mutt doesn't have a friendly name associated -- with it. -- -- - adds a what-key function which allows you to press a key -- and have mutt show you the decimal/octal value. (not -- bound to anything by default) -+ macro function, using the syntax . Eg, bind index <541> -+ show-version This allows you to bind to a function key for -+ which Mutt doesn't have a friendly name associated with it. -+ -+ - adds a what-key function which allows you to press a key and -+ have mutt show you the decimal/octal value. (not bound to -+ anything by default) - --2002/12/09 16:07:24 Toomas Soome -+2002-12-09 16:07:24 Toomas Soome (roessler) - - * po/et.po: update. - --2002/12/09 13:30:02 Thomas Roessler -+2002-12-09 13:30:02 Thomas Roessler -+(roessler) - -- * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, -- po/uk.po, po/zh_CN.po, po/zh_TW.po, po/gl.po, po/hu.po, -- po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, -- po/pl.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/ca.po, -- po/cs.po, po/da.po, po/de.po, po/el.po, compose.c: Try to -- fix a localization issue identified by Pawel Dzienkonski -- (#1410). Side effect: All translations will need an update -- of the S/MIME key translations. -+ * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, -+ po/zh_CN.po, po/zh_TW.po, po/gl.po, po/hu.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/eo.po, -+ po/es.po, po/et.po, po/fr.po, po/ca.po, po/cs.po, po/da.po, -+ po/de.po, po/el.po, compose.c: Try to fix a localization issue -+ identified by Pawel Dzienkonski (#1410). Side effect: All -+ translations will need an update of the S/MIME key translations. - --2002/12/09 11:20:14 Pawel Dziekonski -+2002-12-09 11:20:14 Pawel Dziekonski (roessler) - - * po/pl.po: update. - --2002/12/08 23:14:43 ph04169@cc.uoi.gr -+2002-12-08 23:14:43 ph04169@cc.uoi.gr (roessler) - - * po/el.po: update. - --2002/12/08 16:11:35 TAKAHASHI Tamotsu -+2002-12-08 16:11:35 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update. - --2002/12/08 15:10:59 Roland Rosenfeld -+2002-12-08 15:10:59 Roland Rosenfeld (roessler) - - * po/de.po: Update. - --2002/12/07 19:19:34 Thomas Roessler -+2002-12-07 19:19:34 Thomas Roessler -+(roessler) - - * Makefile.am: yet another one. - -@@ -3418,951 +3799,1072 @@ - update ChangeLog as part of the commit process. - - * doc/Makefile.in, ChangeLog, ChangeLog.old, Makefile.am, -- cvslog2changelog.pl, mkchangelog.sh: Change the style of -- ChangeLog: Now, the actual patch submitter's name is -- extracted from the commit message and used for the change -- log. For the moment, the date format doesn't match the one -- in the old changelog. If you want to fix this, submit a -- patch to cvslog2changelog.pl. ;-) -+ cvslog2changelog.pl, mkchangelog.sh: Change the style -+ of ChangeLog: Now, the actual patch submitter's name is -+ extracted from the commit message and used for the change log. -+ For the moment, the date format doesn't match the one in the -+ old changelog. If you want to fix this, submit a patch to -+ cvslog2changelog.pl. ;-) - --2002/12/07 08:55:59 Vincent Lefevre -+2002-12-07 08:55:59 Vincent Lefevre (roessler) - - * po/fr.po: update - --2002/12/07 08:55:23 Paul Walker -+2002-12-07 08:55:23 Paul Walker (roessler) - - * pgppubring.c: Fix a compilation warning. - --2002/12/07 08:53:21 Thomas Roessler -+2002-12-07 08:53:21 Thomas Roessler -+(roessler) - -- * mh.c, mutt.h, muttlib.c: Gracefully handle unknown maildir flags. -+ * mh.c, mutt.h, muttlib.c: Gracefully handle unknown maildir -+ flags. - --2002/12/06 11:30:08 Thomas Roessler -+2002-12-06 11:30:08 Thomas Roessler -+(roessler) - - * Makefile.am: Run check_sec.sh before committing. - --2002/12/06 11:28:30 Brendan Cully -+2002-12-06 11:28:30 Brendan Cully (roessler) -+ -+ * m4/gettext.m4, m4/iconv.m4, build-release, configure.in: -+ autoconf cleanup. - -- * m4/gettext.m4, m4/iconv.m4, build-release, configure.in: autoconf cleanup. -+2002-12-06 11:14:13 roessler (roessler) - --2002/12/06 11:14:13 Thomas Roessler -+ * po/zh_CN.po, po/zh_TW.po, po/uk.po, po/ru.po, po/sk.po, -+ po/sv.po, po/tr.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, -+ po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, -+ po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/da.po, -+ po/de.po, VERSION, po/ca.po, po/cs.po, reldate.h, ChangeLog: -+ automatic post-release commit for mutt-1.5.2 - -- * po/zh_CN.po, po/zh_TW.po, po/uk.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/da.po, po/de.po, VERSION, po/ca.po, po/cs.po, reldate.h, ChangeLog: automatic post-release commit for mutt-1.5.2 -+2002-12-06 10:56:30 Thomas Roessler -+(roessler) - -- * curs_lib.c, pgppubring.c: Fixing a number of traditional malloc calls which have made their -- way into the code. -+ * curs_lib.c, pgppubring.c: Fixing a number of traditional malloc -+ calls which have made their way into the code. - -- * build-release: Don't post announcements automatically for the moment. -+ * build-release: Don't post announcements automatically for -+ the moment. - --2002/12/05 22:30:02 Michael Elkins -+2002-12-05 22:30:02 Michael Elkins (roessler) - - * doc/manual.sgml.head: Fix #1398. - --2002/11/25 14:16:47 Lars Hecking -+2002-11-25 14:16:47 Lars Hecking (roessler) - -- * sendlib.c, ChangeLog, INSTALL, charset.h, configure.in: The noiconv patch. -+ * sendlib.c, ChangeLog, INSTALL, charset.h, configure.in: The -+ noiconv patch. - --2002/11/14 08:12:30 Michael Elkins -+2002-11-14 08:12:30 Michael Elkins (roessler) - - * curs_lib.c: Fix #1388. - --2002/11/13 10:10:52 Thomas Roessler -+2002-11-13 10:10:52 Thomas Roessler -+(roessler) - - * main.c: A description of -A was lacking from the help string. - -- * doc/manual.sgml.head, doc/mutt.man, main.c, protos.h: Add a new command line option -A which is used to expand aliases. -+ * doc/manual.sgml.head, doc/mutt.man, main.c, protos.h: Add a -+ new command line option -A which is used to expand aliases. - -- * keymap.c: Add a safeguard #ifdef for the KEY_BTAB entry. Suggested by Thomas -- Dickey. -+ * keymap.c: Add a safeguard #ifdef for the KEY_BTAB entry. -+ Suggested by Thomas Dickey. - --2002/11/12 09:20:30 Michael Elkins -+2002-11-12 09:20:30 Michael Elkins (roessler) - - * keymap.c: Tell mutt about the back-tab key (shift tab). - --2002/11/12 09:20:09 Thomas Roessler -+2002-11-12 09:20:09 Thomas Roessler -+(roessler) - - * Makefile.am: ups. - - * Makefile.am: Add "make pclean" in order to clean up PATCHES. - --2002/11/12 08:55:57 TAKAHASHI Tamotsu -+2002-11-12 08:55:57 TAKAHASHI Tamotsu -+(roessler) - - * po/ja.po: update - --2002/11/12 08:41:18 Thomas Roessler -+2002-11-12 08:41:18 Thomas Roessler -+(roessler) - -- * README: Add an explicit note that CVS doesn't work from ftp.mutt.org any more. -+ * README: Add an explicit note that CVS doesn't work from -+ ftp.mutt.org any more. - --2002/11/12 08:35:34 "Yasuhiro Matsumoto" -+2002-11-12 08:35:34 "Yasuhiro Matsumoto" -+(roessler) - - * mbyte.c: cp932 should be treated like shift_jis. - --2002/11/12 08:20:11 Nathan Dushman -+2002-11-12 08:20:11 Nathan Dushman (roessler) - -- * imap/auth_gss.c, imap/auth_sasl.c, configure.in, main.c, mutt_sasl.c, mutt_sasl.h: Hi - this is a patch against mutt-1.4 to use version 2 of the Cyrus -- SASL library; all changes are ifdef'd so as not to break SASLv1 -- support. This includes a patch to configure.in to allow the choice -- between v1 and v2, but someone with a better understanding of -- autoconf should double-check it. -+ * imap/auth_gss.c, imap/auth_sasl.c, configure.in, main.c, -+ mutt_sasl.c, mutt_sasl.h: Hi - this is a patch against mutt-1.4 -+ to use version 2 of the Cyrus SASL library; all changes are -+ ifdef'd so as not to break SASLv1 support. This includes a patch -+ to configure.in to allow the choice between v1 and v2, but someone -+ with a better understanding of autoconf should double-check it. - --2002/11/12 08:00:51 Michael Elkins -+2002-11-12 08:00:51 Michael Elkins (roessler) - - * handler.c: Actually commit patch-1.5.1.me.long_qp.2. - - * mailbox.h, mh.c, mx.c: The maildir_time patch. - --2002/11/11 21:17:25 Thomas Roessler -+2002-11-11 21:17:25 Thomas Roessler -+(roessler) - -- * muttbug.sh.in: You shall not use CVS to distribute test versions. -+ * muttbug.sh.in: You shall not use CVS to distribute test -+ versions. - - * muttbug.sh.in: more fixes. - - * muttbug.sh.in: Add some rpm-related intelligence to flea. - -- * muttbug.sh.in: Fix flea's interaction with bug(1) on Debian systems. -+ * muttbug.sh.in: Fix flea's interaction with bug(1) on Debian -+ systems. - - * PATCHES: Clean up the patch list. - --2002/11/11 20:32:30 Michael Elkins -+2002-11-11 20:32:30 Michael Elkins (roessler) - -- * PATCHES, hdrline.c: Fix #485: Make %z work like %Z inside of %{} in $index_format. -+ * PATCHES, hdrline.c: Fix #485: Make %z work like %Z inside of -+ %{} in $index_format. - -- * PATCHES, copy.c: Fix #1379 - update the total mailbox size when an attachment is -- deleted. -+ * PATCHES, copy.c: Fix #1379 - update the total mailbox size -+ when an attachment is deleted. - -- * PATCHES, curs_main.c, menu.c, pager.c: Fix #1310; redraw problems. -+ * PATCHES, curs_main.c, menu.c, pager.c: Fix #1310; redraw -+ problems. - - * doc/manual.sgml.head, init.h: Fix #1306. - - * send.c: Fix #1364. - --2002/11/11 19:50:23 Steve Kennedy -+2002-11-11 19:50:23 Steve Kennedy (roessler) - - * pgp.c: Fix memory leak in the PGP code. - --2002/11/11 19:46:29 Paul Walker -+2002-11-11 19:46:29 Paul Walker (roessler) - - * commands.c, protos.h, sendlib.c: Fix #718. - --2002/11/11 19:38:30 Thomas Roessler -+2002-11-11 19:38:30 Thomas Roessler -+(roessler) - - * sendlib.c: Fix #1366. - --2002/11/11 19:24:24 Martin Siegert -+2002-11-11 19:24:24 Martin Siegert (roessler) - - * mx.c: Fix IMAP moving; #1367. - --2002/11/11 19:22:17 rene@clerc.nl -+2002-11-11 19:22:17 rene@clerc.nl (roessler) - -- * send.c: Another S/MIME ifdef misses and causes compilation problems. -+ * send.c: Another S/MIME ifdef misses and causes compilation -+ problems. - --2002/11/11 19:21:24 Michael Elkins -+2002-11-11 19:21:24 Michael Elkins (roessler) - - * init.h: patch-1.5.1-me.status_doc.2 - --2002/11/11 19:16:11 Thomas Roessler -+2002-11-11 19:16:11 Thomas Roessler -+(roessler) -+ -+ * alias.c, init.c, protos.h: patch-1.5-tlr.alias-parse.1 - -+ extension of patch-1.5.1-me.aliascheck.1 - -- * alias.c, init.c, protos.h: patch-1.5-tlr.alias-parse.1 - extension of patch-1.5.1-me.aliascheck.1 -- - This patch catches the same kind of bad alias names caught by - Michael's patch. There are some extensions: -- -- 1. Mutt makes sure that it doesn't _suggest_ bad names to the user. -- 2. If a name is bad, the user is informed, and may elect to fix the -+ -+ 1. Mutt makes sure that it doesn't _suggest_ bad names to -+ the user. 2. If a name is bad, the user is informed, and may -+ elect to fix the - name. In this case, mutt will automatically suggest a fixed - version. - 3. If the user insists in the bad name, it's written into the - aliases file with proper quoting. - 4. When mutt parses the aliases file, it now uses the normal -- tokenizer routines in order to properly handle quoted alias names. -+ tokenizer routines in order to properly handle quoted alias -+ names. - --2002/11/11 18:36:25 Michael Elkins -+2002-11-11 18:36:25 Michael Elkins (roessler) - -- * handler.c: patch-1.5-me.long_qp.2 (#1371) - fix truncation with overly long Q-P -- encoded lines. -+ * handler.c: patch-1.5-me.long_qp.2 (#1371) - fix truncation -+ with overly long Q-P encoded lines. - --2002/10/22 21:24:07 René Clerc -+2002-10-22 21:24:07 René Clerc (roessler) - - * commands.c: Add some missing #ifdefs. - --2002/10/22 21:23:20 Michael Elkins -+2002-10-22 21:23:20 Michael Elkins (roessler) - - * init.h, recvattach.c: Documentation fix; #1326 - --2002/10/22 21:22:45 René Clerc -+2002-10-22 21:22:45 René Clerc (roessler) - - * send.c: Another crypt_reply fix. - --2002/10/22 21:20:07 Michael Elkins -+2002-10-10 09:50:03 René Clerc (roessler) - -- * contrib/sample.muttrc: #1357 -+ * send.c: Make sure that crypt_reply replies with the same type, -+ despite a possible S/MIME default. - --2002/10/10 09:50:03 René Clerc -+2002-10-10 09:43:29 Michael Elkins (roessler) - -- * send.c: Make sure that crypt_reply replies with the same type, despite a -- possible S/MIME default. -+ * doc/manual.sgml.head, doc/manual.sgml.head: Document escaping -+ rules for regular expressions (#1351). - --2002/10/10 09:43:29 Michael Elkins -- -- * doc/manual.sgml.head, doc/manual.sgml.head: Document escaping rules for regular expressions (#1351). -- -- * pager.c: Fix header coloring, so there is no difference between ncurses and -- slang. -+ * pager.c: Fix header coloring, so there is no difference between -+ ncurses and slang. - - * init.h: PGP documentation glitch. - --2002/10/10 09:33:33 Paul Walker -+2002-10-10 09:33:33 Paul Walker (roessler) - - * doc/manual.sgml.head: Fix #1340 (documentation) - --2002/10/10 09:33:05 Michael Elkins -+2002-10-10 09:33:05 Michael Elkins (roessler) -+ -+ * pager.c: Jeremy Lin wrote: > When I search with / and get -+ a match, doing '/\r' doesn't move to the next > match. This -+ behavior is unlike the less pager, and is rather useless, IMHO. - -- * pager.c: Jeremy Lin wrote: -- > When I search with / and get a match, doing '/\r' doesn't move to the next -- > match. This behavior is unlike the less pager, and is rather useless, IMHO. -- - Try the attached patch. - --2002/09/23 12:08:43 Thomas Roessler -+2002-09-23 12:08:43 Thomas Roessler -+(roessler) - -- * buffy.c: A variant of buffy notification. Note: If you folks don't like -- this, we can return to the old version. -+ * buffy.c: A variant of buffy notification. Note: If you folks -+ don't like this, we can return to the old version. - --2002/09/09 21:48:19 Rudi Chiarito -+2002-09-09 21:48:19 Rudi Chiarito (roessler) - -- * OPS, browser.c, buffy.c, curs_main.c, functions.h, pager.c, protos.h: Add a buffy-list function, and display more information when new -- mail arrives. With some modifications from tlr. -+ * OPS, browser.c, buffy.c, curs_main.c, functions.h, pager.c, -+ protos.h: Add a buffy-list function, and display more information -+ when new mail arrives. With some modifications from tlr. - --2002/09/09 21:19:08 Michael Elkins -+2002-09-09 21:19:08 Michael Elkins (roessler) - - * mh.c: Fix #1321. - - * mh.c: [STABLE] Fix #1321. - --2002/09/09 21:04:03 Tony Leneis -+2002-09-09 21:04:03 Tony Leneis (roessler) - - * signal.c: Tru64 Unix portability patch. - - * signal.c: [STABLE] Tru64 Unix portability patch. - --2002/09/09 21:02:05 Vincent Lefevre -+2002-09-09 21:02:05 Vincent Lefevre (roessler) - - * doc/manual.sgml.head: Fixing a typo. - --2002/09/09 20:53:46 Thomas Roessler -+2002-09-09 20:53:46 Thomas Roessler -+(roessler) - -- * postpone.c: Fixing #1300. Noted by David Shaw . -+ * postpone.c: Fixing #1300. Noted by David Shaw -+ . - -- * postpone.c: Fix #1299; noted by David Shaw . -+ * postpone.c: Fix #1299; noted by David Shaw -+ . - --2002/09/09 20:20:20 Michael Elkins -+2002-09-09 20:20:20 Michael Elkins (roessler) - - * init.h, mutt.h, send.c: Introducing $forward_edit. - -- * send.c: #265: -- -- > Suppose a user wants to fcc to a file (e.g., /a/b/c) but accidentally -- > typed a = before the path name. Mutt will fail to find the =/a/b/c -- > folder, display the error message and beep, but immediately erase the -- > error message; the mail will be sent even though the fcc failed. (The -- > same can be accomplished by accidentally mistyping other parts of the -- > path name.) On local systems where screen update is quick, the user -- > might not notice the error message at all. -- > -- > The problem with this behaviour is that the user might have no chance -- > to read the error message if the screen update is quick enough; as a -- > result (s)he might not notice that the fcc failed. -- > -- > A related thing (probably can't be classified as a problem) is that if -- > fcc fails, the user probably don't want to send the mail out because -- > if fcc is requested (s)he probably very much want to keep a copy of -- > the sent mail. -- -- Try the following patch. We keep track of whether or not the fcc -- failed with a local var `fcc_error' and perform the same behavior as -- if the actual send of the message failed (without really sending) -- when the FCC fails, thus giving the user a chance to correct the -- error. -- -- * globals.h, init.h, send.c: Introduce $content_type. There's one change against Michael's -- patch, in how the "format=flowed" parameter is used. -+ * globals.h, init.h, send.c: Introduce $content_type. There's -+ one change against Michael's patch, in how the "format=flowed" -+ parameter is used. - --2002/09/09 20:04:45 Vincent Lefevre -+2002-09-09 20:04:45 Vincent Lefevre (roessler) - - * history.c: [STABLE] Fixing history classes. - - * history.c: Fixing history classes. - --2002/09/09 19:56:25 Armin Wolfermann -+2002-09-09 19:56:25 Armin Wolfermann (roessler) - -- * mh.c: when doing the second parsing pass on a maildir, mutt doesn't delete -- the fake HEADER struct if the file is unreadable. With this fix -- unreadable files get silently ignored (like in the MH case). -+ * mh.c: when doing the second parsing pass on a maildir, -+ mutt doesn't delete the fake HEADER struct if the file is -+ unreadable. With this fix unreadable files get silently ignored -+ (like in the MH case). - --2002/09/09 19:55:01 "TAKAHASHI, Tamotsu" -+2002-09-09 19:55:01 "TAKAHASHI, Tamotsu" -+(roessler) - - * po/ja.po: Update. - --2002/09/09 19:53:24 Michael Elkins -+2002-09-09 19:53:24 Michael Elkins (roessler) - -- * editmsg.c: Fixing #1149: Truncate files used for editing messages. -+ * editmsg.c: Fixing #1149: Truncate files used for editing -+ messages. - --2002/09/09 19:29:26 Nicolas Rachinsky -+2002-09-09 19:29:26 Nicolas Rachinsky -+(roessler) - -- * doc/manual.sgml.head, doc/muttrc.man.head, buffy.c, buffy.h, init.h: An unmailboxes command. #1311. -+ * doc/manual.sgml.head, doc/muttrc.man.head, buffy.c, buffy.h, -+ init.h: An unmailboxes command. #1311. - --2002/09/09 19:24:54 Michael Elkins -+2002-09-09 19:24:54 Michael Elkins (roessler) - - * attach.c: Fixing #1330. - - * attach.c: [STABLE] Fixing #1330. - --2002/08/09 07:01:11 Thomas Roessler -+2002-08-09 07:01:11 Thomas Roessler -+(roessler) - -- * doc/muttrc.man.head: Document unalternative_order in the manual page. -+ * doc/muttrc.man.head: Document unalternative_order in the -+ manual page. - --2002/08/09 06:58:37 Michael Elkins -+2002-08-09 06:58:37 Michael Elkins (roessler) - -- * doc/manual.sgml.head, init.c, init.h: The following patch adds the `unalternative_order' command. It also -- allows using "*" more generically in un-commands which use -- parse_unlists(). -+ * doc/manual.sgml.head, init.c, init.h: The following patch -+ adds the `unalternative_order' command. It also allows using -+ "*" more generically in un-commands which use parse_unlists(). - --2002/08/05 17:25:05 Michael Elkins -+2002-08-05 17:25:05 Michael Elkins (roessler) - -- * pgpewrap.c, pgppubring.c, pgpewrap.c, pgppubring.c: Error handling fixes. -+ * pgpewrap.c, pgppubring.c, pgpewrap.c, pgppubring.c: Error -+ handling fixes. - --2002/07/26 08:24:01 Michael Elkins -+2002-07-26 08:24:01 Michael Elkins (roessler) - -- * doc/manual.sgml.head: Documentation for reply-hook. Another patch (for the manual page) -- would be most welcome. ;-)) -+ * doc/manual.sgml.head: Documentation for reply-hook. Another -+ patch (for the manual page) would be most welcome. ;-)) - -- * curs_lib.c: The attached patch fixes mutt_yesorno() so that the question will be -- truncated enough to always fit in the default answer string. The -- size is calculated on the fly so that there is no artificial -- truncation. -+ * curs_lib.c: The attached patch fixes mutt_yesorno() so that the -+ question will be truncated enough to always fit in the default -+ answer string. The size is calculated on the fly so that there -+ is no artificial truncation. - --2002/07/24 09:46:58 TAKIZAWA Takashi -+2002-07-24 09:46:58 TAKIZAWA Takashi (roessler) - -- * mutt.h, mutt.h: The attached patch sets MB_LEN_MAX to 16, which is MB_LEN_MAX value -- on glibc-2.2. It works only with --without-wc-funcs switch. It may -- be applied to mutt-1.4 and mutt-1.5.1. -+ * mutt.h, mutt.h: The attached patch sets MB_LEN_MAX to 16, -+ which is MB_LEN_MAX value on glibc-2.2. It works only with -+ --without-wc-funcs switch. It may be applied to mutt-1.4 and -+ mutt-1.5.1. - --2002/07/24 09:37:41 Lars Hecking -+2002-07-24 09:37:41 Lars Hecking (roessler) - -- * configure.in, configure.in: Fix a quoting sloppiness. Noted by Vincent Lefevre. -+ * configure.in, configure.in: Fix a quoting sloppiness. Noted by -+ Vincent Lefevre. - --2002/07/24 09:33:59 Thomas Roessler -+2002-07-24 09:33:59 Thomas Roessler -+(roessler) - - * browser.c, browser.c: Fixing #1282. An off-by-one error. :-/ - --2002/07/24 09:20:22 Michael Elkins -+2002-07-24 09:20:22 Michael Elkins (roessler) - -- * mutt.h, send.c, hook.c, init.h: reply-hook. Documentation still needed. -+ * mutt.h, send.c, hook.c, init.h: reply-hook. Documentation -+ still needed. - --2002/07/24 09:06:06 Vincent Lefevre -+2002-07-24 09:06:06 Vincent Lefevre (roessler) - - * po/fr.po: update. - --2002/07/24 08:41:31 Michael Elkins -+2002-07-24 08:41:31 Michael Elkins (roessler) - -- * doc/mutt.man, compose.c, editmsg.c, init.c, init.h, attach.c, doc/mutt.man, compose.c, editmsg.c, init.c, init.h, attach.c: Fix $editor and $visual. Based on an earlier patch from Edmund -+ * doc/mutt.man, compose.c, editmsg.c, init.c, init.h, attach.c, -+ doc/mutt.man, compose.c, editmsg.c, init.c, init.h, attach.c: -+ Fix $editor and $visual. Based on an earlier patch from Edmund - Grimley Evans. - --2002/07/19 19:23:21 Michael Elkins -+2002-07-19 19:23:21 Michael Elkins (roessler) - - * doc/manual.sgml.head: Another documentation patch. - --2002/07/17 12:48:38 Rocco Rutte -+2002-07-17 12:48:38 Rocco Rutte -+(roessler) -+ -+ * sendlib.c: * Thomas Roessler [02-07-08 10:14:53 +0200] -+ wrote: > * sendlib.c, 3.12 -> 3.13 > From: Rocco Rutte -+ -+ -+ > Make encode_from a bit more aggressive, by also catching a -+ 'f' in > the beginning of a line. - -- * sendlib.c: * Thomas Roessler [02-07-08 10:14:53 +0200] wrote: -- > * sendlib.c, 3.12 -> 3.13 -- > From: Rocco Rutte -- -- > Make encode_from a bit more aggressive, by also catching a 'f' in -- > the beginning of a line. -- - 'Catch' is good but also to encode it is better. It may have -- been too late (sorry for that) so I fixed it. I don't know -- why the current source only escapes lines that actually -- begin with 'from' or 'From' followed by some text. I think -- that escaping 'from' or 'From' on a single line should be -- done, too. -- -+ been too late (sorry for that) so I fixed it. I don't know why -+ the current source only escapes lines that actually begin with -+ 'from' or 'From' followed by some text. I think that escaping -+ 'from' or 'From' on a single line should be done, too. -+ - Not a big deal, anyways. - --2002/07/16 07:28:11 Michael Elkins -+2002-07-16 07:28:11 Michael Elkins (roessler) - - * main.c, main.c: Update copyright notices. - --2002/07/07 19:33:50 Cedric Duval -+2002-07-07 19:33:50 Cedric Duval (roessler) - - * doc/manual.sgml.head, doc/mutt.man, init.h: Documentation fixes. - --2002/07/07 19:29:05 "TAKAHASHI, Tamotsu" -+2002-07-07 19:29:05 "TAKAHASHI, Tamotsu" -+(roessler) - - * doc/manual.sgml.head: Dcumentation fixes. - --2002/07/07 19:23:22 Cedric Duval -+2002-07-07 19:23:22 Cedric Duval (roessler) - - * doc/manual.sgml.head, doc/mutt.man, init.h: Documentation fixes. - --2002/07/07 19:22:19 Rocco Rutte -+2002-07-07 19:22:19 Rocco Rutte -+(roessler) - -- * sendlib.c: Make encode_from a bit more aggressive, by also catching a 'f' in -- the beginning of a line. -+ * sendlib.c: Make encode_from a bit more aggressive, by also -+ catching a 'f' in the beginning of a line. - --2002/07/07 19:13:03 Velko Hristov -+2002-07-07 19:13:03 Velko Hristov -+(roessler) - - * po/bg.po: Update. - --2002/07/07 19:11:15 Jeremy Blosser -+2002-07-07 19:11:15 Jeremy Blosser -+(roessler) - - * init.h: Add unauto_view to the stable branch. A one-liner. - --2002/06/28 19:52:31 Michael Elkins -+2002-06-28 19:52:31 Michael Elkins (roessler) - -- * doc/manual.sgml.head, doc/manual.sgml.head: Documentation fix (#271). -+ * doc/manual.sgml.head, doc/manual.sgml.head: Documentation fix -+ (#271). - --2002/06/18 10:03:52 (automatic) -+2002-06-18 10:03:52 (automatic) (roessler) - -- * po/zh_TW.po, po/tr.po, po/uk.po, po/zh_CN.po, po/sv.po, po/sk.po, po/ru.po, po/pt_BR.po, po/nl.po, po/pl.po, po/ja.po, po/ko.po, po/lt.po, po/it.po, po/gl.po, po/hu.po, po/id.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/el.po, po/da.po, po/de.po, po/ca.po, po/cs.po: "make update-po" -+ * po/zh_TW.po, po/tr.po, po/uk.po, po/zh_CN.po, po/sv.po, -+ po/sk.po, po/ru.po, po/pt_BR.po, po/nl.po, po/pl.po, po/ja.po, -+ po/ko.po, po/lt.po, po/it.po, po/gl.po, po/hu.po, po/id.po, -+ po/eo.po, po/es.po, po/et.po, po/fr.po, po/el.po, po/da.po, -+ po/de.po, po/ca.po, po/cs.po: "make update-po" - --2002/06/18 10:02:44 several submitters -+2002-06-18 10:02:44 several submitters (roessler) - - * po/ca.po: Adding a BG translation. Update for CA. - --2002/06/18 10:02:43 Thomas Roessler -+2002-06-18 10:02:43 roessler (roessler) - -- * po/bg.po: branches: 1.1.2; -- file bg.po was initially added on branch mutt-1-4-stable. -+ * po/bg.po: branches: 1.1.2; file bg.po was initially added on -+ branch mutt-1-4-stable. - --2002/06/18 10:02:43 several submitters -+2002-06-18 10:02:43 several submitters (roessler) - - * po/bg.po: Adding a BG translation. Update for CA. - - * configure.in: Adding a BG translation. - --2002/06/18 09:53:12 Michael Elkins -+2002-06-18 09:53:12 Michael Elkins (roessler) - -- * init.c, init.c: The string used to store the commmand for a backtic expansion in the -- muttrc was not free'd if the command failed for some reason. -+ * init.c, init.c: The string used to store the commmand for a -+ backtic expansion in the muttrc was not free'd if the command -+ failed for some reason. -+ -+2002-06-18 09:52:13 David Champion (roessler) -+ -+ * m4/gssapi.m4: Okay, two bugs here. One's an oversight of mine -+ in my previous patch, where I tried to use "[hH]" as Bourne code -+ while m4 had quoting set to ([, ]) -- this probably makes mutt -+ mis-detect Heimdal after all. - --2002/06/18 09:52:13 David Champion -- -- * m4/gssapi.m4: Okay, two bugs here. One's an oversight of mine in my previous patch, -- where I tried to use "[hH]" as Bourne code while m4 had quoting set to -- ([, ]) -- this probably makes mutt mis-detect Heimdal after all. -- - The other is not mine (i.e., it's in cvs now) and it makes mutt -- overstrike $LIBS if Heimdal or MIT Kerberos is detected. This is a -- problem for anyone who needs -lnsl -lsocket, in particular. I was -- fixing -- this by hand during late 1.3.x releases, as I didn't have time to -- track -- it down.... -- -+ overstrike $LIBS if Heimdal or MIT Kerberos is detected. This is -+ a problem for anyone who needs -lnsl -lsocket, in particular. I -+ was fixing this by hand during late 1.3.x releases, as I didn't -+ have time to track it down.... -+ - Here's a patch against the current (unpatched) 1.5 cvs copy of -- m4/gssapi.m4. It probably should go into both branches. Sorry for the -- repeats. -+ m4/gssapi.m4. It probably should go into both branches. Sorry -+ for the repeats. - --2002/06/06 23:13:54 Michael Elkins -+2002-06-06 23:13:54 Michael Elkins (roessler) - - * color.c: Fix #1230. - --2002/06/06 12:22:05 Will Fiveash -+2002-06-06 12:22:05 Will Fiveash (roessler) - - * init.h, init.h: Fix a couple of compile-time warnings. - --2002/05/31 16:59:39 Edmund GRIMLEY EVANS -+2002-05-31 16:59:39 Edmund GRIMLEY EVANS (roessler) - -- * charset.c, charset.h, sendlib.c, charset.c, charset.h, sendlib.c: Fix charset-hook. -+ * charset.c, charset.h, sendlib.c, charset.c, charset.h, -+ sendlib.c: Fix charset-hook. - --2002/05/31 16:45:49 Lars Hecking -+2002-05-31 16:45:49 Lars Hecking (roessler) - -- * m4/iconv.m4, INSTALL, charset.h, configure.in: The noiconv patch. Should probably have been in 1.4. -+ * m4/iconv.m4, INSTALL, charset.h, configure.in: The noiconv -+ patch. Should probably have been in 1.4. - --2002/05/30 12:15:02 Thomas Roessler -+2002-05-30 12:15:02 Thomas Roessler -+(roessler) - -- * rfc822.c: Properly handle empty addresses (<>) when they show up in mail -- headers. The approach taken is to store this address as <@>, and to -- check this special case when printing an address. -+ * rfc822.c: Properly handle empty addresses (<>) when they show -+ up in mail headers. The approach taken is to store this address -+ as <@>, and to check this special case when printing an address. - --2002/05/29 09:31:51 Thomas Roessler -+2002-05-29 09:31:51 roessler (roessler) - -- * po/zh_CN.po, po/zh_TW.po, po/uk.po, po/tr.po, po/sk.po, po/sv.po, po/pl.po, po/pt_BR.po, po/ru.po, po/ko.po, po/lt.po, po/nl.po, po/it.po, po/ja.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/eo.po, po/es.po, po/et.po, po/da.po, po/de.po, po/el.po, VERSION, po/ca.po, po/cs.po, reldate.h, ChangeLog: automatic post-release commit for mutt-1.4 -+ * po/zh_CN.po, po/zh_TW.po, po/uk.po, po/tr.po, po/sk.po, -+ po/sv.po, po/pl.po, po/pt_BR.po, po/ru.po, po/ko.po, po/lt.po, -+ po/nl.po, po/it.po, po/ja.po, po/fr.po, po/gl.po, po/hu.po, -+ po/id.po, po/eo.po, po/es.po, po/et.po, po/da.po, po/de.po, -+ po/el.po, VERSION, po/ca.po, po/cs.po, reldate.h, ChangeLog: -+ automatic post-release commit for mutt-1.4 - --2002/05/29 09:28:33 Roland Rosenfeld -+2002-05-29 09:28:33 Roland Rosenfeld (roessler) - - * po/de.po: update. - --2002/05/29 09:27:46 Ronny Haryanto -+2002-05-29 09:27:46 Ronny Haryanto (roessler) - - * po/id.po: update - --2002/05/28 09:07:29 Michael Elkins -+2002-05-28 09:07:29 Michael Elkins (roessler) - - * mx.h, postpone.c: Fix some warnings noted by Vincent Lefevre. - --2002/05/21 07:28:28 Edmund GRIMLEY EVANS -+2002-05-21 07:28:28 Edmund GRIMLEY EVANS (roessler) - - * po/eo.po: update - --2002/05/18 05:39:55 Thomas Roessler -+2002-05-18 05:39:55 Thomas Roessler -+(roessler) - - * pattern.c: Fix #1175. - - * pattern.c: Fix #1175. Noticed by Alain Bench. - --2002/05/18 05:34:50 Vsevolod Volkov -+2002-05-18 05:34:50 Vsevolod Volkov (roessler) - -- * pop_lib.c, pop_lib.c: Attached patch for mutt 1.3.X/1.4 and 1.5.X removes gcc warning in -- pop_lib.c. -+ * pop_lib.c, pop_lib.c: Attached patch for mutt 1.3.X/1.4 and -+ 1.5.X removes gcc warning in pop_lib.c. - --2002/05/16 17:33:19 Pawel Dziekonski -+2002-05-16 17:33:19 Pawel Dziekonski (roessler) - - * po/pl.po: update - --2002/05/16 13:05:14 Im Eunjea -+2002-05-16 13:05:14 Im Eunjea (roessler) - - * po/ko.po: update. - - * po/ko.po: update - --2002/05/16 13:04:23 Ronny Haryanto -+2002-05-16 13:04:23 Ronny Haryanto (roessler) - - * po/id.po: update. - - * compose.c: Triple-DES, not Tripple-DES. - --2002/05/14 18:56:01 "Andrej N. Gritsenko" -+2002-05-14 18:56:01 "Andrej N. Gritsenko" (roessler) - - * po/uk.po: update - --2002/05/13 20:18:57 Toomas Soome -+2002-05-13 20:18:57 Toomas Soome (roessler) - - * po/et.po, po/et.po: update - --2002/05/13 20:18:17 Vsevolod Volkov -+2002-05-13 20:18:17 Vsevolod Volkov (roessler) - - * po/ru.po, po/uk.po, po/ru.po: update - --2002/05/13 20:16:08 Byrial Jensen -+2002-05-13 20:16:08 Byrial Jensen (roessler) - - * po/da.po: update - --2002/05/13 20:15:40 Vsevolod Volkov -+2002-05-13 20:15:40 Vsevolod Volkov (roessler) - - * po/ru.po: update - --2002/05/13 20:15:07 Jörgen Tegnér -+2002-05-13 20:15:07 Jörgen Tegnér (roessler) - - * po/sv.po, po/sv.po: update - --2002/05/13 20:13:56 Vincent Lefevre -+2002-05-13 20:13:56 Vincent Lefevre (roessler) - - * po/fr.po: update - --2002/05/09 09:52:09 Thomas Roessler -- -- * doc/muttrc.man.head, doc/muttrc.man.head: #1190, from Tim Alexeevsky -- --2002/05/06 11:27:20 Thomas Roessler -+2002-05-06 11:27:20 Thomas Roessler -+(roessler) - -- * doc/manual.sgml.head: Remove -Q which is only present in unstable from the stable -- documentation. Thanks to Andreas Kneib -- for noting. -+ * doc/manual.sgml.head: Remove -Q which is only present in -+ unstable from the stable documentation. Thanks to Andreas Kneib -+ for noting. - --2002/05/02 01:05:27 Thomas Roessler -+2002-05-02 01:05:27 Thomas Roessler -+(roessler) - - * Makefile.am: Include smime.h with EXRA_DIST. - --2002/05/01 23:24:17 Thomas Roessler -+2002-05-01 23:24:17 roessler (roessler) - -- * po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, VERSION, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, reldate.h, ChangeLog: automatic post-release commit for mutt-1.5.1 -+ * po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, -+ po/zh_CN.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/eo.po, po/es.po, -+ po/et.po, po/fr.po, po/gl.po, po/hu.po, VERSION, po/ca.po, -+ po/cs.po, po/da.po, po/de.po, po/el.po, reldate.h, ChangeLog: -+ automatic post-release commit for mutt-1.5.1 -+ -+2002-05-01 23:21:10 Thomas Roessler -+(roessler) - -- * smime.c: Shut up check_sec.sh. No security holes, but some ugly code. -+ * smime.c: Shut up check_sec.sh. No security holes, but some -+ ugly code. - - * check_sec.sh: Give all the warnings at once. - -- * build-release: - This is a development branch. -- - Add a -nodiff option to suppress generating a patch. -+ * build-release: - This is a development branch. - Add a -nodiff -+ option to suppress generating a patch. -+ -+2002-05-01 23:08:53 roessler (roessler) -+ -+ * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, -+ po/sv.po, po/pl.po, po/pt_BR.po, po/ru.po, po/lt.po, po/nl.po, -+ po/it.po, po/ja.po, po/ko.po, po/et.po, po/fr.po, po/gl.po, -+ po/hu.po, po/id.po, po/da.po, po/de.po, po/el.po, po/eo.po, -+ po/es.po, ChangeLog, VERSION, po/ca.po, po/cs.po, reldate.h: -+ automatic post-release commit for mutt-1.3.99 - -- * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, po/pl.po, po/pt_BR.po, po/ru.po, po/lt.po, po/nl.po, po/it.po, po/ja.po, po/ko.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, ChangeLog, VERSION, po/ca.po, po/cs.po, reldate.h: automatic post-release commit for mutt-1.3.99 -+2002-05-01 23:06:21 Thomas Roessler -+(roessler) - - * build-release: s/scp1/scp/ - --2002/04/29 17:12:18 Thomas Roessler -+2002-04-29 17:12:18 Thomas Roessler -+(roessler) - - * lib.c, lib.h, protos.h, lib.c, lib.h, protos.h: Fix #1171. - --2002/04/29 12:26:23 Vincent Lefevre -+2002-04-29 12:26:23 Vincent Lefevre (roessler) - - * po/fr.po: update. - --2002/04/29 12:25:38 oota toshiya -+2002-04-29 12:25:38 oota toshiya (roessler) - - * po/ja.po, po/ja.po: update. - --2002/04/29 12:09:21 Byrial Jensen -+2002-04-29 12:09:21 Byrial Jensen (roessler) - -- * imap/util.c: There is a possible buffer overflow due an off-by-one error in -- imap/util.c, line 125. The error is in the maximum field width -- indication in the sscanf() call. You must have room in the receiving -- buffer for this number of characters /plus a terminating NULL -- character/. -- -- * imap/util.c: There is a possible buffer overflow due an off-by-one error in -- imap/util.c, line 125. The error is in the maximum field width -- indication in the sscanf() call. You must have room in the -- receiving buffer for this number of characters /plus a -- terminating NULL character/. -- --2002/04/25 13:30:49 Vsevolod Volkov -- -- * pop.c, pop_lib.c, pop.c, pop_lib.c: Attached patch fixes the problem described below. It should be -- applied to both mutt 1.3/1.4 and 1.5 branches. -- -- > Date: Thu, 11 Apr 2002 16:24:00 -0500 -- > Subject: mutt 1.3.x / pop -- > From: "Ryan O'Hara" -- > To: bcully@users.sourceforge.net -- > User-Agent: Mutt/1.3.27i -- -- > Hi. My apologies if this has nothing to do with you. If it does not, -- > maybe you could forward it on to someone. -- -- > In mutt 1.3.x I have noticed that if I uses POP to retrieve mail, and -- > I enter an incorrect password whem prompted, it will *save* that -- > password and keep trying to use it. However, in the 1.2.x versions it -- > worked like this: type in wrong POP password, try to connect to POP -- > server again and it will ask you (again) for the password. mutt 1.3.x -- > does not, it just tries to connect with the wrongs password (which -- > just failed). -- -- > This is kinda annoying. Just thought I'd point out this regression. -- -- > Thanks. -- > R -- --2002/04/25 13:28:31 Wouter Verheijen -- -- * doc/manual.sgml.head, doc/manual.sgml.head: Someone in news:comp.mail.mutt noted that the list of command-line -- options in the manual is not up-to-date. -- -- Included a small patch that includes all options that 'mutt -h' shows. -- --2002/04/25 13:26:58 Cedric Duval -- -- * doc/manual.sgml.tail, OPS, init.h, pattern.c: attached are fixes for some little mistakes : -- -- * history-down -> scroll _down_, not up -- * functions decode-(save|copy) do not exist in the attach menu. -- * gettext oversight in pattern.c -- * inconsistency between "printf-like sequences" used all over the place -- and "escape sequences" for the description of $attribution. -+ * imap/util.c: There is a possible buffer overflow due an -+ off-by-one error in imap/util.c, line 125. The error is in the -+ maximum field width indication in the sscanf() call. You must -+ have room in the receiving buffer for this number of characters -+ /plus a terminating NULL character/. - -- * doc/manual.sgml.tail, pattern.c, OPS, init.h: attached are fixes for some little mistakes : -- -- * history-down -> scroll _down_, not up -- * functions decode-(save|copy) do not exist in the attach menu. -- * gettext oversight in pattern.c -- * inconsistency between "printf-like sequences" used all over the -- place and "escape sequences" for the description of $attribution. -+ * imap/util.c: There is a possible buffer overflow due an -+ off-by-one error in imap/util.c, line 125. The error is in the -+ maximum field width indication in the sscanf() call. You must -+ have room in the receiving buffer for this number of characters -+ /plus a terminating NULL character/. - --2002/04/25 13:24:33 Thomas Roessler -+2002-04-25 13:30:49 Vsevolod Volkov (roessler) - -- * recvattach.c: Also fix this for the S/MIME case. -+ * pop.c, pop_lib.c, pop.c, pop_lib.c: Attached patch fixes -+ the problem described below. It should be applied to both mutt -+ 1.3/1.4 and 1.5 branches. - -- * recvattach.c: Fiy handling of multiparts which have encrypted sub-parts, at least -- for PGP. -+ > Date: Thu, 11 Apr 2002 16:24:00 -0500 > Subject: mutt 1.3.x -+ / pop > From: "Ryan O'Hara" > To: -+ bcully@users.sourceforge.net > User-Agent: Mutt/1.3.27i - -- * sendlib.c: Force 7bit encoding for application/pgp-keys. -+ > Hi. My apologies if this has nothing to do with you. If it -+ does not, > maybe you could forward it on to someone. - --2002/04/20 21:38:47 Thomas Roessler -+ > In mutt 1.3.x I have noticed that if I uses POP to retrieve -+ mail, and > I enter an incorrect password whem prompted, it will -+ *save* that > password and keep trying to use it. However, in the -+ 1.2.x versions it > worked like this: type in wrong POP password, -+ try to connect to POP > server again and it will ask you (again) -+ for the password. mutt 1.3.x > does not, it just tries to connect -+ with the wrongs password (which > just failed). - -- * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, m4/progtest.m4, intl/ChangeLog, intl/Makefile.in, intl/bindtextdom.c, intl/config.charset, intl/dcigettext.c, intl/eval-plural.h, intl/gettextP.h, intl/gmo.h, intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/localealias.c, intl/localename.c, intl/os2compat.c, intl/os2compat.h, intl/osdep.c, intl/plural-exp.c, intl/plural-exp.h, intl/plural.c, intl/plural.y, ABOUT-NLS, INSTALL, config.rpath, configure.in: Backing out the latest iconv-related changes from the -- mutt-1-4-stable branch. -+ > This is kinda annoying. Just thought I'd point out this -+ regression. - -- * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, m4/progtest.m4: same as above. -+ > Thanks. > R - -- * intl/eval-plural.h, intl/gettextP.h, intl/gmo.h, intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/localealias.c, intl/localename.c, intl/os2compat.c, intl/os2compat.h, intl/osdep.c, intl/plural-exp.c, intl/plural-exp.h, intl/plural.c, intl/plural.y, intl/ChangeLog, intl/Makefile.in, intl/bindtextdom.c, intl/config.charset, intl/dcigettext.c: Committing the new iconv patches into a separate branch. -+2002-04-25 13:28:31 Wouter Verheijen (roessler) - -- * ABOUT-NLS, INSTALL, config.rpath, configure.in: Committing the new noiconv patches into a separate branch. -+ * doc/manual.sgml.head, doc/manual.sgml.head: Someone in -+ news:comp.mail.mutt noted that the list of command-line options -+ in the manual is not up-to-date. - -- * sendlib.c: Generate the resent-message-id ourselves, and add it in the top of -- the header. -+ Included a small patch that includes all options that 'mutt -+ -h' shows. - --2002/04/20 08:11:13 Wouter Verheijen -+2002-04-25 13:26:58 Cedric Duval (roessler) -+ -+ * doc/manual.sgml.tail, OPS, init.h, pattern.c: attached are -+ fixes for some little mistakes : -+ -+ * history-down -> scroll _down_, not up * functions -+ decode-(save|copy) do not exist in the attach menu. * gettext -+ oversight in pattern.c * inconsistency between "printf-like -+ sequences" used all over the place -+ and "escape sequences" for the description of $attribution. -+ -+ * doc/manual.sgml.tail, pattern.c, OPS, init.h: attached are -+ fixes for some little mistakes : -+ -+ * history-down -> scroll _down_, not up * functions -+ decode-(save|copy) do not exist in the attach menu. * gettext -+ oversight in pattern.c * inconsistency between "printf-like -+ sequences" used all over the -+ place and "escape sequences" for the description of -+ $attribution. -+ -+2002-04-25 13:24:33 Thomas Roessler -+(roessler) -+ -+ * recvattach.c: Also fix this for the S/MIME case. -+ -+ * recvattach.c: Fiy handling of multiparts which have encrypted -+ sub-parts, at least for PGP. -+ -+ * sendlib.c: Force 7bit encoding for application/pgp-keys. -+ -+2002-04-20 21:38:47 Thomas Roessler -+(roessler) -+ -+ * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, -+ m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, -+ m4/progtest.m4, intl/ChangeLog, intl/Makefile.in, -+ intl/bindtextdom.c, intl/config.charset, intl/dcigettext.c, -+ intl/eval-plural.h, intl/gettextP.h, intl/gmo.h, -+ intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, -+ intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, -+ intl/localealias.c, intl/localename.c, intl/os2compat.c, -+ intl/os2compat.h, intl/osdep.c, intl/plural-exp.c, -+ intl/plural-exp.h, intl/plural.c, intl/plural.y, ABOUT-NLS, -+ INSTALL, config.rpath, configure.in: Backing out the latest -+ iconv-related changes from the mutt-1-4-stable branch. -+ -+2002-04-20 21:36:38 roessler (roessler) -+ -+ * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, -+ m4/lcmessage.m4, m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4, -+ m4/progtest.m4: same as above. -+ -+2002-04-20 21:36:32 Thomas Roessler -+(roessler) -+ -+ * intl/eval-plural.h, intl/gettextP.h, intl/gmo.h, -+ intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, -+ intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, -+ intl/localealias.c, intl/localename.c, intl/os2compat.c, -+ intl/os2compat.h, intl/osdep.c, intl/plural-exp.c, -+ intl/plural-exp.h, intl/plural.c, intl/plural.y, intl/ChangeLog, -+ intl/Makefile.in, intl/bindtextdom.c, intl/config.charset, -+ intl/dcigettext.c: Committing the new iconv patches into a -+ separate branch. -+ -+ * ABOUT-NLS, INSTALL, config.rpath, configure.in: Committing -+ the new noiconv patches into a separate branch. -+ -+ * sendlib.c: Generate the resent-message-id ourselves, and add -+ it in the top of the header. -+ -+2002-04-20 08:11:13 Wouter Verheijen (roessler) -+ -+ * copy.c, mutt.h, sendlib.c: Bug #571 "mutt should not replicate -+ ">From " headers while bounding", has a patch attached. Will that -+ patch get in? - -- * copy.c, mutt.h, sendlib.c: Bug #571 "mutt should not replicate ">From " headers while bounding", -- has a patch attached. -- Will that patch get in? -- - Although these lines are not generated by mutt, I would strongly -- suggest -- to prevent it, because by boucing a mail the MUA should ensure -- that the message header is according to the specification. -+ suggest to prevent it, because by boucing a mail the MUA should -+ ensure that the message header is according to the specification. - A ">From " line is not, because of the spaces before a colon. -- -- Because this has such serious consequences (totally unreadable mail) -- when a MTA interpretes this line as the beginning of the body (not -- unreasonable), I think Mutt should prevent sending this invalid -- headerline. -- -- Because the other patch to the bugreport is not really correct IMHO -- (because the fieldnames are not limited to alphanumeric chars, RFC2822 -- 3.6.8), I propose another one. -- -+ -+ Because this has such serious consequences (totally unreadable -+ mail) when a MTA interpretes this line as the beginning of the -+ body (not unreasonable), I think Mutt should prevent sending -+ this invalid headerline. -+ -+ Because the other patch to the bugreport is not really correct -+ IMHO (because the fieldnames are not limited to alphanumeric -+ chars, RFC2822 3.6.8), I propose another one. -+ - This patch also appends Resent-* to the header, instead of - prepending it. The Resent-Message-Id is however still appended, -- because I could not find it; is it added by the MTA instead of by -- Mutt? -+ because I could not find it; is it added by the MTA instead of -+ by Mutt? -+ -+2002-04-20 07:55:20 roessler (roessler) - --2002/04/20 07:55:20 Thomas Roessler -+ * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, -+ m4/lcmessage.m4, m4/progtest.m4: Try to get the noiconv patch -+ to work. - -- * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4: Try to get the noiconv patch to work. -+2002-04-20 07:55:09 Thomas Roessler -+(roessler) - -- * configure.in: Try to get the noiconv patch to work with my development environment. -+ * configure.in: Try to get the noiconv patch to work with my -+ development environment. - - * INSTALL: Fix a typo. - --2002/04/20 07:26:10 Lars Hecking -+2002-04-20 07:26:10 Lars Hecking (roessler) - -- * init.h, rfc2047.c, sendlib.c, INSTALL, charset.c, charset.h, configure.in, gnupgparse.c: patch.1.3.28.lh.noiconv -+ * init.h, rfc2047.c, sendlib.c, INSTALL, charset.c, charset.h, -+ configure.in, gnupgparse.c: patch.1.3.28.lh.noiconv - ======================= -- -- This is the new version of my noiconv patch. It _requires_ the previous -- patch! If applied without, you'll have to resolve a couple of conflicts -- manually. -- -- Notes: -- - it's a lot cleaner than the old noiconv patch because no m4 files are -- modified -- - new configure option --disable-iconv; INSTALL updated accordingly -- [I am guessing here, but the background for the --without-iconv option -- mentioned in INSTALL was that mutt had a without-iconv option before -- gettext included iconv support. When mutt's intl/* files were updated -- to a newer gettext, there suddenly were two iconv options, which then -- got merged, that is, mutt's was removed. That was probably when -- --without-iconv stopped working, but I'm not sure, it may well be that -- it never worked since iconv support was introduced.] -- - all changes in *.[ch] files should be identical to the old patch -+ -+ This is the new version of my noiconv patch. It _requires_ -+ the previous patch! If applied without, you'll have to resolve -+ a couple of conflicts manually. -+ -+ Notes: - it's a lot cleaner than the old noiconv patch because -+ no m4 files are -+ modified - new configure option --disable-iconv; INSTALL -+ updated accordingly -+ [I am guessing here, but the background for the --without-iconv -+ option mentioned in INSTALL was that mutt had a without-iconv -+ option before gettext included iconv support. When mutt's -+ intl/* files were updated to a newer gettext, there suddenly -+ were two iconv options, which then got merged, that is, -+ mutt's was removed. That was probably when --without-iconv -+ stopped working, but I'm not sure, it may well be that it -+ never worked since iconv support was introduced.] -+ - all changes in *.[ch] files should be identical to the -+ old patch - - * intl/localename.c: This one seems to have been missing, too. - --2002/04/20 07:25:40 Thomas Roessler -+2002-04-20 07:25:40 roessler (roessler) - -- * intl/localename.c: branches: 1.1.2; 1.1.4; -- file localename.c was initially added on branch mutt-1-4-stable. -+ * intl/localename.c: branches: 1.1.2; 1.1.4; file localename.c -+ was initially added on branch mutt-1-4-stable. - --2002/04/20 07:25:15 Lars Hecking -+2002-04-20 07:25:15 Lars Hecking (roessler) - - * config.rpath: Another file from the gettext patch. - --2002/04/20 07:25:15 Thomas Roessler -+2002-04-20 07:25:15 roessler (roessler) - -- * config.rpath: branches: 1.1.2; 1.1.4; -- file config.rpath was initially added on branch mutt-1-4-stable. -+ * config.rpath: branches: 1.1.2; 1.1.4; file config.rpath was -+ initially added on branch mutt-1-4-stable. - --2002/04/20 07:24:54 Lars Hecking -+2002-04-20 07:24:54 Lars Hecking (roessler) - -- * m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: Add new m4 files from patch.1.3.28.lh.gettext-0.11.1. -+ * m4/lib-ld.m4, m4/lib-link.m4, m4/lib-prefix.m4: Add new m4 -+ files from patch.1.3.28.lh.gettext-0.11.1. - --2002/04/20 07:24:54 Thomas Roessler -+2002-04-20 07:24:54 roessler (roessler) - -- * m4/lib-ld.m4: branches: 1.1.2; 1.1.4; -- file lib-ld.m4 was initially added on branch mutt-1-4-stable. -+ * m4/lib-ld.m4: branches: 1.1.2; 1.1.4; file lib-ld.m4 was -+ initially added on branch mutt-1-4-stable. - -- * m4/lib-link.m4: branches: 1.1.2; 1.1.4; -- file lib-link.m4 was initially added on branch mutt-1-4-stable. -+ * m4/lib-link.m4: branches: 1.1.2; 1.1.4; file lib-link.m4 -+ was initially added on branch mutt-1-4-stable. - -- * m4/lib-prefix.m4: branches: 1.1.2; 1.1.4; -- file lib-prefix.m4 was initially added on branch mutt-1-4-stable. -+ * m4/lib-prefix.m4: branches: 1.1.2; 1.1.4; file lib-prefix.m4 -+ was initially added on branch mutt-1-4-stable. - --2002/04/20 07:24:22 Lars Hecking -+2002-04-20 07:24:22 Lars Hecking (roessler) - -- * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4, intl/ChangeLog, intl/Makefile.in, intl/bindtextdom.c, intl/config.charset, intl/dcigettext.c, intl/eval-plural.h, intl/gettextP.h, intl/gmo.h, intl/hash-string.h, intl/l10nflist.c, intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/localealias.c, intl/os2compat.c, intl/os2compat.h, intl/osdep.c, intl/plural-exp.c, intl/plural-exp.h, intl/plural.c, intl/plural.y: patch.1.3.28.lh.gettext-0.11.1 -- ============================== -- -- This one updates the gettext stuff in mutt to gettext-0.11.1. I started -- doing this in the hope that the new gettext version would simplify the -- noiconv patch, but unfortunately, this turned out not to be the case -- (the new iconv m4 macros still don't allow for switching iconv support off). -- -- However, as a few hours of merging and testing were spent, I'd suggest to -- adopt it for 1.4. The actual changes to intl/* are part cosmetic, part code -- reorganisation. Ok, a bit more, I'm no gettext expert :) -- -- Notes: -- - after applying the patch, you need to chmod 755 config.rpath -- - a couple of new files for m4/*, too -- - I have broken with the tradition of renaming gettext's AM_* macros -- to MUTT_AM_*! I don't think it's necessary anymore to customise these -- macros, but you (I really mean "you, tlr" :) want to have a look at -- the new gettext.m4. The others should be ok as they are. -- - previous gettext updates were also updating po/Makefile.in.in, which -- I didn't; someone who has a clue about gettext should check whether -- this might be necessary, and also whether any other files in po/ need -- updating -- -- I will provide the same patch for the 1.5 branch at some stage, ideally -- after getting some F E E D B A C K for this one. -- --2002/04/20 07:23:49 Thomas Roessler -- -- * intl/eval-plural.h: branches: 1.1.2; 1.1.4; -- file eval-plural.h was initially added on branch mutt-1-4-stable. -- -- * intl/gmo.h: branches: 1.1.2; 1.1.4; -- file gmo.h was initially added on branch mutt-1-4-stable. -- -- * intl/os2compat.c: branches: 1.1.2; 1.1.4; -- file os2compat.c was initially added on branch mutt-1-4-stable. -- -- * intl/os2compat.h: branches: 1.1.2; 1.1.4; -- file os2compat.h was initially added on branch mutt-1-4-stable. -- -- * intl/osdep.c: branches: 1.1.2; 1.1.4; -- file osdep.c was initially added on branch mutt-1-4-stable. -- -- * intl/plural-exp.c: branches: 1.1.2; 1.1.4; -- file plural-exp.c was initially added on branch mutt-1-4-stable. -+ * m4/codeset.m4, m4/gettext.m4, m4/glibc21.m4, m4/iconv.m4, -+ m4/lcmessage.m4, m4/progtest.m4, intl/ChangeLog, -+ intl/Makefile.in, intl/bindtextdom.c, intl/config.charset, -+ intl/dcigettext.c, intl/eval-plural.h, intl/gettextP.h, -+ intl/gmo.h, intl/hash-string.h, intl/l10nflist.c, -+ intl/libgnuintl.h, intl/loadinfo.h, intl/loadmsgcat.c, -+ intl/localcharset.c, intl/localealias.c, intl/os2compat.c, -+ intl/os2compat.h, intl/osdep.c, intl/plural-exp.c, -+ intl/plural-exp.h, intl/plural.c, intl/plural.y: -+ patch.1.3.28.lh.gettext-0.11.1 ============================== -+ -+ This one updates the gettext stuff in mutt to gettext-0.11.1. I -+ started doing this in the hope that the new gettext version would -+ simplify the noiconv patch, but unfortunately, this turned out -+ not to be the case (the new iconv m4 macros still don't allow -+ for switching iconv support off). -+ -+ However, as a few hours of merging and testing were spent, -+ I'd suggest to adopt it for 1.4. The actual changes to intl/* -+ are part cosmetic, part code reorganisation. Ok, a bit more, -+ I'm no gettext expert :) -+ -+ Notes: - after applying the patch, you need to chmod 755 -+ config.rpath - a couple of new files for m4/*, too - I have -+ broken with the tradition of renaming gettext's AM_* macros -+ to MUTT_AM_*! I don't think it's necessary anymore to customise -+ these macros, but you (I really mean "you, tlr" :) want to -+ have a look at the new gettext.m4. The others should be ok -+ as they are. -+ - previous gettext updates were also updating po/Makefile.in.in, -+ which I didn't; someone who has a clue about gettext should -+ check whether this might be necessary, and also whether any -+ other files in po/ need updating -+ -+ I will provide the same patch for the 1.5 branch at some stage, -+ ideally after getting some F E E D B A C K for this one. -+ -+2002-04-20 07:23:49 roessler (roessler) -+ -+ * intl/eval-plural.h: branches: 1.1.2; 1.1.4; file eval-plural.h -+ was initially added on branch mutt-1-4-stable. - -- * intl/plural-exp.h: branches: 1.1.2; 1.1.4; -- file plural-exp.h was initially added on branch mutt-1-4-stable. -+ * intl/gmo.h: branches: 1.1.2; 1.1.4; file gmo.h was initially -+ added on branch mutt-1-4-stable. - --2002/04/20 07:23:39 Lars Hecking -+ * intl/os2compat.c: branches: 1.1.2; 1.1.4; file os2compat.c -+ was initially added on branch mutt-1-4-stable. - -- * ABOUT-NLS, charset.c, charset.h, configure.in, gnupgparse.c, init.h, rfc2047.c, sendlib.c: patch.1.3.28.lh.gettext-0.11.1 -+ * intl/os2compat.h: branches: 1.1.2; 1.1.4; file os2compat.h -+ was initially added on branch mutt-1-4-stable. -+ -+ * intl/osdep.c: branches: 1.1.2; 1.1.4; file osdep.c was -+ initially added on branch mutt-1-4-stable. -+ -+ * intl/plural-exp.c: branches: 1.1.2; 1.1.4; file plural-exp.c -+ was initially added on branch mutt-1-4-stable. -+ -+ * intl/plural-exp.h: branches: 1.1.2; 1.1.4; file plural-exp.h -+ was initially added on branch mutt-1-4-stable. -+ -+2002-04-20 07:23:39 Lars Hecking (roessler) -+ -+ * ABOUT-NLS, charset.c, charset.h, configure.in, gnupgparse.c, -+ init.h, rfc2047.c, sendlib.c: patch.1.3.28.lh.gettext-0.11.1 - ============================== -- -- This one updates the gettext stuff in mutt to gettext-0.11.1. I started -- doing this in the hope that the new gettext version would simplify the -- noiconv patch, but unfortunately, this turned out not to be the case -- (the new iconv m4 macros still don't allow for switching iconv support off). -- -- However, as a few hours of merging and testing were spent, I'd suggest to -- adopt it for 1.4. The actual changes to intl/* are part cosmetic, part code -- reorganisation. Ok, a bit more, I'm no gettext expert :) -- -- Notes: -- - after applying the patch, you need to chmod 755 config.rpath -- - a couple of new files for m4/*, too -- - I have broken with the tradition of renaming gettext's AM_* macros -- to MUTT_AM_*! I don't think it's necessary anymore to customise these -- macros, but you (I really mean "you, tlr" :) want to have a look at -- the new gettext.m4. The others should be ok as they are. -- - previous gettext updates were also updating po/Makefile.in.in, which -- I didn't; someone who has a clue about gettext should check whether -- this might be necessary, and also whether any other files in po/ need -- updating -- -- I will provide the same patch for the 1.5 branch at some stage, ideally -- after getting some F E E D B A C K for this one. - --2002/04/17 17:05:54 Vincent Lefevre -+ This one updates the gettext stuff in mutt to gettext-0.11.1. I -+ started doing this in the hope that the new gettext version would -+ simplify the noiconv patch, but unfortunately, this turned out -+ not to be the case (the new iconv m4 macros still don't allow -+ for switching iconv support off). -+ -+ However, as a few hours of merging and testing were spent, -+ I'd suggest to adopt it for 1.4. The actual changes to intl/* -+ are part cosmetic, part code reorganisation. Ok, a bit more, -+ I'm no gettext expert :) -+ -+ Notes: - after applying the patch, you need to chmod 755 -+ config.rpath - a couple of new files for m4/*, too - I have -+ broken with the tradition of renaming gettext's AM_* macros -+ to MUTT_AM_*! I don't think it's necessary anymore to customise -+ these macros, but you (I really mean "you, tlr" :) want to -+ have a look at the new gettext.m4. The others should be ok -+ as they are. -+ - previous gettext updates were also updating po/Makefile.in.in, -+ which I didn't; someone who has a clue about gettext should -+ check whether this might be necessary, and also whether any -+ other files in po/ need updating -+ -+ I will provide the same patch for the 1.5 branch at some stage, -+ ideally after getting some F E E D B A C K for this one. -+ -+2002-04-17 17:05:54 Vincent Lefevre (roessler) - - * po/fr.po: Update. - --2002/04/17 17:05:04 David Champion -+2002-04-17 17:05:04 David Champion (roessler) - -- * m4/gssapi.m4: MIT krb5 1.2.4 has krb5-config, so it's no longer sufficient to say -- that possession of krb5-config indicates Heimdal. Patch attached. This -- assumes that Heimdal's "kreb5-config --vendor" begins with "Heimdal". -- I cannot verify that this is correct, so patch might be wrong on this -- point. -- --2002/04/07 21:19:57 Brendan Cully -- -- * imap/command.c, imap/imap.c, imap/message.c, imap/command.c, imap/imap.c, imap/message.c: The attached patch cleans up some bugs in switching IMAP mailboxes: -- * free current flags on mailbox close -- * reset reopen state -- * don't parse the same untagged SELECT response for multiple options -- * call mx_update_context after reading the whole mailbox, not after -- each message -- * reset new mail flag if mail arrives in the middle of opening the -+ * m4/gssapi.m4: MIT krb5 1.2.4 has krb5-config, so it's -+ no longer sufficient to say that possession of krb5-config -+ indicates Heimdal. Patch attached. This assumes that Heimdal's -+ "kreb5-config --vendor" begins with "Heimdal". I cannot verify -+ that this is correct, so patch might be wrong on this point. -+ -+2002-04-07 21:19:57 Brendan Cully (roessler) -+ -+ * imap/command.c, imap/imap.c, imap/message.c, imap/command.c, -+ imap/imap.c, imap/message.c: The attached patch cleans up some -+ bugs in switching IMAP mailboxes: * free current flags on mailbox -+ close * reset reopen state * don't parse the same untagged -+ SELECT response for multiple options * call mx_update_context -+ after reading the whole mailbox, not after -+ each message * reset new mail flag if mail arrives in the -+ middle of opening the - mailbox. This should close 1139 -- -+ - 939 is most likely unaffected. I discovered these problems while - investigating 939. - --2002/04/05 10:42:54 "TAKAHASHI, Tamotsu" -+2002-04-05 10:42:54 "TAKAHASHI, Tamotsu" -+(roessler) - - * po/ja.po: update. - --2002/04/04 20:49:46 Im Eunjea -+2002-04-04 20:49:46 Im Eunjea (roessler) - - * po/ko.po: Update. - --2002/04/04 06:50:52 "TAKAHASHI, Tamotsu" -+2002-04-04 06:50:52 "TAKAHASHI, Tamotsu" -+(roessler) - - * po/ja.po: Update. - --2002/04/04 06:50:12 Thomas Roessler -+2002-04-04 06:50:12 Thomas Roessler -+(roessler) - - * pgp.c: Fix a typo noted by Tamotsu Takahashi. - --2002/04/03 15:22:27 Thomas Roessler -+2002-04-03 15:22:27 Thomas Roessler -+(roessler) - - * handler.c: Fix printing of format=flowed text parts. - - * commands.c: Fix #1144 in stable. - -- * commands.c: Fix a file descriptor leak in the display filter code. Noted by -- Chr. v. Stuckrad. -- -+ * commands.c: Fix a file descriptor leak in the display filter -+ code. Noted by Chr. v. Stuckrad. -+ - fixes: #1144 - --2002/04/02 18:49:37 Lars Hecking -+2002-04-02 18:49:37 Lars Hecking (roessler) - -- * m4/iconv.m4: branches: 1.3.2.1.2; -- The noiconv patch. -+ * m4/iconv.m4: branches: 1.3.2.1.2; The noiconv patch. - - * charset.c, charset.h: The noiconv patch. - -- * configure.in: branches: 2.129.2.3.2; -- The noiconv patch. -+ * configure.in: branches: 2.129.2.3.2; The noiconv patch. - - * gnupgparse.c, init.h, rfc2047.c, sendlib.c: The noiconv patch. - --2002/03/30 08:26:31 Thomas Roessler -+2002-03-30 08:26:31 roessler (roessler) - - * po/pl.po: update. From Pawel Dzienkonski. - - * po/fr.po: Update; From Vincent Lefevre. - -- * postpone.c, sendlib.c: The attached patch allows the user to override the user-agent field -- with my_hdr. It also removes the stripping of the x-mailer field -- when recalling a postponed message. -+ * postpone.c, sendlib.c: The attached patch allows the user -+ to override the user-agent field with my_hdr. It also removes -+ the stripping of the x-mailer field when recalling a postponed -+ message. - --2002/03/28 13:25:23 Thomas Roessler -+2002-03-28 13:25:23 roessler (roessler) - -- * mx.c, mx.h, mailbox.h, main.c, mbox.c, mh.c: patch-1.3.28-me.emptycheck.1 -+ * mx.c, mx.h, mailbox.h, main.c, mbox.c, mh.c: -+ patch-1.3.28-me.emptycheck.1 - --2002/03/27 08:50:42 Thomas Roessler -+2002-03-27 08:50:42 roessler (roessler) - - * pgp.c: There was some output missing. - - * po/POTFILES.in: update. - -- * pgp.c: More fixes. Note to self: The code which controls character set -- selection for attachments is far too complicated. -+ * pgp.c: More fixes. Note to self: The code which controls -+ character set selection for attachments is far too complicated. - -- * pgp.c: Don't include temporary file names in the Content-Disposition header. -+ * pgp.c: Don't include temporary file names in the -+ Content-Disposition header. - -- * pgp.c: Use text/plain; format=... when we are asked to detect inline PGP -- material in in text/plain body parts. -+ * pgp.c: Use text/plain; format=... when we are asked to detect -+ inline PGP material in in text/plain body parts. - - * pgp.c, sendlib.c: Fix encoder mode for text/plain; action=pgp-*. - -- * pgp.c: Fix "noconv" handling for the message body when we generate inline -- PGP. -+ * pgp.c: Fix "noconv" handling for the message body when we -+ generate inline PGP. - - * charset.c, charset.h, handler.c, muttlib.c, pgp.c: Some hackisch - charset handling for text/plain; x-action=pgp-*. I don't like - this stuff, but it's better than nothing. - --2002/03/26 22:25:48 Thomas Roessler -+2002-03-26 22:25:48 roessler (roessler) - - * pgp.c: Change x-action values to "pgp-encrypted", "pgp-signed". - -@@ -4371,8 +4873,8 @@ - PGP changes. - - * pgp.c: Also permit for "action" and "x-action" on the receiving -- end, just in case we can settle on a joint standard with other MUA -- developers. -+ end, just in case we can settle on a joint standard with other -+ MUA developers. - - * commands.c, crypt.c, handler.c, pgp.c, pgpinvoke.c, sendlib.c: - OK, I'm giving up: pgp_create_traditional now creates text/plain; -@@ -4382,144 +4884,163 @@ - - * charset.c, charset.h, gnupgparse.c, handler.c, mbyte.c, - rfc2047.c, sendlib.c, charset.c, charset.h, gnupgparse.c, -- handler.c, mbyte.c, rfc2047.c, sendlib.c: Fix iconv warnings; from -- Edmund Grimley Evans. -+ handler.c, mbyte.c, rfc2047.c, sendlib.c: Fix iconv warnings; -+ from Edmund Grimley Evans. - - * smime.c: Please use ascii_strcasecmp() if you want to compare - ASCII parameter strings. mutt_strcasecmp() depends on the locale, - and detects "i" and "I" as _different_ in Turkish locales. - --2002/03/25 11:34:40 Thomas Roessler -+2002-03-25 11:34:40 roessler (roessler) - -- * crypt.c: Fix S/MIME signature type. Noted by Dan Ohnesorg . -+ * crypt.c: Fix S/MIME signature type. Noted by Dan Ohnesorg -+ . - - * buffy.c, buffy.c: close 1103; from Brendan Cully - -- * doc/manual.sgml.tail, doc/manual.sgml.tail: close 1122; from Brendan Cully -+ * doc/manual.sgml.tail, doc/manual.sgml.tail: close 1122; from -+ Brendan Cully - - * hdrline.c, muttlib.c: Fix #87s; from Brendan Cully. - - * hdrline.c, muttlib.c: Fix #872, from Brendan Cully. - -- * contrib/smime_keys_test.pl, contrib/Makefile.in: Include a test script by Mike Schiraldi. It's perl > the one I have -- installed, so I'm just putting it into contrib for now. -+ * contrib/smime_keys_test.pl, contrib/Makefile.in: Include a test -+ script by Mike Schiraldi. It's perl > the one I have installed, -+ so I'm just putting it into contrib for now. - --2002/03/20 09:53:42 Thomas Roessler -+2002-03-20 09:53:42 roessler (roessler) - - * editmsg.c, mailbox.h, mx.c: Rename M_NEW to M_NEWFOLDER. - -- * editmsg.c, mailbox.h, mx.c: Rename the new M_NEW by M_NEWFOLDER. There was another constant of -- the same name. Problem noted by Will Yardley's compiler. -+ * editmsg.c, mailbox.h, mx.c: Rename the new M_NEW by M_NEWFOLDER. -+ There was another constant of the same name. Problem noted by -+ Will Yardley's compiler. - --2002/03/19 09:54:05 Thomas Roessler -+2002-03-19 09:54:05 roessler (roessler) - - * browser.c: Fix #1115. - -- * editmsg.c, mailbox.h, mx.c: Fix a temporary file race problem when using the edit-message -- function. Backported from unstable. -+ * editmsg.c, mailbox.h, mx.c: Fix a temporary file race problem -+ when using the edit-message function. Backported from unstable. - - * po/pl.po, po/pl.po: update - --2002/03/18 18:54:56 Thomas Roessler -+2002-03-18 18:54:56 roessler (roessler) - -- * browser.c: Should fix #1115. BACKPORT! -+ * browser.c: Should fix #1115. BACKPORT! - --2002/03/15 09:11:05 Thomas Roessler -+2002-03-15 09:11:05 roessler (roessler) - - * po/ja.po: update from oota toshiya. - - * po/ja.po: update, from oota toshiya. - --2002/03/13 23:43:41 Thomas Roessler -+2002-03-13 23:43:41 roessler (roessler) -+ -+ * attach.c: Undoing the previous patch. It was junk, and may -+ ruin files. - -- * attach.c: Undoing the previous patch. It was junk, and may ruin files. -+ * attach.c, editmsg.c, mailbox.h, mx.c: Don't fopen mail folders -+ in append mode where we should safe_fopen() them in write mode. -+ Debian bug #138200, noted by Colin Philipps . - -- * attach.c, editmsg.c, mailbox.h, mx.c: Don't fopen mail folders in append mode where we should safe_fopen() -- them in write mode. Debian bug #138200, noted by Colin Philipps -- . -- - NEEDS BACKPORTING. - -- * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, po/da.po, po/de.po, po/el.po, po/ChangeLog: automatic post-release commit for mutt-1.3.28 -+ * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, -+ po/tr.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/eo.po, po/es.po, -+ po/et.po, po/fr.po, po/gl.po, po/hu.po, po/da.po, po/de.po, -+ po/el.po: automatic post-release commit for mutt-1.3.28 - -- * po/ChangeLog: branches: 1.1.2; -- file ChangeLog was initially added on branch mutt-1-4-stable. -+ * po/ChangeLog: branches: 1.1.2; file ChangeLog was initially -+ added on branch mutt-1-4-stable. - -- * po/ca.po, po/cs.po, ChangeLog, VERSION, reldate.h: automatic post-release commit for mutt-1.3.28 -+ * po/ChangeLog, po/ca.po, po/cs.po, ChangeLog, VERSION, reldate.h: -+ automatic post-release commit for mutt-1.3.28 - -- * doc/smime-notes.txt, smime.c: Assorted patches from Mike Schiraldi. -+ * doc/smime-notes.txt, smime.c: Assorted patches from Mike -+ Schiraldi. - --2002/03/02 12:11:35 Thomas Roessler -+2002-03-02 12:11:35 roessler (roessler) - -- * contrib/smime.rc, compose.c, init.h, mutt.h, sendlib.c, smime.c, smime.h: Introduce smime_default_key. From Oliver Ehli. -+ * contrib/smime.rc, compose.c, init.h, mutt.h, sendlib.c, smime.c, -+ smime.h: Introduce smime_default_key. From Oliver Ehli. - -- * contrib/smime.rc, smime.c, smime.h, smime_keys.pl, init.h, mutt.h: smime.c: -- - the getkeys() function was broken and deleted the last char -- of the certfilename -- - it now lets me use more than one key for the same mailbox -- ie select these. -- - some display output was garbled when the email didn't match. -+ * contrib/smime.rc, smime.c, smime.h, smime_keys.pl, init.h, -+ mutt.h: smime.c: - the getkeys() function was broken and deleted -+ the last char -+ of the certfilename - it now lets me use more than one key -+ for the same mailbox -+ ie select these. - some display output was garbled when the -+ email didn't match. - i posted some fix to mutt-users, but i don't like that sleep() - so i dropped the first error message, which basically repeated -- the from/sender field only. so now there's just the message: they -- don't match. -- -- smime_keys: -- - i modified the add_chain to continue even if no roo-cert -+ the from/sender field only. so now there's just the message: -+ they don't match. -+ -+ smime_keys: - i modified the add_chain to continue even if -+ no roo-cert - is present (david collantes received som chain that got - exported from outlook. obiously they don't (always ?) -- include the root cert) it will now abort if neither root -- nor intermediate certs are present. -+ include the root cert) it will now abort if neither root nor -+ intermediate certs are present. - - add_cert created index entries with '-' as issuer cert, when - it should have been '?'. thus verify would fail. (obviously - nobody ever used that command (add_cert, that is) :) -- -- the feature above obsoletes the hash_cert and fingerprint_cert commands, -- adds import_cert command and ask_cert_label bool. i modified the output -- of smime_keys (a little) so it doesn't look too garbled when supplying -- the label (it is actually interactive :) furthermore, i do a verify -- after the cert was added and modified the verify routine to make the -- cerificate trusted in case of success. (we discussed this in another -- message) that is ok so far, but perhaps this requires some better root -- certificate handling, ie the trust should be somehow connected to the -- root certificate, that maybe added (if the user trusts it and its not -- present already) to the ca-file. i'll think about that some more ... but -- then, there already is the add_root command. hmmm... (btw, you'll now -- never get asked to trust a certificate) -- -- i have not yet deleted the email handling from the import key stuff (in -- smime.c/crypt.c), for i'm thinking about smime_keys using it as an -- additional arg. otoh i don't think users would press ^k if verification -- failed...hmmm... but still, smime_keys does extract the email from the -- certificate either way and does verify it by itself, so the only thing -- that would happen is to have some invalid certificates, that mutt'll -- refuse to use anyways, left in the database.... -- -+ -+ the feature above obsoletes the hash_cert and fingerprint_cert -+ commands, adds import_cert command and ask_cert_label bool. i -+ modified the output of smime_keys (a little) so it doesn't look -+ too garbled when supplying the label (it is actually interactive -+ :) furthermore, i do a verify after the cert was added and -+ modified the verify routine to make the cerificate trusted in -+ case of success. (we discussed this in another message) that is -+ ok so far, but perhaps this requires some better root certificate -+ handling, ie the trust should be somehow connected to the root -+ certificate, that maybe added (if the user trusts it and its not -+ present already) to the ca-file. i'll think about that some more -+ ... but then, there already is the add_root command. hmmm... (btw, -+ you'll now never get asked to trust a certificate) -+ -+ i have not yet deleted the email handling from the import key -+ stuff (in smime.c/crypt.c), for i'm thinking about smime_keys -+ using it as an additional arg. otoh i don't think users would -+ press ^k if verification failed...hmmm... but still, smime_keys -+ does extract the email from the certificate either way and does -+ verify it by itself, so the only thing that would happen is -+ to have some invalid certificates, that mutt'll refuse to use -+ anyways, left in the database.... -+ - (From Oliver Ehli.) - --2002/02/28 23:28:51 Thomas Roessler -+2002-02-28 23:28:51 roessler (roessler) - - * sort.c: Turn on incremental threading again. - -- * smime_keys.pl: The script will try to pick out the end-user cert and pass that to -- openssl. The code which tells the difference may not be perfect. It -- works with all the certs in my collection, though. I won't be at all -- surprised if someone comes across a cert chain which confuses it, -- but it should print out an error in that case. Hopefully they will -- send us the chain so we can adjust our code. -- -+ * smime_keys.pl: The script will try to pick out the end-user cert -+ and pass that to openssl. The code which tells the difference may -+ not be perfect. It works with all the certs in my collection, -+ though. I won't be at all surprised if someone comes across a -+ cert chain which confuses it, but it should print out an error -+ in that case. Hopefully they will send us the chain so we can -+ adjust our code. -+ - (From Mike Schiraldi.) - -- * init.h, mutt.h, thread.c: Threading enhancements from Daniel Eisenbud. -+ * init.h, mutt.h, thread.c: Threading enhancements from Daniel -+ Eisenbud. - -- * curs_main.c, init.c, init.h, mutt.h, thread.c: $narrow_tree; fater redrawing when changing tree options. From -- Daniel Eisenbud. -+ * curs_main.c, init.c, init.h, mutt.h, thread.c: $narrow_tree; -+ fater redrawing when changing tree options. From Daniel Eisenbud. - -- * imap/message.c, mbox.c, mx.c, thread.c: A possible work-around for #939. From Daniel Eisenbud. -+ * imap/message.c, mbox.c, mx.c, thread.c: A possible work-around -+ for #939. From Daniel Eisenbud. - -- * init.h, mutt.h, thread.c: Threading enhancements from Daniel Eisenbud. -+ * init.h, mutt.h, thread.c: Threading enhancements from Daniel -+ Eisenbud. - --2002/02/26 10:58:56 Thomas Roessler -+2002-02-26 10:58:56 roessler (roessler) - - * po/ru.po: update - -@@ -4527,62 +5048,69 @@ - - * init.h: Fix a typo. #1069. - -- * imap/browse.c, imap/message.c, configure.in, mutt_sasl.c, imap/browse.c, imap/message.c, configure.in, mutt_sasl.c: Brendan Cully sent a patch. -+ * imap/browse.c, imap/message.c, configure.in, mutt_sasl.c, -+ imap/browse.c, imap/message.c, configure.in, mutt_sasl.c: -+ Brendan Cully sent a patch. - - * install-sh, install-sh: Fix a typo. From Edmund Grimley Evans. - - * po/ru.po: ru.po update. - -- * pop_lib.c, pop_lib.c: CAPA response tags are case-insensitive. Noted by Michael Vore, -- patch from Vsevolod Volkov. -+ * pop_lib.c, pop_lib.c: CAPA response tags are case-insensitive. -+ Noted by Michael Vore, patch from Vsevolod Volkov. - --2002/02/18 14:55:31 Thomas Roessler -+2002-02-18 14:55:31 roessler (roessler) - - * alias.c, send.c: Fix for #1047. From Michael Elkins. - --2002/02/14 11:22:51 Thomas Roessler -+2002-02-14 11:22:51 roessler (roessler) - -- * charset.c, gnupgparse.c, init.h, rfc2047.c: Iconv patch from Lars Hecking. MAY NEED TO BE BACKPORTED. -+ * charset.c, gnupgparse.c, init.h, rfc2047.c: Iconv patch from -+ Lars Hecking. MAY NEED TO BE BACKPORTED. - --2002/02/13 12:04:52 Thomas Roessler -+2002-02-13 12:04:52 roessler (roessler) - - * smime.c: mutt_any_key() shouldn't be used in curses mode. - -- * hdrline.c, init.h, parse.c: Change the default format to be more friendly to "0-line messages", -- and fix optional expansion for %l - it was the wrong way around. -- Also, add a hack to parse.c so we ignore negative values in Lines -- headers. -+ * hdrline.c, init.h, parse.c: Change the default format to be -+ more friendly to "0-line messages", and fix optional expansion -+ for %l - it was the wrong way around. Also, add a hack to -+ parse.c so we ignore negative values in Lines headers. - -- * hdrline.c, muttlib.c, protos.h: Undo the %l fix. It broke things. -+ * hdrline.c, muttlib.c, protos.h: Undo the %l fix. It broke -+ things. - -- * menu.c: Fix mutt_pad_string; from Edmund Grimley Evans. (MAY NEED TO BE -- BACKPORTED.) -+ * menu.c: Fix mutt_pad_string; from Edmund Grimley Evans. -+ (MAY NEED TO BE BACKPORTED.) - - * main.c: Report libiconv version. - --2002/02/12 21:54:41 Thomas Roessler -+2002-02-12 21:54:41 roessler (roessler) - - * hdrline.c, muttlib.c, protos.h: Improve %l's behaviour. - -- * extlib.c, main.c, pattern.c, smime_keys.pl: Mike Schiraldi's daily S/MIME patch. -+ * extlib.c, main.c, pattern.c, smime_keys.pl: Mike Schiraldi's -+ daily S/MIME patch. - --2002/02/11 17:31:53 Thomas Roessler -+2002-02-11 17:31:53 roessler (roessler) - -- * smime.c: This patch gets rid of an ugly static variable in smime.c. (From -- Mike Schiraldi.) -+ * smime.c: This patch gets rid of an ugly static variable in -+ smime.c. (From Mike Schiraldi.) - -- * smime_keys.pl: This patch lets smime_keys.pl automagically handle both formats of -- x509 certificate -- PEM (text) and DER (binary). This lets Outlook -- users (and probably others) directly import the certs without first -- converting them manually. (From Mike Schiraldi.) -+ * smime_keys.pl: This patch lets smime_keys.pl automagically -+ handle both formats of x509 certificate -- PEM (text) and -+ DER (binary). This lets Outlook users (and probably others) -+ directly import the certs without first converting them manually. -+ (From Mike Schiraldi.) - -- * configure.in: Honor current values of $LIBS and $CPPFLAGS. From Thomas Dickey. -+ * configure.in: Honor current values of $LIBS and $CPPFLAGS. -+ From Thomas Dickey. - - * configure.in: Honor $LIBS and $CPPFLAGS. From Thomas Dickey. - - * init.c, init.c: patch-1.3.27.me.initsort.1 - --2002/02/07 21:48:42 Thomas Roessler -+2002-02-07 21:48:42 roessler (roessler) - - * smime_keys.pl: Another S/MIME patch from Mike Schiraldi. - -@@ -4590,21 +5118,28 @@ - - * smime.c: S/MIME fixes from Mike Schiraldi. - -- * po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/POTFILES.in, po/ca.po, po/cs.po, po/da.po, po/de.po, Makefile.am: Make S/MIME messages translatable. -+ * po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, -+ po/uk.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, -+ po/pt_BR.po, po/ru.po, po/el.po, po/eo.po, po/es.po, po/et.po, -+ po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/POTFILES.in, -+ po/ca.po, po/cs.po, po/da.po, po/de.po, Makefile.am: Make S/MIME -+ messages translatable. - --2002/02/06 19:14:47 Thomas Roessler -+2002-02-06 19:14:47 roessler (roessler) - - * lib.h: Avoid a warning on some machines. - - * lib.h, smime.c: Make some scanf formats safe. - --2002/02/05 22:01:06 Thomas Roessler -+2002-02-05 22:01:06 roessler (roessler) - -- * ascii.c: The previous fix was complete nonsense. What a day. :-( -+ * ascii.c: The previous fix was complete nonsense. What a -+ day. :-( - - * ascii.c: The previous fix was complete nonsense. - -- * browser.c, lib.c, lib.h: Use strcoll for the file browser. From David Champion. -+ * browser.c, lib.c, lib.h: Use strcoll for the file browser. -+ From David Champion. - - * hook.c: Fix crypt-hook. From Dale Woolridge - . -@@ -4617,58 +5152,66 @@ - - * po/ru.po, po/fr.po, po/ko.po: update - -- * smime.c: Don't put garbage onto the screen when trying to decrypt messages. -+ * smime.c: Don't put garbage onto the screen when trying to -+ decrypt messages. -+ -+ * contrib/smime.rc, init.h, smime.c, smime.h, smime_keys.pl: -+ S/MIME fixes from Oliver Ehli: - -- * contrib/smime.rc, init.h, smime.c, smime.h, smime_keys.pl: S/MIME fixes from Oliver Ehli: -- - - smime_keys.pl: -- -- support for multiple email adrresses in cert: will add one entry -- to {keys, cetrificates}/.index now (for each mailbox) -- -+ -+ support for multiple email adrresses in cert: will add one -+ entry to {keys, cetrificates}/.index now (for each mailbox) -+ - support for certificates without intermediate certs (e.g. for - people who are their own CA: use root as intermediate, for it - probably wouldn't be known to anyone...) -- -- bugfix in handle_pem: the checks if some type of cert is present; -- die() could never be reached, as the variables checked wouldn't -- have been set in that case, so it would break because of undefined -- value or some such thing.... (so it has to check $iter instead) -- -- - smime.c (init.h, ....) -- -- support for importing certificates issued for multiple addresses. -- -- introduced smime_fingerprint_cert_command, so finally certs can -- get compared ... (so the above works..) -- -- cleaned up some error messages, that would mess up the terminal. -- -- fixed typos (init.h) -+ -+ bugfix in handle_pem: the checks if some type of cert is -+ present; die() could never be reached, as the variables checked -+ wouldn't have been set in that case, so it would break because -+ of undefined value or some such thing.... (so it has to check -+ $iter instead) -+ -+ - smime.c (init.h, ....) -+ -+ support for importing certificates issued for multiple -+ addresses. -+ -+ introduced smime_fingerprint_cert_command, so finally certs -+ can get compared ... (so the above works..) -+ -+ cleaned up some error messages, that would mess up the terminal. -+ -+ fixed typos (init.h) - - * ascii.c: Fix. - -- * ascii.c: Fix ascii_*cmp functions. Problem noted by Brad Thompson. -+ * ascii.c: Fix ascii_*cmp functions. Problem noted by Brad -+ Thompson. - --2002/02/04 09:59:02 Thomas Roessler -+2002-02-04 09:59:02 roessler (roessler) - -- * smime.c, crypt.c: Some S/MIME fixes from Oliver Ehli . -+ * smime.c, crypt.c: Some S/MIME fixes from Oliver Ehli -+ . - --2002/02/03 09:58:45 Thomas Roessler -+2002-02-03 09:58:45 roessler (roessler) - -- * doc/manual.sgml.head, doc/muttrc.man.head, init.h: Add unauto_view. From Jeremy Blosser. -+ * doc/manual.sgml.head, doc/muttrc.man.head, init.h: Add -+ unauto_view. From Jeremy Blosser. - -- * Makefile.am, pgplib.h, pgppubring.c: Add a "-f" flag which helps to dump fingerprints. Contributed by -- Jason Harris , and not strictly needed for -- mutt. -+ * Makefile.am, pgplib.h, pgppubring.c: Add a "-f" flag which -+ helps to dump fingerprints. Contributed by Jason Harris -+ , and not strictly needed for mutt. - -- * pgppubring.c: Correctly calculate fingerprints for type 20 ElGamal keys. Noted by -- Jason Harris . -+ * pgppubring.c: Correctly calculate fingerprints for type 20 -+ ElGamal keys. Noted by Jason Harris . - -- * pgppubring.c: Fix calculation of fingerprints (and key IDs) for type 20 ElGamal -- keys. Noted by Jason Harris . -+ * pgppubring.c: Fix calculation of fingerprints (and key -+ IDs) for type 20 ElGamal keys. Noted by Jason Harris -+ . - --2002/02/02 16:52:27 Thomas Roessler -+2002-02-02 16:52:27 roessler (roessler) - - * po/ca.po: update - -@@ -4676,57 +5219,68 @@ - - * mh.c: Don't forget deletions when a folder is changed. Ups. - --2002/02/01 17:23:20 Thomas Roessler -+2002-02-01 17:23:20 roessler (roessler) - -- * smime_keys.pl: Fix some possible leaks of the private key (encrypted, but -- still...). (yow_security_holes.patch from Mike Schiraldi.) -+ * smime_keys.pl: Fix some possible leaks of the private key -+ (encrypted, but still...). (yow_security_holes.patch from -+ Mike Schiraldi.) - --2002/01/31 22:05:58 Thomas Roessler -+2002-01-31 22:05:58 roessler (roessler) - -- * doc/smime-notes.txt: Document %C, and other updates. From Mike Schiraldi. -+ * doc/smime-notes.txt: Document %C, and other updates. From Mike -+ Schiraldi. - - * smime.c: Remove some unnecessary quotation marks. - -- * contrib/smime.rc, init.h, smime.c, smime.h, smime_keys.pl: Use mutt -Q from smime_keys. -+ * contrib/smime.rc, init.h, smime.c, smime.h, smime_keys.pl: -+ Use mutt -Q from smime_keys. - -- * po/zh_TW.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/ca.po, po/cs.po: update-po -+ * po/zh_TW.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, -+ po/tr.po, po/uk.po, po/zh_CN.po, po/it.po, po/ja.po, po/ko.po, -+ po/lt.po, po/nl.po, po/pl.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/hu.po, -+ po/id.po, po/ca.po, po/cs.po: update-po - - * main.c: fix a string. - - * doc/mutt.man: Document -Q. - -- * init.c, main.c, protos.h: Add a -Q option to query configuration variables. This is needed to -- avoid a separate mutt configuration parser in smime_keys.pl. -+ * init.c, main.c, protos.h: Add a -Q option to query configuration -+ variables. This is needed to avoid a separate mutt configuration -+ parser in smime_keys.pl. - --2002/01/30 22:51:12 Thomas Roessler -+2002-01-30 22:51:12 roessler (roessler) - - * send.c, send.c: patch-1.3.27.me.postpone_date.2 - - * smime.c: Mike Schiraldi's daily S/MIME patch, as he puts it. - --2002/01/29 21:08:10 Thomas Roessler -+2002-01-29 21:08:10 roessler (roessler) - -- * smime.c: Improved certificate handling. Suggested by Oliver Ehli, -- implemented by Mike Schiraldi. -+ * smime.c: Improved certificate handling. Suggested by Oliver -+ Ehli, implemented by Mike Schiraldi. - -- * smime.c: Properly handle certain signatures generated by Outlook. From Mike -- Schiraldi. -+ * smime.c: Properly handle certain signatures generated by -+ Outlook. From Mike Schiraldi. - -- * parse.c, parse.c: Fix a segmentation fault in debugging code. From Daniel Eisenbud. -+ * parse.c, parse.c: Fix a segmentation fault in debugging code. -+ From Daniel Eisenbud. - --2002/01/28 23:29:05 Thomas Roessler -+2002-01-28 23:29:05 roessler (roessler) - -- * crypt.c, init.h, mutt.h: Add a new crypt_timestamp option. The timestamps aren't really -- needed any more. -+ * crypt.c, init.h, mutt.h: Add a new crypt_timestamp option. -+ The timestamps aren't really needed any more. - -- * commands.c, menu.c, mutt.h, mutt_curses.h, pattern.c: Add ~V to match successfully verified messages. -+ * commands.c, menu.c, mutt.h, mutt_curses.h, pattern.c: Add ~V -+ to match successfully verified messages. - - * contrib/smime.rc: Add a comment. From Mike Schiraldi. - -- * init.h, init.h: Fix list-from documentation. From Michael Elkins. -+ * init.h, init.h: Fix list-from documentation. From Michael -+ Elkins. - -- * doc/smime-notes.txt: Add more information on S/MIME. Adapted from Oliver Ehli's notes by -- Mike Schiraldi. -+ * doc/smime-notes.txt: Add more information on S/MIME. -+ Adapted from Oliver Ehli's notes by Mike Schiraldi. - - * send.c: Avoid C99 comments. Noted by Vincent Lefevre. - -@@ -4734,18 +5288,20 @@ - - * menu.c, menu.c: Wide character fix from TAKIZAWA Takashi. - -- * Makefile.am, hook.c: S/MIME-related bug fixes from Brendan Cully. -+ * Makefile.am, hook.c: S/MIME-related bug fixes from Brendan -+ Cully. - --2002/01/25 00:08:30 Thomas Roessler -+2002-01-25 00:08:30 roessler (roessler) - - * smime.c: ups - -- * commands.c, recvattach.c, smime.c, smime.h: More decryption key detection fixes. -+ * commands.c, recvattach.c, smime.c, smime.h: More decryption -+ key detection fixes. - -- * commands.c, smime.c: Make some prompts look nicer, and add sensible selection of the -- decryption key. -+ * commands.c, smime.c: Make some prompts look nicer, and add -+ sensible selection of the decryption key. - --2002/01/24 23:53:19 Thomas Roessler -+2002-01-24 23:53:19 roessler (roessler) - - * commands.c, crypt.c, smime.c, smime.h: More S/MIME nit-picking. - -@@ -4763,19 +5319,30 @@ - - * mh.c: indentation - -- * mh.c, mx.c, mx.h: Maildir efficiency improvements, from Michael Elkins and Thomas -- Roessler. -+ * mh.c, mx.c, mx.h: Maildir efficiency improvements, from Michael -+ Elkins and Thomas Roessler. - - * crypt.c, curs_lib.c, smime.c: S/MIME nits. - - * reap.pl: We don't need this any more. - -- * imap/message.c, doc/Makefile.in, doc/smime-notes.txt, contrib/Makefile.in, contrib/ca-bundle.crt, contrib/smime.rc, Makefile.am, OPS.CRYPT, OPS.PGP, OPS.SMIME, attach.c, commands.c, compose.c, configure.in, copy.c, copy.h, crypt.c, crypt.h, curs_main.c, functions.h, globals.h, handler.c, hdrline.c, headers.c, hook.c, init.c, init.h, keymap.c, keymap.h, main.c, mutt.h, muttlib.c, mx.c, pager.c, parse.c, pattern.c, pgp.c, pgp.h, pgplib.h, pop.c, postpone.c, protos.h, recvattach.c, send.c, sendlib.c, smime.c, smime.h, smime_keys.pl: S/MIME support. From Oliver Ehli and Mike Schiraldi -+ * imap/message.c, doc/Makefile.in, doc/smime-notes.txt, -+ contrib/Makefile.in, contrib/ca-bundle.crt, contrib/smime.rc, -+ Makefile.am, OPS.CRYPT, OPS.PGP, OPS.SMIME, attach.c, commands.c, -+ compose.c, configure.in, copy.c, copy.h, crypt.c, crypt.h, -+ curs_main.c, functions.h, globals.h, handler.c, hdrline.c, -+ headers.c, hook.c, init.c, init.h, keymap.c, keymap.h, main.c, -+ mutt.h, muttlib.c, mx.c, pager.c, parse.c, pattern.c, pgp.c, -+ pgp.h, pgplib.h, pop.c, postpone.c, protos.h, recvattach.c, -+ send.c, sendlib.c, smime.c, smime.h, smime_keys.pl: S/MIME -+ support. From Oliver Ehli and Mike Schiraldi - . - - * po/pt_BR.po, po/pt_BR.po: update - -- * doc/manual.sgml.head, doc/muttrc.man.head, attach.c, globals.h, init.h, protos.h, rfc1524.c, sendlib.c: Introduce mime_lookup. From Brian Foley and Ulf Erikson. -+ * doc/manual.sgml.head, doc/muttrc.man.head, attach.c, globals.h, -+ init.h, protos.h, rfc1524.c, sendlib.c: Introduce mime_lookup. -+ From Brian Foley and Ulf Erikson. - - * po/ru.po, po/ru.po: update - -@@ -4783,290 +5350,11206 @@ - - * VERSION: Pseudo-revision for mutt-1.5. - -- * m4/glibc21.m4, m4/gssapi.m4, m4/iconv.m4, m4/lcmessage.m4, m4/progtest.m4, m4/funcdecl.m4, m4/gettext.m4, m4/codeset.m4, m4/curslib.m4, m4/README, m4/.cvsignore, m4/Makefile.am.in: version bump -- -- * po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/fr.po, po/gl.po, po/hu.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/.cvsignore, po/Makefile.in.in, po/POTFILES.in, po/ca.po, po/cs.po, po/da.po, po/de.po, imap/.cvsignore, imap/BUGS, imap/Makefile.am, imap/README, imap/TODO, imap/auth.c, imap/auth.h, imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c, imap/auth_login.c, imap/auth_sasl.c, imap/browse.c, imap/command.c, imap/imap.c, imap/imap.h, imap/imap_private.h, imap/message.c, imap/message.h, imap/utf7.c, imap/util.c: more version bumps. -- -- * intl/.cvsignore, intl/COPYING.LIB-2, intl/COPYING.LIB-2.1, intl/ChangeLog, intl/Makefile.in, intl/VERSION, intl/bindtextdom.c, intl/cat-compat.c, intl/config.charset, intl/dcgettext.c, intl/dcigettext.c, intl/dcngettext.c, intl/dgettext.c, intl/dngettext.c, intl/explodename.c, intl/finddomain.c, intl/gettext.c, intl/gettext.h, intl/gettextP.h, intl/hash-string.h, intl/intl-compat.c, intl/l10nflist.c, intl/libgettext.h, intl/libgnuintl.h, intl/libintl.glibc, intl/linux-msg.sed, intl/loadinfo.h, intl/loadmsgcat.c, intl/localcharset.c, intl/locale.alias, intl/localealias.c, intl/ngettext.c, intl/plural.c, intl/plural.y, intl/po2tbl.sed.in, intl/ref-add.sin, intl/ref-del.sin, intl/textdomain.c, intl/xopen-msg.sed: more version number updates. -+ * m4/glibc21.m4, m4/gssapi.m4, m4/iconv.m4, m4/lcmessage.m4, -+ m4/progtest.m4, m4/funcdecl.m4, m4/gettext.m4, m4/codeset.m4, -+ m4/curslib.m4, m4/README, m4/.cvsignore, m4/Makefile.am.in: -+ version bump - -- * doc/.cvsignore, doc/Makefile.in, doc/PGP-Notes.txt, doc/applying-patches.txt, doc/devel-notes.txt, doc/dotlock.man, doc/instdoc.sh.in, doc/manual.sgml.head, doc/manual.sgml.tail, doc/mbox.man, doc/mutt.man, doc/muttbug.man, doc/muttrc.man.head, doc/muttrc.man.tail, doc/patch-notes.txt: more version number updates -- -- * contrib/iconv/README, contrib/iconv/iconv.aix-3.2.5.rc, contrib/iconv/iconv.aix-4.1.5.rc, contrib/iconv/iconv.aix-4.2.0.rc, contrib/iconv/iconv.aix-4.3.2.rc, contrib/iconv/iconv.freebsd-3.3.rc, contrib/iconv/iconv.glibc-2.1.3.rc, contrib/iconv/iconv.glibc-2.1.90.rc, contrib/iconv/iconv.hpux-10.01.rc, contrib/iconv/iconv.hpux-10.20.rc, contrib/iconv/iconv.hpux-11.00.rc, contrib/iconv/iconv.irix-6.5.rc, contrib/iconv/iconv.osf1-4.0a.rc, contrib/iconv/iconv.osf1-4.0d.rc, contrib/iconv/iconv.solaris-2.4.rc, contrib/iconv/iconv.solaris-2.5.1.rc, contrib/iconv/iconv.solaris-2.6-cjk.rc, contrib/iconv/iconv.solaris-2.6.rc, contrib/iconv/iconv.solaris-2.7.rc, contrib/iconv/make.sh, contrib/.cvsignore, contrib/Makefile.in, contrib/Mush.rc, contrib/Pine.rc, contrib/Tin.rc, contrib/gpg.rc, contrib/language.txt, contrib/language50.txt, contrib/patch.slang-1.2.2.keypad.1, contrib/pgp2.rc, contrib/pgp5.rc, contrib/pgp6.rc, contrib/sample.mailcap, contrib/sample.muttrc, contrib/sample.muttrc-tlr: Bumping more version numbers. -- -- * snprintf.c, sort.c, sort.h, stamp-h.in, status.c, strcasecmp.c, strdup.c, system.c, thread.c, url.c, url.h, utf8.c, wcwidth.c, pgpkey.c, pgplib.c, pgplib.h, pgpmicalg.c, pgppacket.c, pgppacket.h, pgppubring.c, pop.c, pop.h, pop_auth.c, pop_lib.c, postpone.c, prepare, protos.h, query.c, reap.pl, recvattach.c, recvcmd.c, regex.c, reldate.h, remailer.c, remailer.h, resize.c, rfc1524.c, rfc1524.h, rfc2047.c, rfc2047.h, rfc2231.c, rfc2231.h, rfc822.c, rfc822.h, score.c, send.c, sendlib.c, sha1.c, sha1.h, signal.c, md5.h, md5c.c, menu.c, mh.c, mime.h, mime.types, missing, mkinstalldirs, mkjtags.c, mutt.h, mutt_curses.h, mutt_menu.h, mutt_regex.h, mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h, mutt_ssl.c, mutt_ssl.h, mutt_ssl_nss.c, mutt_tunnel.c, mutt_tunnel.h, muttbug, muttbug.sh.in, muttlib.c, mx.c, mx.h, pager.c, pager.h, parse.c, patchlist.sh, pattern.c, pgp.c, pgp.h, pgpewrap.c, pgpinvoke.c, editmsg.c, enter.c, extlib.c, filter.c, flags.c, from.c, functions.h, gen_defs, getdomain.c, gettext.c, globals.h, gnupgparse.c, handler.c, hash.c, hash.h, hdrline.c, headers.c, help.c, history.c, history.h, hook.c, init.c, init.h, install-sh, keymap.c, keymap.h, lib.c, lib.h, mailbox.h, main.c, makedoc.c, mapping.h, mbox.c, mbyte.c, mbyte.h, attach.c, attach.h, base64.c, browser.c, browser.h, buffy.c, buffy.h, build-release, charset.c, charset.h, check_sec.sh, color.c, commands.c, complete.c, compose.c, config.guess, config.sub, configure.in, copy.c, copy.h, curs_lib.c, curs_main.c, date.c, depcomp, dotlock.c, dotlock.h, edit.c, GPL, INSTALL, Makefile.am, Muttrc.head.in, NEWS, OPS, OPS.MIX, OPS.PGP, PATCHES, README, README.SECURITY, README.SSL, TODO, VERSION, _regex.h, acconfig.h, account.c, account.h, addrbook.c, alias.c, ascii.c, ascii.h, .cvsignore, ABOUT-NLS, BEWARE, COPYRIGHT, ChangeLog: Bumping version numbers to 3.0, for the new unstable branch. -- -- * send.c: branches: 2.77.2; -- Set default Fcc when resending a message. -- -- * po/ja.po: branches: 1.33.2; -- update -- --2002/01/23 22:37:12 Thomas Roessler -- -- * po/da.po: branches: 1.67.2; -- updates -- -- * po/el.po: branches: 1.77.2; -- updates -- -- * po/et.po: branches: 1.21.2; -- updates -- -- * po/ko.po: branches: 1.72.2; -- updates -- -- * po/pl.po: branches: 1.94.2; -+ * po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, -+ po/zh_TW.po, po/pl.po, po/pt_BR.po, po/ru.po, po/id.po, -+ po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/fr.po, -+ po/gl.po, po/hu.po, po/el.po, po/eo.po, po/es.po, po/et.po, -+ po/.cvsignore, po/Makefile.in.in, po/POTFILES.in, po/ca.po, -+ po/cs.po, po/da.po, po/de.po, imap/.cvsignore, imap/BUGS, -+ imap/Makefile.am, imap/README, imap/TODO, imap/auth.c, -+ imap/auth.h, imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c, -+ imap/auth_login.c, imap/auth_sasl.c, imap/browse.c, -+ imap/command.c, imap/imap.c, imap/imap.h, imap/imap_private.h, -+ imap/message.c, imap/message.h, imap/utf7.c, imap/util.c: more -+ version bumps. -+ -+ * intl/.cvsignore, intl/COPYING.LIB-2, intl/COPYING.LIB-2.1, -+ intl/ChangeLog, intl/Makefile.in, intl/VERSION, -+ intl/bindtextdom.c, intl/cat-compat.c, intl/config.charset, -+ intl/dcgettext.c, intl/dcigettext.c, intl/dcngettext.c, -+ intl/dgettext.c, intl/dngettext.c, intl/explodename.c, -+ intl/finddomain.c, intl/gettext.c, intl/gettext.h, -+ intl/gettextP.h, intl/hash-string.h, intl/intl-compat.c, -+ intl/l10nflist.c, intl/libgettext.h, intl/libgnuintl.h, -+ intl/libintl.glibc, intl/linux-msg.sed, intl/loadinfo.h, -+ intl/loadmsgcat.c, intl/localcharset.c, intl/locale.alias, -+ intl/localealias.c, intl/ngettext.c, intl/plural.c, intl/plural.y, -+ intl/po2tbl.sed.in, intl/ref-add.sin, intl/ref-del.sin, -+ intl/textdomain.c, intl/xopen-msg.sed: more version number -+ updates. -+ -+ * doc/.cvsignore, doc/Makefile.in, doc/PGP-Notes.txt, -+ doc/applying-patches.txt, doc/devel-notes.txt, doc/dotlock.man, -+ doc/instdoc.sh.in, doc/manual.sgml.head, doc/manual.sgml.tail, -+ doc/mbox.man, doc/mutt.man, doc/muttbug.man, doc/muttrc.man.head, -+ doc/muttrc.man.tail, doc/patch-notes.txt: more version number - updates - -- * po/uk.po, po/id.po: branches: 1.84.2; -- update -- -- * charset.c: branches: 2.50.2; -- Fix #999. A single missing comma. -+ * contrib/iconv/README, contrib/iconv/iconv.aix-3.2.5.rc, -+ contrib/iconv/iconv.aix-4.1.5.rc, -+ contrib/iconv/iconv.aix-4.2.0.rc, -+ contrib/iconv/iconv.aix-4.3.2.rc, -+ contrib/iconv/iconv.freebsd-3.3.rc, -+ contrib/iconv/iconv.glibc-2.1.3.rc, -+ contrib/iconv/iconv.glibc-2.1.90.rc, -+ contrib/iconv/iconv.hpux-10.01.rc, -+ contrib/iconv/iconv.hpux-10.20.rc, -+ contrib/iconv/iconv.hpux-11.00.rc, -+ contrib/iconv/iconv.irix-6.5.rc, contrib/iconv/iconv.osf1-4.0a.rc, -+ contrib/iconv/iconv.osf1-4.0d.rc, -+ contrib/iconv/iconv.solaris-2.4.rc, -+ contrib/iconv/iconv.solaris-2.5.1.rc, -+ contrib/iconv/iconv.solaris-2.6-cjk.rc, -+ contrib/iconv/iconv.solaris-2.6.rc, -+ contrib/iconv/iconv.solaris-2.7.rc, contrib/iconv/make.sh, -+ contrib/.cvsignore, contrib/Makefile.in, contrib/Mush.rc, -+ contrib/Pine.rc, contrib/Tin.rc, contrib/gpg.rc, -+ contrib/language.txt, contrib/language50.txt, -+ contrib/patch.slang-1.2.2.keypad.1, contrib/pgp2.rc, -+ contrib/pgp5.rc, contrib/pgp6.rc, contrib/sample.mailcap, -+ contrib/sample.muttrc, contrib/sample.muttrc-tlr: Bumping more -+ version numbers. -+ -+ * snprintf.c, sort.c, sort.h, stamp-h.in, status.c, strcasecmp.c, -+ strdup.c, system.c, thread.c, url.c, url.h, utf8.c, wcwidth.c, -+ pgpkey.c, pgplib.c, pgplib.h, pgpmicalg.c, pgppacket.c, -+ pgppacket.h, pgppubring.c, pop.c, pop.h, pop_auth.c, pop_lib.c, -+ postpone.c, prepare, protos.h, query.c, reap.pl, recvattach.c, -+ recvcmd.c, regex.c, reldate.h, remailer.c, remailer.h, -+ resize.c, rfc1524.c, rfc1524.h, rfc2047.c, rfc2047.h, -+ rfc2231.c, rfc2231.h, rfc822.c, rfc822.h, score.c, send.c, -+ sendlib.c, sha1.c, sha1.h, signal.c, md5.h, md5c.c, menu.c, -+ mh.c, mime.h, mime.types, missing, mkinstalldirs, mkjtags.c, -+ mutt.h, mutt_curses.h, mutt_menu.h, mutt_regex.h, mutt_sasl.c, -+ mutt_sasl.h, mutt_socket.c, mutt_socket.h, mutt_ssl.c, -+ mutt_ssl.h, mutt_ssl_nss.c, mutt_tunnel.c, mutt_tunnel.h, -+ muttbug, muttbug.sh.in, muttlib.c, mx.c, mx.h, pager.c, pager.h, -+ parse.c, patchlist.sh, pattern.c, pgp.c, pgp.h, pgpewrap.c, -+ pgpinvoke.c, editmsg.c, enter.c, extlib.c, filter.c, flags.c, -+ from.c, functions.h, gen_defs, getdomain.c, gettext.c, globals.h, -+ gnupgparse.c, handler.c, hash.c, hash.h, hdrline.c, headers.c, -+ help.c, history.c, history.h, hook.c, init.c, init.h, install-sh, -+ keymap.c, keymap.h, lib.c, lib.h, mailbox.h, main.c, makedoc.c, -+ mapping.h, mbox.c, mbyte.c, mbyte.h, attach.c, attach.h, base64.c, -+ browser.c, browser.h, buffy.c, buffy.h, build-release, charset.c, -+ charset.h, check_sec.sh, color.c, commands.c, complete.c, -+ compose.c, config.guess, config.sub, configure.in, copy.c, copy.h, -+ curs_lib.c, curs_main.c, date.c, depcomp, dotlock.c, dotlock.h, -+ edit.c, GPL, INSTALL, Makefile.am, Muttrc.head.in, NEWS, OPS, -+ OPS.MIX, OPS.PGP, PATCHES, README, README.SECURITY, README.SSL, -+ TODO, VERSION, _regex.h, acconfig.h, account.c, account.h, -+ addrbook.c, alias.c, ascii.c, ascii.h, .cvsignore, ABOUT-NLS, -+ BEWARE, COPYRIGHT, ChangeLog: Bumping version numbers to 3.0, -+ for the new unstable branch. -+ -+ * send.c: branches: 2.77.2; Set default Fcc when resending -+ a message. -+ -+ * po/ja.po: branches: 1.33.2; update -+ -+2002-01-23 22:37:12 roessler (roessler) -+ -+ * po/da.po: branches: 1.67.2; updates -+ -+ * po/el.po: branches: 1.77.2; updates -+ -+ * po/et.po: branches: 1.21.2; updates -+ -+ * po/ko.po: branches: 1.72.2; updates -+ -+ * po/pl.po: branches: 1.94.2; updates -+ -+ * po/uk.po, po/id.po: branches: 1.84.2; update -+ -+ * charset.c: branches: 2.50.2; Fix #999. A single missing comma. -+ -+2002-01-22 12:12:45 roessler (roessler) -+ -+ * po/pt_BR.po: branches: 1.58.2; automatic post-release commit -+ for mutt-1.3.27 -+ -+ * po/ru.po: branches: 1.129.2; automatic post-release commit -+ for mutt-1.3.27 - --2002/01/22 12:12:45 Thomas Roessler -+ * po/sk.po: branches: 1.66.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/pt_BR.po: branches: 1.58.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/sv.po: branches: 1.80.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/ru.po: branches: 1.129.2; -- automatic post-release commit for mutt-1.3.27 -- -- * po/sk.po: branches: 1.66.2; -- automatic post-release commit for mutt-1.3.27 -- -- * po/sv.po: branches: 1.80.2; -- automatic post-release commit for mutt-1.3.27 -- -- * po/tr.po: branches: 1.25.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/tr.po: branches: 1.25.2; automatic post-release commit -+ for mutt-1.3.27 - - * po/uk.po: automatic post-release commit for mutt-1.3.27 - -- * po/zh_CN.po: branches: 1.14.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/zh_CN.po: branches: 1.14.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/zh_TW.po: branches: 1.11.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/zh_TW.po: branches: 1.11.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/hu.po: branches: 1.17.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/hu.po: branches: 1.17.2; automatic post-release commit -+ for mutt-1.3.27 - - * po/id.po: automatic post-release commit for mutt-1.3.27 - -- * po/it.po: branches: 1.103.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/it.po: branches: 1.103.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/ja.po, po/ko.po: automatic post-release commit for mutt-1.3.27 -+ * po/ja.po, po/ko.po: automatic post-release commit for -+ mutt-1.3.27 - -- * po/lt.po: branches: 1.25.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/lt.po: branches: 1.25.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/nl.po: branches: 1.74.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/nl.po: branches: 1.74.2; automatic post-release commit -+ for mutt-1.3.27 - - * po/pl.po: automatic post-release commit for mutt-1.3.27 - -- * po/ca.po: branches: 1.6.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/ca.po: branches: 1.6.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/cs.po: branches: 1.75.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/cs.po: branches: 1.75.2; automatic post-release commit -+ for mutt-1.3.27 - - * po/da.po: automatic post-release commit for mutt-1.3.27 - -- * po/de.po: branches: 1.160.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/de.po: branches: 1.160.2; automatic post-release commit -+ for mutt-1.3.27 - - * po/el.po: automatic post-release commit for mutt-1.3.27 - -- * po/eo.po: branches: 1.80.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/eo.po: branches: 1.80.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/es.po: branches: 1.89.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/es.po: branches: 1.89.2; automatic post-release commit -+ for mutt-1.3.27 - - * po/et.po: automatic post-release commit for mutt-1.3.27 - -- * po/fr.po: branches: 1.108.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/fr.po: branches: 1.108.2; automatic post-release commit -+ for mutt-1.3.27 - -- * po/gl.po: branches: 1.61.2; -- automatic post-release commit for mutt-1.3.27 -+ * po/gl.po: branches: 1.61.2; automatic post-release commit -+ for mutt-1.3.27 - -- * ChangeLog: branches: 2.73.2; -- automatic post-release commit for mutt-1.3.27 -+ * ChangeLog: branches: 2.73.2; automatic post-release commit -+ for mutt-1.3.27 - -- * VERSION: branches: 2.63.2; -- automatic post-release commit for mutt-1.3.27 -+ * VERSION: branches: 2.63.2; automatic post-release commit -+ for mutt-1.3.27 - -- * reldate.h: branches: 2.55.2; -- automatic post-release commit for mutt-1.3.27 -+ * reldate.h: branches: 2.55.2; automatic post-release commit -+ for mutt-1.3.27 - --2002/01/21 17:43:19 Thomas Roessler -+2002-01-21 17:43:19 roessler (roessler) - - * po/it.po: update - - * po/sv.po, po/de.po, po/eo.po: updates - -- * mutt_ssl.c: A fix from Ulf Erikson, which he says to fix bug #989. -+ * mutt_ssl.c: A fix from Ulf Erikson, which he says to fix -+ bug #989. - --2002/01/18 11:44:54 Thomas Roessler -+2002-01-18 11:44:54 roessler (roessler) - -- * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, VERSION, po/ca.po, po/cs.po, po/da.po, po/de.po, po/el.po, reldate.h, ChangeLog: automatic post-release commit for mutt-1.3.26 -+ * po/zh_CN.po, po/zh_TW.po, po/pt_BR.po, po/ru.po, po/sk.po, -+ po/sv.po, po/tr.po, po/uk.po, po/hu.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/eo.po, -+ po/es.po, po/et.po, po/fr.po, po/gl.po, VERSION, po/ca.po, -+ po/cs.po, po/da.po, po/de.po, po/el.po, reldate.h, ChangeLog: -+ automatic post-release commit for mutt-1.3.26 - --2002/01/17 22:41:45 Thomas Roessler -+2002-01-17 22:41:45 roessler (roessler) - -- * configure.in: branches: 2.129.2; -- Use ncurses.h for configure tests, if present. -+ * configure.in: branches: 2.129.2; Use ncurses.h for configure -+ tests, if present. - --2002/01/16 20:44:49 Thomas Roessler -+2002-01-16 20:44:49 roessler (roessler) - -- * config.guess, config.sub, missing, mkinstalldirs: Updated auto* files. From Lars Hecking. -+ * config.guess, config.sub, missing, mkinstalldirs: Updated auto* -+ files. From Lars Hecking. - - * curs_main.c: patch-1.3.25-de-new_threads.1 - -- * protos.h: branches: 2.86.2; -- patch-1.3.25-de-new_threads.1 -+ * protos.h: branches: 2.86.2; patch-1.3.25-de-new_threads.1 - -- * thread.c: branches: 2.27.2; -- patch-1.3.25-de-new_threads.1 -+ * thread.c: branches: 2.27.2; patch-1.3.25-de-new_threads.1 - --2002/01/15 22:08:12 Thomas Roessler -+2002-01-15 22:08:12 roessler (roessler) - -- * acconfig.h, configure.in: Configure and config.h cleanup. From Lars Hecking. -+ * acconfig.h, configure.in: Configure and config.h cleanup. -+ From Lars Hecking. - -- * handler.c: branches: 2.52.2; -- Don't hallucinate a '\n' in the end of quoted-printable encoded -- attachments. -+ * handler.c: branches: 2.52.2; Don't hallucinate a '\n' in the -+ end of quoted-printable encoded attachments. - - * po/fr.po: update. - - * flags.c: patch-1.3.25.tlr.maildir_trash.1 - -- * mh.c: branches: 2.42.2; -- patch-1.3.25.tlr.maildir_trash.1 -+ * mh.c: branches: 2.42.2; patch-1.3.25.tlr.maildir_trash.1 - -- * mutt.h: branches: 2.111.2; -- patch-1.3.25.tlr.maildir_trash.1 -+ * mutt.h: branches: 2.111.2; patch-1.3.25.tlr.maildir_trash.1 - -- * mx.c: branches: 2.63.2; -- patch-1.3.25.tlr.maildir_trash.1 -+ * mx.c: branches: 2.63.2; patch-1.3.25.tlr.maildir_trash.1 - - * po/ko.po: update - -- * init.c: branches: 2.60.2; -- Avoid reading past the end of ta string when handling \ or ^ -- sequences. From Michael Elkins. -+ * init.c: branches: 2.60.2; Avoid reading past the end of ta -+ string when handling \ or ^ sequences. From Michael Elkins. - -- * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/ca.po, po/cs.po, po/da.po, pgpkey.c: Shorten some messages. Noted by Jeremy Blosser. #978. -+ * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/nl.po, -+ po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/gl.po, -+ po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, -+ po/ca.po, po/cs.po, po/da.po, pgpkey.c: Shorten some messages. -+ Noted by Jeremy Blosser. #978. - -- * pattern.c: branches: 2.23.2; -- Fix an off-by-one error. -+ * pattern.c: branches: 2.23.2; Fix an off-by-one error. - --2002/01/14 09:03:31 Thomas Roessler -+2002-01-14 09:03:31 roessler (roessler) - -- * imap/imap.c: branches: 1.90.2; -- fix another case-sensitive comparison. -+ * imap/imap.c: branches: 1.90.2; fix another case-sensitive -+ comparison. - --2002/01/13 21:19:25 Thomas Roessler -+2002-01-13 21:19:25 roessler (roessler) - - * ascii.h: Fix the ascii_strncmp() macro. - -- * imap/auth_sasl.c: Parse IMAP responses locale- and case- insensitive. From Brendan -- Cully. -+ * imap/auth_sasl.c: Parse IMAP responses locale- and case- -+ insensitive. From Brendan Cully. - -- * imap/browse.c: branches: 1.34.2; -- Parse IMAP responses locale- and case- insensitive. From Brendan -- Cully. -+ * imap/browse.c: branches: 1.34.2; Parse IMAP responses locale- -+ and case- insensitive. From Brendan Cully. - -- * imap/command.c: branches: 1.35.2; -- Parse IMAP responses locale- and case- insensitive. From Brendan -- Cully. -+ * imap/command.c: branches: 1.35.2; Parse IMAP responses locale- -+ and case- insensitive. From Brendan Cully. - -- * imap/imap.c: Parse IMAP responses locale- and case- insensitive. From Brendan -- Cully. -+ * imap/imap.c: Parse IMAP responses locale- and case- insensitive. -+ From Brendan Cully. - -- * imap/message.c: branches: 1.60.2; -- Parse IMAP responses locale- and case- insensitive. From Brendan -- Cully. -+ * imap/message.c: branches: 1.60.2; Parse IMAP responses locale- -+ and case- insensitive. From Brendan Cully. - -- * imap/util.c: branches: 1.51.2; -- Parse IMAP responses locale- and case- insensitive. From Brendan -- Cully. -+ * imap/util.c: branches: 1.51.2; Parse IMAP responses locale- -+ and case- insensitive. From Brendan Cully. - -- * muttlib.c: branches: 2.52.2; -- A different fix for the '\012' issue. Bug tracked down by Johannes -- Geiger . -+ * muttlib.c: branches: 2.52.2; A different fix for the '\012' -+ issue. Bug tracked down by Johannes Geiger . - -- * pager.c: A different fix for the '\012' issue. Bug tracked down by Johannes -- Geiger . -+ * pager.c: A different fix for the '\012' issue. Bug tracked -+ down by Johannes Geiger . - --2002/01/12 11:42:18 Thomas Roessler -+2002-01-12 11:42:18 roessler (roessler) - - * NEWS: More on ~=. - -- * doc/manual.sgml.head: branches: 1.73.2; -- Add a ~= pattern. From Frederic Duval. -+ * doc/manual.sgml.head: branches: 1.73.2; Add a ~= pattern. -+ From Frederic Duval. - -- * doc/muttrc.man.head: branches: 1.16.2; -- Add a ~= pattern. From Frederic Duval. -+ * doc/muttrc.man.head: branches: 1.16.2; Add a ~= pattern. -+ From Frederic Duval. - -- * mutt.h, pattern.c: Add a ~= pattern. From Frederic Duval. -+ * mutt.h, pattern.c: Add a ~= pattern. From Frederic Duval. - - * doc/manual.sgml.head: Fix a typo, #971. - --2002/01/09 15:39:28 Thomas Roessler -+2002-01-09 15:39:28 roessler (roessler) - - * pgp.c: Fix #960. - --2002/01/08 13:06:21 Thomas Roessler -+2002-01-08 13:06:21 roessler (roessler) - - * mx.c: Try to fix #943. - -- * INSTALL: branches: 2.15.2; 2.15.4; -- fix libiconv URL. #959. -+ * INSTALL: branches: 2.15.2; 2.15.4; fix libiconv URL. #959. - - * NEWS: fix libiconv URL. #959. - --2002/01/07 19:10:51 Thomas Roessler -+2002-01-07 19:10:51 roessler (roessler) - - * po/ko.po: update - -- * attach.c: branches: 2.29.2; -- Fix #951. -+ * attach.c: branches: 2.29.2; Fix #951. - --2002/01/04 14:30:29 Thomas Roessler -+2002-01-04 14:30:29 roessler (roessler) - -- * rfc822.c: Terminate the correct buffer. Noted by Durval Menezes -- . (This bug shouldn't have any security -- implications. ;-) -+ * rfc822.c: Terminate the correct buffer. Noted by Durval -+ Menezes . (This bug shouldn't have any -+ security implications. ;-) - - * po/et.po, po/fr.po, po/pl.po, po/sv.po: updates. - --2002/01/03 20:57:20 Thomas Roessler -+2002-01-03 20:57:20 roessler (roessler) - -- * mutt_ssl.c, mutt_ssl.h, mutt_ssl_nss.c, globals.h: Move some globals where they belong. From Brendan Cully. -+ * mutt_ssl.c, mutt_ssl.h, mutt_ssl_nss.c, globals.h: Move some -+ globals where they belong. From Brendan Cully. - --2002/01/02 16:28:46 Thomas Roessler -+2002-01-02 16:28:46 roessler (roessler) - - * acconfig.h: Cleanup; from Lars Hecking. - - * mutt_ssl.c: Replace a few strncpy() calls by strfcpy(). - -- * recvcmd.c: Bug fix. Problem noted by Vincent Lefevre's compiler. -+ * recvcmd.c: Bug fix. Problem noted by Vincent Lefevre's -+ compiler. - - * muttlib.c: Fix the \012 bug. - --2002/01/01 20:18:41 Thomas Roessler -+2002-01-01 20:18:41 roessler (roessler) - -- * po/zh_TW.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, po/Makefile.in.in, po/ca.po, po/cs.po, reldate.h, ChangeLog, VERSION: automatic post-release commit for mutt-1.3.25 -+ * po/zh_TW.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, -+ po/tr.po, po/uk.po, po/zh_CN.po, po/hu.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/da.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, -+ po/gl.po, po/Makefile.in.in, po/ca.po, po/cs.po, reldate.h, -+ ChangeLog, VERSION: automatic post-release commit for mutt-1.3.25 - -- * intl/COPYING.LIB-2, intl/COPYING.LIB-2.1: ups, these were missing from the CVS. -+ * intl/COPYING.LIB-2, intl/COPYING.LIB-2.1: ups, these were -+ missing from the CVS. - - * po/ca.po: update. - -- * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/ru.po, po/pl.po, po/pt_BR.po, po/ko.po, po/nl.po, po/it.po, po/gl.po, po/id.po, po/es.po, po/fr.po, po/el.po, po/eo.po, po/de.po, po/cs.po, po/da.po, ChangeLog, VERSION, rfc822.c: post-release commit for mutt-1.2.5.1. -+ * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/ru.po, -+ po/pl.po, po/pt_BR.po, po/ko.po, po/nl.po, po/it.po, po/gl.po, -+ po/id.po, po/es.po, po/fr.po, po/el.po, po/eo.po, po/de.po, -+ po/cs.po, po/da.po, ChangeLog, VERSION, rfc822.c: post-release -+ commit for mutt-1.2.5.1. - - * rfc822.c: Fix a security problem. - -+2001-12-28 17:19:00 roessler (roessler) -+ -+ * protos.h, recvcmd.c, send.c: Make sure References and -+ In-Reply-To headers are generated properly when the user replies -+ to one or more message-type attachments. -+ -+2001-12-26 19:24:46 roessler (roessler) -+ -+ * imap/imap.c: Possible fix for #905. From Daniel Eisenbud. -+ -+2001-12-21 00:22:12 roessler (roessler) -+ -+ * pager.c: Fix #929. -+ -+2001-12-18 15:13:18 roessler (roessler) -+ -+ * imap/imap.c, imap/imap.h: Fix from #918. From -+ . -+ -+ * browser.c: branches: 2.38.2; Fix from #918. From -+ . -+ -+ * po/Makefile.in.in: Updating to gettext-0.10.40. -+ -+ * m4/gettext.m4: branches: 1.7.2; 1.7.4; Updating to -+ gettext-0.10.40. -+ -+ * m4/iconv.m4: branches: 1.3.2; Updating to gettext-0.10.40. -+ -+ * m4/lcmessage.m4: branches: 1.3.2; 1.3.4; Updating to -+ gettext-0.10.40. -+ -+ * m4/progtest.m4: branches: 1.4.2; 1.4.4; Updating to -+ gettext-0.10.40. -+ -+ * ABOUT-NLS: branches: 2.1.2; 2.1.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/ChangeLog, intl/Makefile.in: branches: 1.3.2; 1.3.4; -+ Updating to gettext-0.10.40. -+ -+ * intl/VERSION: Updating to gettext-0.10.40. -+ -+ * intl/bindtextdom.c: branches: 1.5.2; 1.5.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/config.charset: branches: 1.2.2; 1.2.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/dcgettext.c: Updating to gettext-0.10.40. -+ -+ * intl/dcigettext.c: branches: 1.2.2; 1.2.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/dcngettext.c, intl/dgettext.c, intl/dngettext.c, -+ intl/explodename.c, intl/finddomain.c, intl/gettext.c, -+ intl/gettext.h: Updating to gettext-0.10.40. -+ -+ * intl/gettextP.h, intl/hash-string.h: branches: 1.4.2; 1.4.4; -+ Updating to gettext-0.10.40. -+ -+ * intl/intl-compat.c: Updating to gettext-0.10.40. -+ -+ * intl/l10nflist.c: branches: 1.5.2; 1.5.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/libgettext.h: Updating to gettext-0.10.40. -+ -+ * intl/libgnuintl.h: branches: 1.2.2; 1.2.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/loadinfo.h: branches: 1.4.2; 1.4.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/loadmsgcat.c: branches: 1.5.2; 1.5.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/localcharset.c: branches: 1.2.2; 1.2.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/locale.alias: Updating to gettext-0.10.40. -+ -+ * intl/localealias.c: branches: 1.5.2; 1.5.4; Updating to -+ gettext-0.10.40. -+ -+ * intl/ngettext.c: Updating to gettext-0.10.40. -+ -+ * intl/plural.c, intl/plural.y: branches: 1.2.2; 1.2.4; -+ Updating to gettext-0.10.40. -+ -+ * intl/textdomain.c: Updating to gettext-0.10.40. -+ -+2001-12-17 10:08:18 roessler (roessler) -+ -+ * edit.c: Fix a memory allocation bug. #917. -+ -+ * thread.c: Another threading update. -+ -+ * hdrline.c: branches: 2.27.2; Another threading update. -+ -+2001-12-13 12:10:59 roessler (roessler) -+ -+ * menu.c: branches: 2.27.2; Threading updates, from Daniel -+ Eisenbud. -+ -+ * mutt.h, sort.c, thread.c: Threading updates, from Daniel -+ Eisenbud. -+ -+ * pager.c: compile fix. -+ -+2001-12-11 23:30:59 roessler (roessler) -+ -+ * doc/muttrc.man.head: Typo, #911. -+ -+ * po/it.po: update -+ -+ * contrib/gpg.rc: Remove an unnecessary \-quoting. -+ -+ * init.c, pager.c: Add a missing else. -+ -+ * contrib/gpg.rc: Use gettext to determine the good signature -+ pattern. -+ -+ * init.c: Make "`...`" work as expected. -+ -+ * po/it.po: update. -+ -+2001-12-10 13:12:41 roessler (roessler) -+ -+ * query.c: Fix #910. -+ -+ * init.h: branches: 2.143.2; Change the default for -+ $pgp_replyencrypt to "yes". -+ -+ * po/ja.po, po/pl.po: updates. -+ -+2001-12-09 09:12:08 roessler (roessler) -+ -+ * po/ca.po, configure.in: Add a Catalan translation. From Ivan -+ Vilata i Balaguer . -+ -+2001-12-04 10:28:22 roessler (roessler) -+ -+ * po/ru.po: update -+ -+2001-12-03 18:36:09 roessler (roessler) -+ -+ * po/da.po, po/de.po: update. -+ -+ * mx.c: Try to detect write() errors by calling fsync() after -+ fflush(). May fix #895. -+ -+2001-11-29 09:43:41 roessler (roessler) -+ -+ * po/zh_TW.po, po/zh_CN.po, po/sk.po, po/sv.po, po/tr.po, -+ po/uk.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/hu.po, -+ po/id.po, po/it.po, po/ja.po, po/ko.po, po/lt.po, po/eo.po, -+ po/es.po, po/et.po, po/fr.po, po/gl.po, ChangeLog, VERSION, -+ po/cs.po, po/da.po, po/de.po, po/el.po, reldate.h: automatic -+ post-release commit for mutt-1.3.24 -+ -+2001-11-28 10:30:36 roessler (roessler) -+ -+ * po/id.po: update -+ -+2001-11-26 19:16:52 roessler (roessler) -+ -+ * PATCHES: PATCHES should be _empty_ in the CVS version. Ups. -+ -+ * PATCHES: patch-1.3.23.2.tt.wcwidth_ja.1. Fix wcwidth_ja(), -+ from Takizawa Takashi . -+ -+ * mbyte.c: branches: 2.18.2; patch-1.3.23.2.tt.wcwidth_ja.1. -+ Fix wcwidth_ja(), from Takizawa Takashi . -+ -+ * handler.c, muttlib.c: patch-1.3.23.2.bj.state_attach_puts.1, -+ from Byrial Jensen. This patch is supposed to make one message -+ more friendly to translators. -+ -+ * po/et.po, po/ja.po, po/pl.po, po/ru.po, po/da.po, po/de.po: -+ updates. -+ -+2001-11-21 13:58:42 roessler (roessler) -+ -+ * handler.c: Use $wrapmargin in the format=flowed handler, too. -+ -+ * pager.c, globals.h, init.h: Add a $wrapmargin configuration -+ variable to fine-tune -+ -+2001-11-19 10:41:32 roessler (roessler) -+ -+ * hash.c: Fix #868, #876. Work-around from Len Lattanzi -+ . -+ -+ * hdrline.c, protos.h, thread.c: Fix mutt_messages_in_thread(). -+ From Daniel Eisenbud. (patch-1.3.23.2-de-new_threads.2-3.gz). -+ -+2001-11-15 18:53:23 roessler (roessler) -+ -+ * remailer.c: Should be slightly better than a mixmaster -+ patch suggested by Stefan Karrmann . -+ (UNTESTED!) -+ -+2001-11-12 09:53:54 roessler (roessler) -+ -+ * sort.c, thread.c: patch-1.3.23.2-de-new_threads.2 -+ -+2001-11-10 08:14:52 roessler (roessler) -+ -+ * po/eo.po, po/fr.po: update -+ -+2001-11-09 09:28:55 roessler (roessler) -+ -+ * mh.c: Add some NONULL's (#863) -+ -+ * Makefile.am: branches: 2.101.2; Distribute patchlist.sh. Ups. -+ -+2001-11-08 22:42:45 roessler (roessler) -+ -+ * po/uk.po, po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, -+ po/tr.po, po/pt_BR.po, po/ru.po, po/nl.po, po/pl.po, po/id.po, -+ po/it.po, po/ja.po, po/ko.po, po/lt.po, po/gl.po, po/hu.po, -+ po/et.po, po/fr.po, VERSION, po/cs.po, po/da.po, po/de.po, -+ po/el.po, po/eo.po, po/es.po, reldate.h, ChangeLog: automatic -+ post-release commit for mutt-1.3.23.2 -+ -+ * pager.c, init.h, mutt.h: Add an $allow_ansi option. Suggested -+ and (mostly) implemented by Mike Schiraldi. -+ -+ * Makefile.am: Don't depend on GNU make. Noted by Bob Bell. -+ -+ * pgp.c: Fix some messages, so the color marker is actually in -+ the beginning of a new line. -+ -+ * globals.h, handler.c, init.c, mutt.h, muttlib.c, pager.c, -+ pgp.c: somewhat cleaner in-band-signalling between the handlers -+ and the pager. In particular, it's more difficult now to get -+ fake PGP and other mutt-generated "[-- " messages colored. -+ -+ * commands.c: branches: 2.50.2; patch-1.3.23.1-de-new_threads.3-4 -+ -+ * curs_main.c, init.c, init.h, mutt.h, sort.c, thread.c: -+ patch-1.3.23.1-de-new_threads.3-4 -+ -+ * handler.c: 2.47 introduced another bug. I should go to bed now. -+ -+ * handler.c: Replace a ridiculous for loop by a proper -+ calculation. Ahem. -+ -+ * handler.c, pager.c: Use a slightly different reset sequence -+ for the format=flowed hack, and don't send any such sequence -+ when we aren't in the internal pager. -+ -+ * pager.c: Trying to fix #738. -+ -+2001-11-07 22:25:09 roessler (roessler) -+ -+ * handler.c: Fix #860. Noted: The format=flowed code is not -+ yet utf-8 aware. -+ -+ * addrbook.c: Fix #858. -+ -+ * doc/patch-notes.txt, Makefile.am: Implement the patchlist -+ scheme instead of version number munging. -+ -+ * main.c: branches: 2.55.2; Implement the patchlist scheme -+ instead of version number munging. -+ -+ * muttlib.c, patchlist.sh, protos.h: Implement the patchlist -+ scheme instead of version number munging. -+ -+ * sendlib.c: branches: 2.94.2; Implement the patchlist scheme -+ instead of version number munging. -+ -+ * complete.c: Fix 706, 853. -+ -+ * commands.c, init.h, mutt.h, thread.c: -+ patch-1.3.23.1-de-new_threads.2-3 -+ -+2001-11-06 20:38:17 roessler (roessler) -+ -+ * mutt.h, sort.c, sort.h, thread.c, menu.c: -+ [patch.1.3.23.1.de.new_threads.2] Daniel Eisenbud's redone -+ threading code, version two. -+ -+ * doc/patch-notes.txt: fix a typo. -+ -+ * PATCHES: uuups, there was a "test" left over. -+ -+ * doc/PGP-Notes.txt: Some part of this documentation was severely -+ outdated. -+ -+ * doc/Makefile.in, doc/patch-notes.txt, Makefile.am, PATCHES, -+ configure.in, main.c, muttlib.c, protos.h, sendlib.c: Add and -+ document a new mechanism for displaying patches in running -+ mutts' output. -+ -+ * send.c: Indentation fixing while staring at the code affected -+ by #857. No fix for the crash, though. -+ -+ * doc/manual.sgml.head, doc/muttrc.man.head, alias.c, init.c: Fix -+ an addressbook bug, and introduce "unalias *". From "g.c.w. de -+ bruijn" . -+ -+2001-11-05 21:38:18 roessler (roessler) -+ -+ * imap/browse.c, imap/imap.c, imap/util.c, mutt_ssl.c, -+ mutt_ssl_nss.c: Missing gettext calls, noted by Byrial Jensen. -+ -+ * pop.c: branches: 2.22.2; Missing gettext calls, noted by -+ Byrial Jensen. -+ -+ * thread.c: Missing gettext calls, noted by Byrial Jensen. -+ -+ * commands.c: Make the save-copy prompt more translator-friendly. -+ from Byrial Jensen. -+ -+ * po/da.po, po/de.po, po/eo.po, po/fr.po, po/ja.po, po/pl.po: -+ updates -+ -+ * mh.c: Fix a segmentation fault which occurs when mutt's get-mail -+ POP mode is used with a maildir spool folder. Noted by Frédéric -+ L. W. Meunier <0@pervalidus.net>. -+ -+ * mutt_socket.c, pop.c: Vsevolod Volkov's fix for #851, and a -+ related bug. -+ -+ * headers.c, muttlib.c, protos.h, send.c: Byrial Jensen's -+ mtime hack is needed at more than one place. Noted by Manoj -+ Kasichainula. -+ -+2001-10-31 09:38:07 roessler (roessler) -+ -+ * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/es.po, -+ po/et.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, -+ po/ru.po, po/sk.po, po/sv.po, ChangeLog, VERSION, po/cs.po, -+ po/da.po, po/de.po, po/el.po, po/eo.po, reldate.h: automatic -+ post-release commit for mutt-1.3.23.1 -+ -+ * imap/message.c, commands.c, curs_main.c, flags.c, hdrline.c, -+ init.h: Advanced threading, v 5.1. From Daniel Eisenbud -+ . -+ -+ * mbox.c: branches: 2.22.2; Advanced threading, v 5.1. -+ From Daniel Eisenbud . -+ -+ * menu.c, mh.c, mutt.h, mx.c, mx.h: Advanced threading, v 5.1. -+ From Daniel Eisenbud . -+ -+ * parse.c: branches: 2.39.2; Advanced threading, v 5.1. -+ From Daniel Eisenbud . -+ -+ * pop.c, postpone.c, protos.h, sort.c, sort.h, thread.c: -+ Advanced threading, v 5.1. From Daniel Eisenbud -+ . -+ -+ * pgpewrap.c: branches: 2.3.2; Add magic comment so we can use -+ traditional malloc() in this program. -+ -+2001-10-30 22:43:23 roessler (roessler) -+ -+ * init.h: .mh_sequences fix, from lorenzo@cisco.com. -+ -+ * mutt_socket.c, mutt_ssl.c: TLS connection reuse. From Brendan -+ Cully. -+ -+2001-10-29 23:21:48 roessler (roessler) -+ -+ * pager.c: Fix two places which _may_ look like buffer overflows, -+ but aren't. -+ -+ * url.c: Fix #843. -+ -+ * doc/manual.sgml.head: Make the documentation of toggle-unlink -+ more precise - someone on comp.mail.mutt got confused by this. -+ -+2001-10-28 19:46:43 roessler (roessler) -+ -+ * imap/browse.c, imap/imap.c: Fix 839 -+ -+ * po/fr.po: update -+ -+ * sendlib.c: Another aesthetic message-id change. -+ -+ * sendlib.c: GMT's too clumsy. Just take G. -+ -+ * sendlib.c: Use GMT for message-IDs. Note: The addition of -+ the constant string "GMT" is so intended to avoid the production -+ of duplicate message-IDs when mutts running in time zones ahead -+ GMT are updated. -+ -+ * po/ru.po: update. -+ -+ * url.c: Another bug related to #837. -+ -+ * imap/util.c: Fix a problem related to #837 (the bug isn't -+ entirely close, though). -+ -+2001-10-26 23:53:29 roessler (roessler) -+ -+ * doc/manual.sgml.head: Point to the openProjects.net IRC channel -+ instead of dal.net. -+ -+2001-10-25 07:54:35 roessler (roessler) -+ -+ * pgp.c: Handle clearsigned messages gracefully even when -+ pgp_verify_sig is set and pgp_decode_command is unset. -+ -+2001-10-24 11:08:22 roessler (roessler) -+ -+ * complete.c: Suspected fix for #837. -+ -+2001-10-22 09:28:26 roessler (roessler) -+ -+ * imap/util.c, globals.h, init.h: Make IMAP keepalive -+ configurable. From Brendan Cully. -+ -+2001-10-17 17:03:19 roessler (roessler) -+ -+ * curs_main.c: Fix #829. -+ -+ * sendlib.c: Fix #828: Sendmail is now invoked with stdout and -+ stderr redirected to /dev/null. Apparently, sendmail 8.12.1 -+ doesn't like to be invoked with stderr and stdout closed. -+ -+ * curs_main.c: Fix CURHDR confusion. Mutt should compile now. -+ (Sorry for not committing this earlier.) -+ -+2001-10-16 14:29:27 roessler (roessler) -+ -+ * addrbook.c, keymap.c: Address book nit fix from -+ geerd.debruijn@nl.thalesgroup.com. -+ -+ * po/ja.po, po/it.po: update -+ -+2001-10-15 20:18:32 roessler (roessler) -+ -+ * rfc2047.c: branches: 2.35.2; Close #821. Fix provided -+ by Edmund. -+ -+ * curs_main.c: AIX portability patch. Suggested by Jan Chrillesen -+ . -+ -+ * doc/manual.sgml.tail: branches: 1.15.2; Fixing a nit, From -+ David Ellement. -+ -+2001-10-12 09:03:26 roessler (roessler) -+ -+ * po/fr.po: update -+ -+2001-10-11 20:08:44 roessler (roessler) -+ -+ * imap/message.c: Small fix from Edmund GRIMLEY EVANS -+ . -+ -+ * compose.c: branches: 2.48.2; Little fix from -+ sroberts@certicom.com. -+ -+ * po/eo.po: update -+ -+ * pgpewrap.c: Add public domain notice. -+ -+ * Makefile.am, configure.in, pgpewrap, pgpewrap.c: Include C -+ version of pgpewrap, by Wessel Dankers . -+ -+ * po/da.po: update -+ -+ * compose.c: Unify "Can't stat" messages. Suggested by Byrial. -+ -+ * editmsg.c: branches: 2.12.2; Unify "Can't stat" messages. -+ Suggested by Byrial. -+ -+ * sendlib.c: Unify "Can't stat" messages. Suggested by Byrial. -+ -+2001-10-10 23:37:06 roessler (roessler) -+ -+ * mh.c: Fix #560. -+ -+ * pager.c: Fix minor snafu in Vsevolod's patch about important -+ flags for POP folders. -+ -+ * main.c: Mess around with signal handlers. Allegedly, this -+ helps to get things working with Solaris 8. See #455. -+ -+ * imap/message.c: Try to fix #302. -+ -+ * curs_main.c, pager.c: Don't allow setting the "important" -+ flag when message resides on a POP server. -+ -+ * curs_lib.c: Rename pad_char to m_pad_char - AIX curses -+ have a macro called pad_char. Noted by Jan Chrillesen -+ . -+ -+ * pager.c: Patch from #272 (from acli@mingpaoxpress.com). -+ -+ * browser.c: Fix #813. -+ -+ * mx.c: Another consistency fix for maildir_trash. -+ -+ * mh.c, mx.c: Experimental patch to make maildir_trash handling -+ more consistent. -+ -+ * buffy.c: branches: 2.21.2; maildir buffy: Don't consider -+ "trashed" new messages new. Fixes #412. -+ -+ * main.c: Include platform information with mutt -v output. -+ -+ * muttbug.sh.in: Include some information about the compiler -+ and compiler flags used with bug reports. -+ -+ * po/pl.po: update -+ -+ * po/fr.po, po/de.po: updates. -+ -+2001-10-09 09:29:55 roessler (roessler) -+ -+ * getdomain.c: A different fix for #767. -+ -+ * po/tr.po, po/uk.po, po/zh_CN.po, po/zh_TW.po, po/ru.po, -+ po/sk.po, po/sv.po, po/pt_BR.po, po/it.po, po/ja.po, po/ko.po, -+ po/lt.po, po/nl.po, po/pl.po, po/eo.po, po/es.po, po/et.po, -+ po/fr.po, po/gl.po, po/hu.po, po/id.po, po/cs.po, po/da.po, -+ po/de.po, po/el.po, reldate.h, ChangeLog, VERSION: automatic -+ post-release commit for mutt-1.3.23 -+ -+2001-10-07 06:43:52 roessler (roessler) -+ -+ * doc/manual.sgml.head: We do update .mh_sequences files now. -+ -+2001-10-06 09:31:44 roessler (roessler) -+ -+ * doc/manual.sgml.head: Documentation for check-traditional-pgp -+ and for edit-type when used in read mode. -+ -+2001-10-02 22:20:03 roessler (roessler) -+ -+ * enter.c: Fix #801. -+ -+2001-10-01 09:58:49 roessler (roessler) -+ -+ * mh.c: Create mh_sequences files when they don't exist. -+ Suggested by TAKIZAWA Takashi . -+ -+2001-09-28 08:38:44 roessler (roessler) -+ -+ * charset.c: More character set aliases, from Ionel Mugurel -+ Ciobica . -+ -+ * pager.c: Color fix from Brandon Long. Welcome back! -+ -+2001-09-26 10:56:52 roessler (roessler) -+ -+ * mh.c: OK, I couldn't resist. ;-) -+ -+ Depending on the user's usage patterns and configuration, there -+ may be a strong bias in maildir files moving either within the -+ new or to the cur subfolder. This patch adds hit counters for -+ each of these directories. Mutt will then look first into the -+ directory encountered more frequently in the past. This should -+ help to reduce the cost of chasing messages a bit, and isn't -+ too costly itself. -+ -+ (Another possibility for optimization may be to actually base -+ the prediction on the configuration and on the message flags -+ as we know them - in particular, the mark_old and move options -+ could have some effect here. Thinking about message flags, one -+ could even replace the simple heuristic currently implemented by -+ a matrix recording hit counters depending on flags. But then -+ again, it's all just playing around, since this function will -+ be invoked only rarely. ;-) -+ -+ * attach.c, commands.c, copy.c, copy.h, handler.c, mutt.h, -+ recvattach.c: Fix inconsistencies between printing and displaying -+ of message/rfc822 body parts. -+ -+ * attach.c: Fix attachment printing. -+ -+ * mh.c, mx.c, mx.h: Search for messages which may have been moving -+ under our feet in maildir folders. Suggested by Bjoern Jacke. -+ -+ * contrib/gpg.rc: Remove --comment '' - it breaks pgpewrap and -+ isn't necessary with more recent gpg versions. -+ -+2001-09-21 09:35:18 roessler (roessler) -+ -+ * po/pl.po: update -+ -+2001-09-17 10:19:10 roessler (roessler) -+ -+ * send.c: fix #737. -+ -+2001-09-14 08:19:30 roessler (roessler) -+ -+ * po/id.po: update -+ -+2001-09-11 12:24:32 roessler (roessler) -+ -+ * addrbook.c, alias.c, init.c, menu.c, mutt.h, query.c: More -+ addressbook fixes. -+ -+ * addrbook.c, attach.h, browser.c, functions.h, init.c, init.h, -+ keymap.c, keymap.h, menu.c, mutt.h, mutt_menu.h, recvattach.c: -+ The addressbook used to crash when someone issued the alias and -+ unalias commands while on that menu. This patch has a basic fix -+ for this behaviour, and adds delete and undelete functions to -+ this menu. While I'm on it, I've also made sure that "apply-tag" -+ untags everything on all menus. -+ -+ The original crash was noted by Oliver Kauss . -+ -+2001-09-08 14:23:05 roessler (roessler) -+ -+ * init.c: Thomas Guettler reports -+ a segfault when you search for "~b \\${". -+ -+ * po/zh_TW.po: update -+ -+2001-09-06 12:10:10 roessler (roessler) -+ -+ * po/pl.po: update -+ -+ * curs_main.c: Try to fix a boundary condition: Assume that you -+ are in a limited view which includes the folder's last message. -+ Display that message. Wait until a new message is added to the -+ current folder which does NOT match the limit pattern. Press tab. -+ Mutt would get confused. I think that this patch fixes the -+ problem (but I'm not entirely sure). -+ -+2001-09-05 12:09:44 roessler (roessler) -+ -+ * sendlib.c: BSD/OS portability fix from Edmund Grimley Evans. -+ #758. -+ -+ * imap/imap.c, init.h: patch-1.3.22.1.remove_warnings.awn.1, -+ from Andrew W. Nosenko. -+ -+2001-09-04 19:12:23 roessler (roessler) -+ -+ * po/da.po: update -+ -+ * imap/util.c, mutt_socket.c, muttlib.c, pop.c, url.c, url.h: -+ patch-bac.canonifypath-4. -+ -+ The attached patch reverts the IMAP canonification patch I -+ reverted a version ago (sorry for being so wishy-washy). This -+ time I put in some code to preserve IMAP URL passwords in the -+ initial pass, so people who like to use those sorts of URLs still -+ can. That was the only reason I had reverted the patch before. -+ -+ (From Brendan Cully.) -+ -+ * po/ja.po, po/ru.po, po/uk.po: updates -+ -+ * mutt_tunnel.c: patch-bac.tunnelreopen-1 from Brendan Cully. -+ -+2001-09-03 13:59:37 roessler (roessler) -+ -+ * curs_main.c, thread.c: Don't lose track of the current message -+ when collapsing and changing sort modes wildly. Noted by -+ David T-G. -+ -+ * NEWS, globals.h, init.h, mh.c: Make MH sequences variable. -+ -+ * po/de.po: update -+ -+ * sendlib.c: Don't try to attach non-regular files. #754. -+ -+2001-08-31 09:21:55 roessler (roessler) -+ -+ * NEWS: Mention mailto URL support. -+ -+ * imap/imap.c, imap/util.c, imap/command.c: Fix some memory leaks. -+ From Pawel Salek, by way of Brendan Cully. -+ -+2001-08-30 21:30:39 roessler (roessler) -+ -+ * po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/pt_BR.po, -+ po/ru.po, po/sk.po, po/lt.po, po/nl.po, po/pl.po, po/it.po, -+ po/ja.po, po/ko.po, po/gl.po, po/hu.po, po/id.po, po/et.po, -+ po/fr.po, po/eo.po, po/es.po, po/el.po, po/da.po, po/de.po, -+ ChangeLog, VERSION, doc/Makefile.in, po/cs.po: automatic -+ post-release commit for mutt-1.3.22.1 -+ -+ * po/uk.po, po/zh_CN.po, po/sk.po, po/sv.po, po/tr.po, -+ po/pt_BR.po, po/ru.po, po/pl.po, po/lt.po, po/nl.po, po/it.po, -+ po/ja.po, po/ko.po, po/hu.po, po/id.po, po/gl.po, po/et.po, -+ po/fr.po, po/eo.po, po/es.po, po/el.po, po/de.po, po/da.po, -+ ChangeLog, VERSION, po/cs.po, reldate.h: automatic post-release -+ commit for mutt-1.3.22 -+ -+ * contrib/sample.muttrc-tlr: update -+ -+ * build-release: branches: 2.17.2; more preparations for -+ stabilizing 1.3. -+ -+ * Makefile.am, README.UPGRADE: README.UPGRADE is quite outdated. -+ -+ * doc/muttrc.man.head, NEWS: documentation updates. -+ -+ * doc/mutt.man: branches: 1.16.2; mention ~/.mutt/muttrc -+ -+ * curs_main.c: Fix #750 / deb#108628. -+ -+ * pop_auth.c: patch-20010829.vvv.pop_auth -+ -+2001-08-28 20:39:04 roessler (roessler) -+ -+ * handler.c: Don't do character conversion when we call an -+ external handler for a text type. Assume that the conversion -+ is done there. -+ -+ * po/da.po: update -+ -+2001-08-24 08:07:42 roessler (roessler) -+ -+ * sendlib.c: Don't use the 7bit encoding for non-text MIME types. -+ This may produce slightly longer messages, but it helps to -+ avoid corruption with binary attachments which look like text, -+ but aren't. -+ -+ * po/de.po: update -+ -+ * sendlib.c: More liberally apply MIME encodings to non-text -+ body parts when there's a ^From_ line. -+ -+2001-08-23 19:10:04 roessler (roessler) -+ -+ * po/eo.po, po/sv.po: update -+ -+2001-08-22 14:41:32 roessler (roessler) -+ -+ * po/et.po, po/fr.po: update -+ -+ * pop_auth.c: This should fix the warnings which A. Nosenko found. -+ (And may introduce new ones about unused variables.) -+ -+2001-08-21 21:54:33 roessler (roessler) -+ -+ * po/zh_CN.po, po/sk.po, po/sv.po, po/tr.po, po/uk.po, -+ po/pt_BR.po, po/ru.po, po/pl.po, po/ja.po, po/ko.po, po/lt.po, -+ po/nl.po, po/hu.po, po/id.po, po/it.po, po/fr.po, po/gl.po, -+ po/et.po, po/el.po, po/eo.po, po/es.po, po/da.po, po/de.po, -+ po/cs.po, reldate.h, VERSION, ChangeLog: automatic post-release -+ commit for mutt-1.3.21 -+ -+2001-08-20 12:11:28 roessler (roessler) -+ -+ * mx.c: Check for .mew-cache in MH folders. -+ -+2001-08-16 12:42:30 roessler (roessler) -+ -+ * sendlib.c: Mutt's detection of overly long lines would fail -+ with text files when the long line is the last one, and is -+ not finished by a newline character. This can, for instance, -+ happen when you send out macintosh-generated HTML files. -+ -+ (And, apparently, we hit some boundary somewhere in the PGP code -+ with that - I had some truncated attachments today.) -+ -+2001-08-13 16:12:08 roessler (roessler) -+ -+ * pop.c: fix content-length headers. -+ -+ * mh.c: Fix treatment of maildir folders. We partially used mh -+ routines for these, introducing absurdities such as .mh_sequences -+ files. -+ -+2001-08-12 10:15:15 roessler (roessler) -+ -+ * init.c, init.h: Fix the "strange e-mail header" bug. It was -+ an uninitialized buffer. Thanks to Brendan Cully for figuring -+ it out. -+ -+2001-08-11 17:39:13 roessler (roessler) -+ -+ * muttlib.c: Undo an earlier change to _mutt_expand_path, which -+ seems to have caused problems. From Brendan Cully. -+ -+ * config.guess, config.sub: Update. Thanks, Brendan! -+ -+2001-08-09 11:28:09 roessler (roessler) -+ -+ * po/uk.po, po/ja.po: update -+ -+2001-08-08 19:27:50 roessler (roessler) -+ -+ * doc/manual.sgml.tail: Adding someone I forgot. -+ -+2001-08-07 12:45:51 roessler (roessler) -+ -+ * doc/manual.sgml.tail: Update credits. I'm sure I forgot some -+ people. If you feel you're one of them, please drop me a line! -+ -+2001-08-06 17:49:06 roessler (roessler) -+ -+ * curs_lib.c: Here's a fix to allow (n)curses versions to work -+ with some terminfo entries where (for whatever reason), someone -+ specified cvvis but not cnorm. From a report/discussion with -+ Mario Vanoni . (From Thomas Dickey.) -+ -+ * buffy.c: Another little MH buffy bug. From Len Lattanzi -+ . -+ -+2001-08-03 16:55:41 roessler (roessler) -+ -+ * mh.c: fix an mh_buffy segfault. -+ -+ * configure.in: Don't default to "no" when we can't find sendmail. -+ #713; Brendan Cully. -+ -+ * buffy.c, mh.c, mx.h: MH buffy. -+ -+2001-08-02 22:59:16 roessler (roessler) -+ -+ * contrib/gpg.rc: Don't emit a comment armor header at all. -+ -+ * mh.c: Update mh_sequences when messages are deleted. Note: -+ Currently, we only clean up our own sequences, and leave others' -+ sequences alone. Should possibly be fixed. -+ -+ * mh.c: Fix #720. -+ -+ * imap/browse.c: Namespace fix. From Pawel Slawek (or Peter -+ Bloomfield?); forwarded by Brendan Cully. -+ -+2001-08-01 22:40:29 roessler (roessler) -+ -+ * po/eo.po: update -+ -+ * po/fr.po, po/ru.po, po/de.po: updates. -+ -+ * gnupgparse.c: branches: 2.22.2; Signed fixes. Noted by -+ Vincent Lefevre's compiler. -+ -+ * pgpkey.c: Signed fixes. Noted by Vincent Lefevre's compiler. -+ -+2001-07-31 12:28:19 roessler (roessler) -+ -+ * mh.c: More MH fixes. -+ -+ * mh.c: fix a small typo -+ -+ * mailbox.h: branches: 2.10.2; Add mh_sequences support. -+ I hope this works. -+ -+ * mh.c, mx.c: Add mh_sequences support. I hope this works. -+ -+2001-07-29 09:48:04 roessler (roessler) -+ -+ * contrib/gpg.rc: Fix the comment header, and generally be -+ less verbose. -+ -+2001-07-26 17:42:48 roessler (roessler) -+ -+ * imap/util.c: patch-bac.imapnextword-1. From Brendan Cully. -+ -+ * pgpkey.c: Don't confuse validity and trust when it comes to -+ PGP keys. -+ -+ * thread.c: O(n log (n)) sorting from Jan Kratochvil -+ . -+ -+2001-07-25 19:51:58 roessler (roessler) -+ -+ * po/lt.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, -+ po/sv.po, po/tr.po, po/uk.po, po/zh_CN.po, po/da.po, po/de.po, -+ po/el.po, po/eo.po, po/es.po, po/et.po, po/fr.po, po/gl.po, -+ po/hu.po, po/id.po, po/it.po, po/ja.po, po/ko.po, po/cs.po: -+ update-po after gettext update. -+ -+2001-07-24 21:29:47 roessler (roessler) -+ -+ * po/zh_CN.po, po/zh_TW.po, po/sk.po, po/sv.po, po/tr.po, -+ po/uk.po, po/ru.po, po/pl.po, po/pt_BR.po, po/ja.po, po/ko.po, -+ po/lt.po, po/nl.po, po/gl.po, po/hu.po, po/id.po, po/it.po, -+ ChangeLog, VERSION, po/cs.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, po/es.po, po/et.po, po/fr.po, reldate.h: automatic -+ post-release commit for mutt-1.3.20 -+ -+ * imap/imap.c: Avoid mail loss with IMAP. From Brendan Cully. -+ -+ * imap/command.c: patch-bac.capability-20010724.1. From Brendan -+ Cully. -+ -+ * mbox.c: Add a status message, so "Writing messages" doesn't -+ stay on screen forever. -+ -+2001-07-24 06:42:06 Brendan Cully (roessler) -+ -+ * imap/imap.c: The attached patch fixes a couple bugs I introduced -+ recently when working around the buggy but firmly entrenched -+ UW-IMAP 4.7 server. These resulted in additional overhead -+ when synchronising mailboxes and occasional problems opening -+ empty mailboxes. -+ -+2001-07-19 14:51:14 roessler (roessler) -+ -+ * curs_main.c: Redraw when an alias is created - the user may -+ have assigned a different realname. -+ -+ * COPYRIGHT: update -+ -+2001-07-11 07:19:45 roessler (roessler) -+ -+ * INSTALL: Replace mutt-dev@cs.hmc.edu by mutt-dev@mutt.org. -+ Noted by "Mark E. Mallett" . -+ -+2001-07-09 20:54:34 roessler (roessler) -+ -+ * Makefile.am, acconfig.h, configure.in: locale-related fix from -+ Lars Hecking. -+ -+2001-07-04 07:35:20 roessler (roessler) -+ -+ * imap/util.c: Fix a nit. From "Andrew W. Nosenko" -+ -+ -+2001-07-03 19:32:12 roessler (roessler) -+ -+ * m4/iconv.m4, configure.in: Iconv-related cleanup. From Brendan -+ Cully. -+ -+ * init.c, muttlib.c, protos.h: Unified buffer handling, from -+ Brendan Cully. -+ -+ * pgppubring.c: branches: 2.26.2; Don't sign-extend chars. -+ -+ * pgp.c: Fixing a PGP signature reporting bug; adding debugging -+ output. -+ -+ * mutt_socket.c: Don't fcntl -1. From Brendan. -+ -+ * imap/imap.c, imap/imap_private.h, imap/message.c, muttlib.c, -+ protos.h: Fix #677. From Brendan Cully. -+ -+2001-07-02 20:28:32 roessler (roessler) -+ -+ * query.c: Fix a minor nit with the external query interface. -+ -+ * doc/manual.sgml.head: documentation from Brendan Cully. -+ -+2001-06-29 10:06:16 roessler (roessler) -+ -+ * imap/imap.c, hook.c, init.h, mutt.h, mutt_socket.c, protos.h: -+ patch-bac-vvvacounthook-20010628.1 -+ -+2001-06-28 20:34:05 roessler (roessler) -+ -+ * query.c: Query patch from Olivier Chapuis -+ . -+ -+2001-06-27 16:08:06 roessler (roessler) -+ -+ * po/ru.po: update. -+ -+ * init.h, mutt.h, mx.c: patch-1.3.19i.rs.keep_flagged -+ -+2001-06-26 10:26:54 roessler (roessler) -+ -+ * pgppubring.c: fixes. -+ -+ * pgplib.h, pgppubring.c: Fix handling of revocation certificates. -+ -+ * pgppubring.c: Also dump revocations. -+ -+ * pgplib.c, pgplib.h, pgppubring.c: Add a very simple -+ signature-dumping mode to pgpring. (Not needed for mutt.) -+ -+2001-06-19 08:39:17 roessler (roessler) -+ -+ * po/ja.po: update -+ -+ * imap/imap.c, imap/message.c: IMAP error checking for bug #662. -+ From Brendan Cully. -+ -+2001-06-18 17:29:55 roessler (roessler) -+ -+ * po/zh_CN.GB2312.po, po/zh_CN.po, po/zh_TW.Big5.po, po/zh_TW.po, -+ configure.in: Renaming the Chinese translations. -+ -+ * po/eo.po: update -+ -+ * globals.h, init.h, mutt.h, pop.h, pop_auth.c: The attached patch -+ adds two variables: $pop_authenticators and $pop_auth_try_all. -+ -+ From Vsevolod Volkov. -+ -+2001-06-14 13:29:06 roessler (roessler) -+ -+ * po/pl.po: update -+ -+2001-06-13 08:29:16 roessler (roessler) -+ -+ * m4/gettext.m4: Avoid more m4 macro collisions. -+ -+ * m4/glibc21.m4: branches: 1.2.2; 1.2.4; Avoid more m4 macro -+ collisions. -+ -+ * imap/auth_sasl.c: An updated version of the previous patch. -+ From Brendan. -+ -+ * mutt_sasl.c: branches: 2.10.2; An updated version of the -+ previous patch. From Brendan. -+ -+ * mutt_sasl.h, pop_auth.c: An updated version of the previous -+ patch. From Brendan. -+ -+ * pop_auth.c: This patch closes a ridiculous bug where the -+ SASL library could be used without being initialised. I don't -+ understand why lots of people weren't having problems, unless -+ no one who uses SASL uses POP :) -+ -+ closes 549 -+ -+ From Brendan Cully. -+ -+ * po/cs.po: update -+ -+2001-06-12 12:45:29 roessler (roessler) -+ -+ * m4/gettext.m4, m4/progtest.m4, configure.in: gettext-related -+ fixes. Most of this may just be temporary if we decide to get -+ rid of our own gettext.m4. -+ -+ * m4/gettext.m4: Fix comments. -+ -+ * po/tr.po: update -+ -+2001-06-11 18:32:05 roessler (roessler) -+ -+ * imap/auth.c, imap/imap.c, doc/manual.sgml.head: -+ patch-bac.flags-20010611.1 -+ -+ * po/es.po, po/da.po: update. -+ -+ * doc/manual.sgml.head: Updates from Byrial Jensen. -+ -+ * keymap.c: command/function cosmetics from Byrial Jensen. -+ -+ * po/de.po, po/et.po, po/sv.po: update. -+ -+ * doc/mutt.man, doc/muttbug.man, init.c, init.h: Use the EMAIL -+ environment variable as the default for $from. -+ -+ * po/eo.po, po/el.po: update. -+ -+2001-06-07 23:15:53 roessler (roessler) -+ -+ * po/fr.po, po/id.po: updates for 1.3.19. -+ -+ * po/zh_TW.Big5.po: A fixed version from EGE. -+ -+ * build-release: Don't try to upload to sigtrap.guug.de any more. -+ -+ * po/tr.po, po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, -+ po/ru.po, po/sk.po, po/sv.po, po/ja.po, po/ko.po, po/lt.po, -+ po/nl.po, po/pl.po, po/pt_BR.po, po/hu.po, po/id.po, po/it.po, -+ po/fr.po, po/gl.po, po/es.po, po/et.po, po/el.po, po/eo.po, -+ po/cs.po, po/da.po, po/de.po, reldate.h, VERSION, ChangeLog: -+ automatic post-release commit for mutt-1.3.19 -+ -+ * check_sec.sh: Don't check in intl/ -+ -+ * m4/codeset.m4: branches: 1.1.2; 1.1.4; More from the gettext -+ munster patch from E.G.E. -+ -+ * m4/glibc21.m4, m4/iconv.m4: More from the gettext munster -+ patch from E.G.E. -+ -+ * po/zh_TW.Big5.po, m4/gettext.m4, m4/lcmessage.m4, -+ m4/progtest.m4: Gettext update. (From E.G.E., of course.) -+ -+ * intl/Makefile.in, intl/VERSION, intl/bindtextdom.c, -+ intl/cat-compat.c, intl/config.charset, intl/dcgettext.c, -+ intl/dcigettext.c, intl/dcngettext.c, intl/dgettext.c, -+ intl/dngettext.c, intl/explodename.c, intl/finddomain.c, -+ intl/gettext.c, intl/gettext.h, intl/gettextP.h, -+ intl/hash-string.h, intl/intl-compat.c, intl/l10nflist.c, -+ intl/libgettext.h, intl/libgnuintl.h, intl/libintl.glibc, -+ intl/linux-msg.sed, intl/loadinfo.h, intl/loadmsgcat.c, -+ intl/localcharset.c, intl/locale.alias, intl/localealias.c, -+ intl/ngettext.c, intl/plural.c, intl/plural.y, intl/po2tbl.sed.in, -+ intl/ref-add.sin, intl/ref-del.sin, intl/textdomain.c, -+ intl/xopen-msg.sed, intl/.cvsignore, intl/ChangeLog, Makefile.am, -+ acconfig.h, configure.in, gettext.c: Gettext update. -+ -+ * lib.h: branches: 2.11.2; Gettext update. -+ -+ * mbyte.c: Gettext update. -+ -+ * po/ru.po: update. -+ -+ * configure.in: ALL_LINGUAS. I forgot to do this earlier today. -+ -+ * NEWS: Documentation update from Brendan Cully. -+ -+ * po/sv.po, po/tr.po, po/uk.po, po/zh_CN.GB2312.po, -+ po/zh_TW.Big5.po, po/pt_BR.po, po/ru.po, po/sk.po, po/ko.po, -+ po/lt.po, po/nl.po, po/pl.po, po/et.po, po/fr.po, po/gl.po, -+ po/hu.po, po/id.po, po/it.po, po/ja.po, po/cs.po, po/da.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po: Updating the gl -+ translation, another update-po run. -+ -+ * po/zh_TW.Big5.po: Changed to utf-8 in order to avoid problems -+ with recent gettext versions. Thanks to EGE! -+ -+ (BTW, the file name is lying now. Is this a problem?) -+ -+ * po/tr.po, po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, -+ po/ru.po, po/sk.po, po/sv.po, po/pt_BR.po, po/pl.po, po/ja.po, -+ po/ko.po, po/lt.po, po/nl.po, po/eo.po, po/es.po, po/et.po, -+ po/fr.po, po/gl.po, po/hu.po, po/id.po, po/it.po, po/cs.po, -+ po/da.po, po/de.po, po/el.po: update-po; adding an Estonian -+ translation. -+ -+ * po/it.po: Fix a small bug. -+ -+ * imap/message.c: This patch ensures IMAP FLAGS aren't parsed -+ twice when fetching the full message body. It really only amounts -+ to a cosmetic error, but may cause spurious "Mailbox externally -+ modified" messages. -+ -+ From Brendan Cully. -+ -+ * INSTALL, README.SSL, rfc2047.c: Documentation updates and a -+ little bug fix. From Brendan Cully. -+ -+ * init.c: Don't add empty strings to lists. From Thomas Parmelan -+ . -+ -+2001-06-05 15:43:41 roessler (roessler) -+ -+ * handler.c: Leave slightly more margin with format=flowed. -+ -+ * imap/command.c, mutt_socket.c, mutt_ssl.c, mutt_tunnel.c: -+ patch-bac.sockets-20010605.1 -+ -+ * imap/auth.c, init.h: Change the delimiter for -+ imap_authenticators to a colon. -+ -+ * imap/auth_gss.c, imap/auth_login.c, imap/auth_sasl.c, -+ imap/imap.c, imap/auth.c, imap/auth.h, imap/auth_anon.c, -+ imap/auth_cram.c: The attached patch should be the last feature -+ I want to get in before 1.4. It creates a new config variable -+ $imap_authenticators, which is a comma-separated list of -+ authentication methods for mutt to try to use to authenticate to -+ an IMAP server. If it is unspecified you get the old behaviour -+ - any method is tried, the first to succeed or fail ends the -+ auth loop. -+ -+ (From Brendan Cully.) -+ -+ * globals.h, init.h: The attached patch should be the last -+ feature I want to get in before 1.4. It creates a new config -+ variable $imap_authenticators, which is a comma-separated list of -+ authentication methods for mutt to try to use to authenticate to -+ an IMAP server. If it is unspecified you get the old behaviour -+ - any method is tried, the first to succeed or fail ends the -+ auth loop. -+ -+ * attach.c, commands.c, handler.c: Check mutt_create_filter*'s -+ return value for errors. This should avoid a bunch of possible -+ crashes. -+ -+2001-06-04 18:29:33 roessler (roessler) -+ -+ * doc/manual.sgml.head: Score documentation fix. -+ -+ * po/pl.po: Update. -+ -+ * doc/.cvsignore, .cvsignore: Ignore some more generated files. -+ From Andrew Nosenko. -+ -+ * Makefile.am: -I$(includedir) is moved from INCLUDES variable -+ to the end of CPPFLAGS. This allow build Mutt with Bruno's -+ libiconv and --prefix=/usr on glibc-2.1.2 systems. -+ -+ From "Andrew W. Nosenko" . -+ -+ * doc/Makefile.in, doc/instdoc.sh.in, contrib/Makefile.in, -+ INSTALL, Makefile.am, configure.in, init.c, main.c, muttbug.sh.in, -+ sendlib.c: Clean up the sharedir mess. From Lars Hecking. -+ -+2001-06-01 08:53:23 roessler (roessler) -+ -+ * imap/command.c, imap/imap.c, imap/imap_private.h, -+ imap/message.c, curs_main.c, mailbox.h: More concurrent IMAP -+ modification handling from Brendan Cully. -+ -+ * po/fr.po: Update. -+ -+2001-05-31 18:04:24 roessler (roessler) -+ -+ * mutt_tunnel.c: Tunnel fixes. -+ -+ * configure.in: Fix some typos. -+ -+ * mutt_curses.h, configure.in: Utf-8 support with ncurses, by -+ Sven Verdoolaege. Thomas E. Dickey says it looks reasonable, -+ so I include it. -+ -+2001-05-30 23:00:51 roessler (roessler) -+ -+ * imap/command.c, imap/imap.c, Makefile.am, enter.c, -+ mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h, -+ mutt_ssl.c, mutt_ssl_nss.c, mutt_tunnel.c: Socket API clean-up -+ from Brendan Cully. -+ -+ * send.c: If messages have no References header, fall back to -+ using In-Reply-To when constructing a reply's references header. -+ This may not be strictly according to the book, but looks like -+ a reasonable suggestion (which came from Vincent Lefebvre). -+ -+ * curs_main.c: Check whether any messages are visible. -+ -+2001-05-29 20:26:23 roessler (roessler) -+ -+ * m4/gssapi.m4: branches: 1.1.2; GSSAPI fixes, tunnel driver. -+ From Brendan Cully. -+ -+ * imap/auth.c, imap/auth_gss.c, imap/auth_sasl.c, imap/imap.c, -+ Makefile.am, README, configure.in, globals.h, init.h, -+ mutt_socket.c, mutt_socket.h, mutt_tunnel.c, mutt_tunnel.h: -+ GSSAPI fixes, tunnel driver. From Brendan Cully. -+ -+ * configure.in, md5.h, sha1.h: More type-determination fixes -+ from Lars Hecking. -+ -+2001-05-28 19:14:47 roessler (roessler) -+ -+ * imap/util.c: Consult /etc/services for imaps port. From Brendan -+ Cully. -+ -+ * imap/Makefile.am, Makefile.am, checktypes.c, configure.in, -+ md5.h, md5c.c, sha1.c, sha1.h: Improve checking for 32bit -+ integers. From Brendan Cully and Lars Hecking. -+ -+ * muttbug.sh.in: Cosmetics. From Brendan Cully. -+ -+ * imap/command.c, imap/imap.c, imap/imap_private.h: Detect -+ external modifications of IMAP folders. From Brendan Cully. -+ -+ * curs_main.c: Fix attaching messages via IMAP. From Brendan -+ Cully. -+ -+2001-05-24 10:18:30 roessler (roessler) -+ -+ * po/ja.po: update. -+ -+ * browser.c: patch-bac.chdir-20010523.2 -+ -+2001-05-23 14:19:16 roessler (roessler) -+ -+ * browser.c: patch-bac.chdir-20010523.1 -+ -+ * imap/browse.c: patch-bac.createnull-20010522.1 -+ -+2001-05-22 21:45:52 roessler (roessler) -+ -+ * doc/manual.sgml.head: Documentation nit from Björn Jacke. -+ -+ * configure.in: Let configure --help look prettier. From Brendan -+ Cully. -+ -+ * doc/manual.sgml.head, doc/manual.sgml.tail: Documentation -+ fixes from Brendan Cully. -+ -+ * imap/imap.c: Attachment deletion on IMAP servers, take two. -+ -+2001-05-21 08:42:07 roessler (roessler) -+ -+ * imap/imap.c, imap/message.c, commands.c, mx.c, protos.h: -+ Attachment deletion for IMAP folders. By Brendan Cully. -+ -+2001-05-20 22:35:29 roessler (roessler) -+ -+ * handler.c: Fix character set conversion for non-plain text -+ types with 8bit content-transfer-encodings. Noted by Björn Jacke. -+ -+ * imap/message.c: \Seen for FCCs. From Brendan Cully. -+ -+2001-05-17 18:37:21 roessler (roessler) -+ -+ * pager.c: patch-1.3.18.bj.segfault.1. -+ -+ * handler.c: Fix multibyte encodings with quoted-printable. -+ (patch-1.3.18.tt.decode_quoted.1) From TAKIZAWA Takashi -+ . -+ -+2001-05-15 20:41:55 roessler (roessler) -+ -+ * imap/browse.c, imap/util.c, mutt_socket.c: -+ patch-bac.notes-20010515.1 -+ -+ * rfc1524.c: Make tests on an attachment's file name possible. -+ Patch from Bob Bell . -+ -+2001-05-13 15:43:48 roessler (roessler) -+ -+ * po/de.po: Update. -+ -+2001-05-12 05:49:31 roessler (roessler) -+ -+ * handler.c: Undo one of yesterday's aesthetical changes. -+ -+ * muttlib.c: IMAP path canonification hack from Brendan Cully. -+ -+ * handler.c: Adding a hack to use format=flowed's quoting -+ information in the pager, using ANSI color sequences to turn -+ off quote coloring. -+ -+2001-05-11 22:16:17 roessler (roessler) -+ -+ * handler.c: Don't cut off the final part of ttachments with -+ overlong lines. -+ -+ * handler.c: Correctly handle extremely long lines. -+ -+ * handler.c: Improve handling of indented text when wrapping -+ text/plain; format=flowed. This is, in particular, important -+ when replying to messages with indented text. I hope this code -+ does The Right Thing most of the time now. -+ -+ (Further note that we still try to avoid wrapping at places -+ where the user didn't do so.) -+ -+ * handler.c: Some more esthetical nits. -+ -+ * handler.c: More fixes. -+ -+ * recvcmd.c: Fix some nits with respect to text/plain; -+ format=flowed. -+ -+ * copy.c, handler.c, init.h, mutt.h, send.c: Add experimental -+ support for text/plain; format=flowed. -+ -+ * send.c: Fix #590. -+ -+ * headers.c: Some code simplifications. -+ -+ * headers.c, muttlib.c: Fix a memory leak in mutt_free_envelope(); -+ avoid dangling pointers in header editing. -+ -+2001-05-10 13:15:45 roessler (roessler) -+ -+ * po/ja.po: update. -+ -+ * hdrline.c: Fix %D. From Len Lattanzi -+ . -+ -+ * headers.c: Fix header editing and references headers. -+ -+ * imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c, -+ imap/auth_login.c, imap/auth_sasl.c, imap/browse.c, -+ imap/command.c, imap/imap.c, imap/message.c, imap/util.c, -+ sort.c, copy.c, curs_main.c, globals.h, hook.c, init.h, mbox.c, -+ menu.c, mutt_socket.c, mutt_ssl.c, muttlib.c, mx.c, pgpkey.c, -+ pop.c, pop_auth.c: A slightly extended version of Dave Ewart's -+ sleeptime patch. -+ -+ * pop_lib.c: branches: 2.4.2; A slightly extended version of -+ Dave Ewart's sleeptime patch. -+ -+ * protos.h: A slightly extended version of Dave Ewart's sleeptime -+ patch. -+ -+ * po/fr.po, po/id.po, po/sv.po, po/da.po: update. -+ -+ * po/hu.po, configure.in: Adding the Hungarian translation from -+ Szabolcs Horvath . -+ -+2001-05-07 19:21:41 roessler (roessler) -+ -+ * imap/README, imap/imap.h, imap/util.c, muttlib.c: IMAP path -+ canonicalization. From Brendan Cully. -+ -+2001-05-02 20:49:46 roessler (roessler) -+ -+ * doc/manual.sgml.tail: Document some missing functions. -+ -+ * po/tr.po, po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, -+ po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/id.po, po/it.po, -+ po/ja.po, po/ko.po, po/lt.po, po/nl.po, po/pl.po, po/de.po, -+ po/el.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, po/cs.po, -+ po/da.po: make update-po. -+ -+2001-05-01 21:32:50 roessler (roessler) -+ -+ * po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/ru.po, po/sk.po, -+ po/sv.po, po/tr.po, po/uk.po, po/pl.po, po/pt_BR.po, po/lt.po, -+ po/nl.po, po/gl.po, po/id.po, po/it.po, po/ja.po, po/ko.po, -+ po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/fr.po, -+ po/cs.po, ChangeLog, VERSION, reldate.h: automatic post-release -+ commit for mutt-1.3.18 -+ -+2001-04-26 15:52:34 roessler (roessler) -+ -+ * configure.in: Replace tabs by spaces. -+ -+ * BEWARE, Makefile.am: Add a word of warning concerning the -+ case problems. -+ -+ * imap/command.c, imap/imap.c, imap/message.c, imap/util.c, -+ imap/browse.c, parse.c, pattern.c, pgp.c, pgpkey.c, postpone.c, -+ recvattach.c, remailer.c, rfc1524.c, rfc2047.c, send.c, -+ sendlib.c, url.c, Makefile.am, account.c, addrbook.c, alias.c: -+ Add ascii_strcasecmp() and ascii_strncasecmp() functions which -+ do locale-independent and case-insensitive string comparisons. -+ Needed for mutt to work in iso-8859-9 environments, where -+ tolower('I') != 'i'. -+ -+ * ascii.c: branches: 2.1.2; Add ascii_strcasecmp() and -+ ascii_strncasecmp() functions which do locale-independent and -+ case-insensitive string comparisons. Needed for mutt to work -+ in iso-8859-9 environments, where tolower('I') != 'i'. -+ -+ * ascii.h, attach.c, charset.c, color.c, commands.c, copy.c, -+ edit.c, handler.c, headers.c, init.c, keymap.c, mutt.h, -+ mutt_ssl_nss.c, muttlib.c, mx.c: Add ascii_strcasecmp() and -+ ascii_strncasecmp() functions which do locale-independent and -+ case-insensitive string comparisons. Needed for mutt to work -+ in iso-8859-9 environments, where tolower('I') != 'i'. -+ -+2001-04-25 22:08:41 roessler (roessler) -+ -+ * globals.h, init.h, mutt.h, parse.c, protos.h, send.c, -+ sendlib.c, thread.c, url.c: Implement RFC 2822's idea of -+ the In-Reply-To header. In particular, we have to drop the -+ $in_reply_to configuration variable. Also, the change in the -+ specification makes some changes to the threading code reasonable. -+ -+ * parse.c: Use RFC 2822's interpretation of two-digit years. -+ -+ * charset.c: Kluge around some problems with iso-8859-9 locales. -+ -+2001-04-24 11:21:22 roessler (roessler) -+ -+ * commands.c: When the character set is changed, ask whether or -+ not mutt should convert. -+ -+2001-04-19 09:39:49 roessler (roessler) -+ -+ * compose.c: Don't try to select the secret key from the public -+ key ring. -+ -+2001-04-18 15:12:50 roessler (roessler) -+ -+ * sendlib.c: Fix a segmentation fault. Bug reported by Björn -+ Jacke and analyzed by Lars Hecking. -+ -+2001-04-13 23:20:15 roessler (roessler) -+ -+ * enter.c: Fix KEY_ENTER. From EGE. -+ -+ * README, build-release: Introducing trithemius.gnupg.org. -+ -+2001-04-11 23:42:59 roessler (roessler) -+ -+ * hook.c: Avoid excessive unhooking from within hooks. -+ Problem noted by Eugene Lee on mutt-users. -+ -+ * doc/Makefile.in: Don't rely on GNU make's implicit rules for -+ shell scripts. Noted by EGE. -+ -+2001-04-09 16:10:59 roessler (roessler) -+ -+ * INSTALL: Fix the documentation of --enable-locale-fix. -+ From EGE. -+ -+ * enter.c, keymap.c: Entering multibyte characters. From Edmund -+ Grimley Evans. -+ -+ * send.c: Avoid a crash. patch-1.3.17.tlr.pgpflags_fault.1. -+ -+2001-04-05 23:23:37 roessler (roessler) -+ -+ * po/it.po: update -+ -+ * po/tr.po: update. -+ -+ * init.h: Fix a minor typo in the documentation. -+ -+2001-04-04 23:29:29 roessler (roessler) -+ -+ * send.c: Fix pgp_replyencrypt and friends for group-replies to -+ several tagged messages. Noted by Werner Koch. -+ -+2001-04-03 19:26:55 roessler (roessler) -+ -+ * pgpkey.c: More PGP key selection changes: Clean up the key -+ selection mechanism. I'd appreciate if some of you could review -+ the logic. -+ -+ * pgpkey.c: Fixes for the previous patch. -+ -+ * pgpkey.c: Add an error message in case keys can be found, -+ but none are valid. -+ -+ * init.h: Write "mail folder" instead of "folder" in the -+ description of $postponed. If people believe they understand -+ it better that way, fine with me. (Debian #89195.) -+ -+ * doc/manual.sgml.head: Fix a typo. Debian #90400. -+ -+ * po/sv.po: update. -+ -+ * url.c: Permit for passwords which contain '@'. From Felix -+ von Leitner . -+ -+ * mutt_socket.c: Set the close on exec bit for IMAP sockets. -+ From Jason Gunthorpe . #536, Debian -+ #92651. -+ -+2001-04-02 13:02:56 roessler (roessler) -+ -+ * pop.c: Fix a buffer overrun. Noted by Gordon Sadler -+ ; #530. -+ -+ * imap/Makefile.am: Fix dependencies. From Lars Hecking. -+ -+2001-03-30 08:53:12 roessler (roessler) -+ -+ * imap/Makefile.am: Add a rule for ../types.h. -+ -+2001-03-29 11:23:05 roessler (roessler) -+ -+ * pgp.c: Adding a dprint statement. -+ -+2001-03-28 14:59:52 roessler (roessler) -+ -+ * pgp.c, pgp.h: Add some more PGP good signature checks, so we -+ can detect whether or not an encrypted+signed message is OK. -+ -+ * main.c: fix some of the copyright messages. -+ -+ * gnupgparse.c, pgpkey.c, pgplib.c, pgplib.h, pgppacket.c: Make -+ mutt compatible with GnuPG's latest features. As requested by -+ Werner Koch. -+ -+ * po/tr.po, po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, -+ po/ru.po, po/sk.po, po/sv.po, po/lt.po, po/nl.po, po/pl.po, -+ po/pt_BR.po, po/it.po, po/ja.po, po/ko.po, po/es.po, po/fr.po, -+ po/gl.po, po/id.po, po/eo.po, po/el.po, po/de.po, po/da.po, -+ VERSION, po/cs.po, reldate.h, ChangeLog: automatic post-release -+ commit for mutt-1.3.17 -+ -+ * po/pl.po: update. -+ -+2001-03-23 12:30:17 roessler (roessler) -+ -+ * send.c: handle my_hdr message-id: correctly. -+ -+2001-03-20 17:28:55 roessler (roessler) -+ -+ * pgp.c: Fix Content-Disposition of PGP/MIME messages. The second -+ part should get a file name for convenience, not the first one. -+ -+ * po/ja.po: Update from Oota Toshiya . -+ -+ * mbyte.c: Fix a bug in mbrtowc_iconv(). From TAKIZAWA Takashi -+ . -+ -+2001-03-12 11:54:38 roessler (roessler) -+ -+ * po/ru.po: update from Vsevolod. -+ -+2001-03-08 16:48:50 roessler (roessler) -+ -+ * pager.c: Cosmetic change for OP_PAGER_TOP, suggested by Mike -+ Schiraldi . -+ -+2001-03-05 20:52:04 roessler (roessler) -+ -+ * init.h: Fix use_ipv6. -+ -+ * po/ja.po: update. -+ -+2001-03-04 14:25:07 roessler (roessler) -+ -+ * po/eo.po: update. -+ -+ * pgppacket.c: Fix the interpretation of new-style packet lengths. -+ This is a really bad bug. -+ -+ * init.h, mutt.h, mutt_socket.c: Make it possible to enable ipv6 -+ at run time. -+ -+2001-03-03 18:17:23 roessler (roessler) -+ -+ * mutt_ssl.c: Fix a typo concerning OpenSSL version numbers. -+ -+2001-03-01 10:18:04 roessler (roessler) -+ -+ * po/fr.po: update. -+ -+ * po/de.po, po/id.po: updates. -+ -+ * imap/imap.c: Don't engage STARTTLS when already in SSL mode. -+ -+2001-02-27 16:59:45 roessler (roessler) -+ -+ * Makefile.am, depcomp, missing: Adding files for users of -+ automake-cvs. From Lars Hecking. -+ -+ * configure.in: Simplifications from Lars Hecking. -+ -+ * doc/Makefile.in: Distribute instdoc.sh.in. -+ -+ * po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/ru.po, po/sk.po, -+ po/sv.po, po/tr.po, po/uk.po, po/ko.po, po/lt.po, po/nl.po, -+ po/pl.po, po/pt_BR.po, po/id.po, po/it.po, po/ja.po, po/es.po, -+ po/fr.po, po/gl.po, po/el.po, po/eo.po, po/da.po, po/de.po, -+ VERSION, contrib/Makefile.in, po/cs.po, reldate.h, ChangeLog: -+ automatic post-release commit for mutt-1.3.16 -+ -+2001-02-26 16:35:39 roessler (roessler) -+ -+ * pgp.c: Fix behaviour with multiple signed blocks inside one -+ application/pgp. -+ -+ * pgp.c: Add out-of-band signature status signalling for -+ application/pgp with clearsig. -+ -+2001-02-23 09:13:55 roessler (roessler) -+ -+ * imap/imap.c, mutt_ssl.c, po/ru.po: update. -+ -+ * url.h: Ports are unsigned short, not short. -+ -+ * po/de.po: Update. -+ -+2001-02-21 17:02:18 roessler (roessler) -+ -+ * po/fr.po: update. -+ -+ * po/pl.po, po/sv.po: updates. -+ -+2001-02-20 19:05:17 roessler (roessler) -+ -+ * imap/auth_gss.c, imap/message.c: More IMAP patches from Brendan. -+ -+ * sendlib.c: lookup_mime_type() could overflow. This is, however, -+ harmless, because it only works on data from local configuration -+ files which are either under the control of the user or under -+ the control of root. -+ -+2001-02-19 18:21:53 roessler (roessler) -+ -+ * imap/command.c: Improved error handling. -+ -+ * po/de.po: There is no such thing as a "Text Anhang" in German. -+ -+ * imap/imap.c, imap/imap.h, hook.c, mailbox.h, mx.c: Brendan -+ Cully's generic access() wrapper which know about IMAP. -+ -+ * po/el.po: Update. -+ -+2001-02-16 00:42:57 roessler (roessler) -+ -+ * imap/BUGS, imap/message.c: Bugfix. From B.C. -+ -+ * imap/message.c: Fix #378. From Brendan Cully. -+ -+ * imap/imap.c: Support for \HasNoChildren. From Brendan Cully. -+ -+2001-02-15 16:37:27 roessler (roessler) -+ -+ * imap/browse.c, imap/imap.c, imap/imap.h, imap/util.c, -+ acconfig.h, configure.in, globals.h, init.h, mutt.h, mutt_sasl.c, -+ muttlib.c, pop_auth.c, url.c: Brendan Cully's latest STARTTLS -+ patch. -+ -+ * po/ja.po, configure.in: Adding ja.po. -+ -+ * charset.c: Fix iconv-hook. It would segfault with x-unknown -+ and other problematic cases. -+ -+ * init.h: Fix the documentation of pgp_verify_sig. It's ask-yes, -+ not ask. -+ -+2001-02-14 23:58:28 roessler (roessler) -+ -+ * INSTALL: Add a comment about the sample iconv-hook files. -+ -+ * doc/Makefile.in, doc/instdoc.sh.in, doc/manual.sgml.head, -+ doc/muttrc.man.head, doc/muttrc.man.tail, -+ contrib/iconv/README, contrib/iconv/iconv.aix-3.2.5.rc, -+ contrib/iconv/iconv.aix-4.1.5.rc, -+ contrib/iconv/iconv.aix-4.2.0.rc, -+ contrib/iconv/iconv.aix-4.3.2.rc, -+ contrib/iconv/iconv.freebsd-3.3.rc, -+ contrib/iconv/iconv.glibc-2.1.3.rc, -+ contrib/iconv/iconv.glibc-2.1.90.rc, -+ contrib/iconv/iconv.hpux-10.01.rc, -+ contrib/iconv/iconv.hpux-10.20.rc, -+ contrib/iconv/iconv.hpux-11.00.rc, -+ contrib/iconv/iconv.irix-6.5.rc, contrib/iconv/iconv.osf1-4.0a.rc, -+ contrib/iconv/iconv.osf1-4.0d.rc, -+ contrib/iconv/iconv.solaris-2.4.rc, -+ contrib/iconv/iconv.solaris-2.5.1.rc, -+ contrib/iconv/iconv.solaris-2.6-cjk.rc, -+ contrib/iconv/iconv.solaris-2.6.rc, -+ contrib/iconv/iconv.solaris-2.7.rc, contrib/iconv/make.sh, -+ contrib/Makefile.in, mutt.h, protos.h, charset.c, configure.in, -+ hook.c, init.h: iconv-hook. -+ -+ * imap/auth.c, imap/imap.c, imap/message.c, acconfig.h, -+ configure.in, mutt_sasl.c, mutt_socket.h, mutt_ssl.c, mutt_ssl.h: -+ STARTTLS patch from Brendan Cully. -+ -+ * rfc2047.c, sendlib.c: Minor charset fixes. Users can now give -+ any character set names in -+ -+2001-02-13 23:42:29 roessler (roessler) -+ -+ * charset.c: Some more strange character set aliaes. -+ -+ * charset.c: Add more possibly-interesting character set names. -+ -+ * charset.c: While I'm on it, fix a warning and remove some -+ weired code by proper use of ctype functions. -+ -+ * imap/utf7.c: branches: 1.5.2; Change charset-hook's behaviour. -+ -+ * charset.c: Change charset-hook's behaviour. -+ -+ * charset.h: branches: 2.19.2; Change charset-hook's behaviour. -+ -+ * gettext.c, gnupgparse.c, handler.c, rfc2047.c, rfc2231.c, -+ sendlib.c: Change charset-hook's behaviour. -+ -+ * po/id.po: update. -+ -+ * po/de.po: Fix some typos. From Björn Jacke. -+ -+ * recvattach.c: A little fix for those who don't have PGP -+ installed. ;-) -+ -+ * OPS.PGP, commands.c, curs_main.c, functions.h, pgp.c, pgp.h, -+ protos.h, recvattach.c: Add a function check-traditional-pgp -+ which can be used to handle old-style PGP messages and/or parts -+ more easily. -+ -+ * query.c: Match all fields when searching on the query menu. -+ -+ * attach.c: Fix #470: multipart- and message-type attachments -+ weren't handled correctly. -+ -+2001-02-12 20:42:40 roessler (roessler) -+ -+ * curs_lib.c: Fix '?' in the file name dialogue. Fixes #468, -+ #465. -+ -+ * po/sv.po, po/tr.po, po/uk.po, po/zh_CN.GB2312.po, -+ po/zh_TW.Big5.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, -+ po/eo.po, po/es.po, po/fr.po, po/gl.po, po/id.po, po/it.po, -+ po/ko.po, po/lt.po, po/nl.po, VERSION, po/cs.po, po/da.po, -+ po/de.po, po/el.po, reldate.h, ChangeLog: automatic post-release -+ commit for mutt-1.3.15 -+ -+ * NEWS: Tell users about some of the new features. -+ -+ * pgppacket.c: Don't free(NULL). -+ -+ * mutt.h, pgp.c, pgp.h, pgplib.c, pgplib.h, pgpmicalg.c, -+ pgppacket.c, pgppacket.h, pgppubring.c, postpone.c, protos.h, -+ send.c, sendlib.c, Makefile.am, compose.c, configure.in, -+ gnupgparse.c, init.h: Auto-detect the micalg used with PGP/MIME -+ signatures. -+ -+ * handler.c: Make mutt_decode_* usable without passing a BODY -+ structure. -+ -+ * imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c: Fixes so -+ mutt at least compiles with Brendan's new SASL patch. -+ -+ * lib.c: branches: 2.30.2; Fix mutt_read_line's behaviour when -+ encountering an EOF. From Aaron Lehmann . -+ -+ * pager.c: Avoid an infinite loop in the pager. From Edmund -+ Grimley Evans. -+ -+ * imap/auth_login.c, imap/auth_sasl.c, imap/browse.c, -+ imap/command.c, imap/imap.c, imap/imap_private.h, imap/message.c, -+ imap/util.c, mutt_sasl.c, mutt_sasl.h, mutt_ssl.c, mutt_ssl.h: -+ Brendan Cully's SASL patch. -+ -+2001-02-08 15:50:51 roessler (roessler) -+ -+ * attach.c, commands.c, curs_lib.c, muttlib.c, pgp.c, -+ recvattach.c, remailer.c: Replace various instances of endwin() -+ by mutt_endwin(). This should help to avoid chaotic screen -+ output on the "second" screen. -+ -+ * po/da.po: update. -+ -+ * doc/manual.sgml.head: Fix a typo. -+ -+2001-02-06 22:14:01 roessler (roessler) -+ -+ * doc/manual.sgml.head, doc/muttrc.man.head: Document fuzzy dates. -+ -+ * date.c, pattern.c: Fuzzy date matching. From Eike Rathke -+ . -+ -+2001-02-02 12:36:19 roessler (roessler) -+ -+ * pgpinvoke.c: Apply more conservative quoting to some PGP -+ invocation. -+ -+ * po/sv.po: Update from Jörgen Tegnér. -+ -+2001-02-01 17:03:44 roessler (roessler) -+ -+ * po/tr.po: update -+ -+2001-01-31 18:31:27 roessler (roessler) -+ -+ * send.c: Don't use group mailboxes with list-reply. E.g., -+ when you have "ietf" as a list pattern, and a message goes to -+ -+ IETF-Announce:;, ietf-openpgp@somewhere.org, -+ -+ list-reply will now yield ietf-openpgp and _not_: -+ -+ IETF-Announce: ietf-openpgp@... -+ -+ * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/tr.po, -+ po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/fr.po, -+ po/gl.po, po/id.po, po/it.po, po/ko.po, po/lt.po, po/nl.po, -+ po/pl.po, po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, -+ po/es.po: Including the turkish translation from Fatih Demir -+ ; make update-po. -+ -+ * configure.in: Including the turkish translation from Fatih -+ Demir . -+ -+2001-01-30 10:24:36 roessler (roessler) -+ -+ * doc/manual.sgml.head: Stan Ryckman -+ noted that we are abusing "envelope" where it should be "header". -+ -+ * thread.c: Fix sort_aux=received. From . -+ -+ * pager.c: Eric Fischer sent us this patch as -+ part of bug#441. I'm not entirely sure that it works, but let's -+ try it. -+ -+ * po/de.po, po/id.po: update -+ -+ * po/fr.po: update. -+ -+ * pop_auth.c: Fixing a stupid typo. bug#445, from Larry Rosenman -+ . -+ -+2001-01-27 13:50:26 roessler (roessler) -+ -+ * po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, -+ po/uk.po, po/pt_BR.po, po/ru.po, po/pl.po, po/ko.po, po/lt.po, -+ po/nl.po, po/gl.po, po/id.po, po/it.po, po/es.po, po/fr.po, -+ po/eo.po, po/el.po, po/de.po, po/da.po, po/cs.po, VERSION, -+ reldate.h, ChangeLog: automatic post-release commit for -+ mutt-1.3.14 -+ -+ * recvattach.c: More improvements to the recvattach collapsing. -+ -+ * mutt.h, pager.c, pager.h, protos.h, recvattach.c: Add collapsing -+ to the receive-attach menu, and improve digest handling that way. -+ -+ * OPS: branches: 2.22.2; Add collapsing to the receive-attach -+ menu, and improve digest handling that way. -+ -+ * attach.c, attach.h, compose.c, functions.h, init.h: Add -+ collapsing to the receive-attach menu, and improve digest handling -+ that way. -+ -+2001-01-25 12:04:46 roessler (roessler) -+ -+ * po/cs.po: Fixes from Björn Jacke . -+ -+ * contrib/pgp6.rc: A nit from Björn Jacke . -+ -+2001-01-22 11:04:56 roessler (roessler) -+ -+ * mutt_ssl.c: patch-1.3.13.tk.ssl.connect.1 -+ -+2001-01-18 11:27:56 roessler (roessler) -+ -+ * complete.c: Completion fix. From Aaron Schrab -+ . -+ -+2001-01-17 08:53:12 roessler (roessler) -+ -+ * rfc822.c: This one-line diff should fix the behaviour of the -+ address parser when encountering loose dots in addresses. -+ -+ * imap/auth_sasl.c: Try to catch mysterious failures of the SASL -+ library instead of hanging. From Brendan Cully. -+ -+2001-01-15 10:40:50 roessler (roessler) -+ -+ * copy.c: Some debugging helpers. -+ -+ * send.c: Use safe_fclose() where a NULL pointer may be passed -+ to fclose(). -+ -+ * pattern.c: Make ~m usable in $simple_search. From -+ . -+ -+2001-01-10 19:36:43 roessler (roessler) -+ -+ * recvcmd.c, send.c: Make some messages about mime-forwarding -+ more comprehensible to normal users. -+ -+2001-01-08 23:09:32 roessler (roessler) -+ -+ * imap/auth_sasl.c, imap/utf7.c, imap/util.c, charset.c, -+ charset.h, check_sec.sh, dotlock.c, enter.c, gnupgparse.c, -+ keymap.c, lib.c, mutt_sasl.c, parse.c, pgp.c, pgppubring.c, -+ pop_auth.c, regex.c, rfc2047.c, rfc2231.c, rfc822.c, sendlib.c, -+ strdup.c: Let check_sec.sh check for use of the unsafe malloc, -+ realloc, free, and strdup routines. While we are on it, plug -+ some memory leaks and make some code understandable. -+ -+ * intl/cat-compat.c, imap/auth_cram.c, imap/auth_gss.c, -+ imap/imap.c, imap/imap_private.h, imap/message.c, base64.c, -+ browser.c, check_sec.sh, commands.c, complete.c, copy.c, -+ curs_lib.c, edit.c, handler.c, init.c, lib.c, pager.c, pgp.c, -+ pgpkey.c, pop_lib.c, protos.h, query.c, rfc2231.c, rfc822.c, -+ send.c, sendlib.c, snprintf.c: Fix and/or check more fishy code. -+ -+ * intl/cat-compat.c, imap/auth_cram.c, imap/auth_gss.c, browser.c, -+ buffy.c, check_sec.sh, curs_main.c, enter.c, init.c, main.c, -+ makedoc.c, mkjtags.c, mutt_sasl.c, pgp.c, pgpinvoke.c, pgpkey.c, -+ pop.c, protos.h, regex.c, rfc2231.c, sendlib.c: Going through -+ possible security problems with a fine comb. If you want to help, -+ check out the current source, and run check_sec.sh. -+ -+ * attach.c, build-release, check_sec.sh, edit.c, pgpkey.c: -+ Some automated security checks concerning fopen() calls. -+ -+2001-01-04 05:39:31 roessler (roessler) -+ -+ * gettext.c: Don't use debugfile unless DEBUG is #defined. -+ -+2001-01-03 13:39:48 roessler (roessler) -+ -+ * enter.c, mbyte.c: More wide-char patches from EGE. -+ -+ * enter.c: Don't accept '\0' as keyboard input. -+ -+ * imap/auth_sasl.c: Set SASL_IP_{LOCAL,REMOTE} properties - -+ needed for krb4 support; from yak@MIT.EDU. -+ -+ * enter.c: Try to fix nonprintable character input. -+ -+ * enter.c: Extend the editor so it supports unprintable -+ characters. -+ -+2001-01-02 16:34:26 roessler (roessler) -+ -+ * enter.c: Make my_wcstombs more robust. From EGE. -+ -+ * main.c: Only show mailboxes with -y. From -+ devenish@arcme.uwa.edu.au. -+ -+ * account.h: Fix password input. From Vsevolod Volkov. -+ -+2000-12-31 15:30:52 roessler (roessler) -+ -+ * po/ru.po, pop_lib.c: Missing patches from VVV. -+ -+ * imap/imap.c, OPS, curs_main.c, functions.h, globals.h: -+ Experimental patch to add an imap-fetch-mail function. -+ -+ * mutt.h, protos.h, browser.c, curs_lib.c, enter.c, main.c: -+ Make browser behaviour more consistent with expectations. -+ -+ * po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, -+ po/uk.po, po/pt_BR.po, po/ru.po, po/lt.po, po/nl.po, po/pl.po, -+ po/it.po, po/ko.po, po/id.po, po/es.po, po/fr.po, po/gl.po, -+ po/eo.po, po/da.po, po/de.po, po/el.po, VERSION, po/cs.po, -+ reldate.h, ChangeLog: automatic post-release commit for -+ mutt-1.3.13 -+ -+2000-12-30 10:28:16 roessler (roessler) -+ -+ * po/pl.po: update. -+ -+2000-12-22 18:03:34 roessler (roessler) -+ -+ * configure.in: autoconf consmetics. From L.H. -+ -+ * enter.c, mutt.h: Some more changes to the enter code. -+ -+ * enter.c: Fix some ugly bugs in the completion code. -+ In particular, replace_part() could lead to heap corruption. -+ -+ * po/lt.po, configure.in: Lithuanian translation. From Gediminas -+ Paulauskas . -+ -+2000-12-21 09:19:41 roessler (roessler) -+ -+ * flags.c, init.h, mh.c, mutt.h: patch.me.maildir_trash.1 -+ -+2000-12-17 19:54:58 roessler (roessler) -+ -+ * po/sv.po: update. -+ -+2000-12-14 15:40:30 roessler (roessler) -+ -+ * doc/manual.sgml.head: Improve hook documentation. From Lars -+ Hecking. -+ -+ * enter.c: More file name completion fixes. -+ -+ * enter.c: Fix "tab-tab" at the change-folder prompt. -+ -+2000-12-10 21:01:35 roessler (roessler) -+ -+ * imap/message.c, init.h, mutt.h: Avoid implicit flag updates -+ with IMAP. From Brendan Cully. -+ -+ * configure.in, enter.c, mbyte.c, mbyte.h, mutt.h: More enter.c -+ updates. From E.G.E.. -+ -+ * mbyte.h, mutt.h, configure.in, enter.c: More changes to the -+ utf-8 friendly line editor: Implement some missing functions, -+ include some more header files. -+ -+2000-12-08 10:38:30 roessler (roessler) -+ -+ * curs_lib.c: Remove an unnecessary ENTER_STATE allocation. -+ -+ * curs_lib.c, enter.c, mutt.h, protos.h: Make _mutt_enter_string() -+ re-entrant. -+ -+ * curs_lib.c, edit.c, enter.c, protos.h: Make the line editor -+ utf-8 friendly. First take from Edmund Grimley Evans. -+ -+2000-12-06 20:31:46 roessler (roessler) -+ -+ * gnupgparse.c: Fix pgp_ignore_subkeys. -+ -+ * mutt_curses.h: Make the BEEP macro a bit safer. From EGE. -+ -+ * imap/imap.c: Fix a memory leak in imap_logout_all. -+ -+2000-12-04 09:00:08 roessler (roessler) -+ -+ * mbyte.c: A little fix for the -HAVE_WC_FUNCS +LOCALES_HACK case. -+ From EGE. -+ -+2000-12-03 09:34:41 roessler (roessler) -+ -+ * doc/PGP-Notes.txt: Document the fact that Courier MTA corrupts -+ PGP/MIME signatures. -+ -+2000-12-02 09:16:47 roessler (roessler) -+ -+ * po/el.po, po/uk.po: update. -+ -+2000-11-28 11:19:57 roessler (roessler) -+ -+ * po/da.po, po/de.po, po/fr.po, po/id.po: updates -+ -+2000-11-27 13:14:28 roessler (roessler) -+ -+ * attach.h, commands.c, compose.c, curs_main.c, protos.h, -+ recvattach.c: Make sure edit-type works without a segmentation -+ fault from the receive-attach menu. -+ -+ * po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/ru.po, -+ po/sk.po, po/sv.po, po/pl.po, po/pt_BR.po, po/nl.po, po/it.po, -+ po/ko.po, po/fr.po, po/gl.po, po/id.po, po/eo.po, po/es.po, -+ po/el.po, po/cs.po, po/da.po, po/de.po, reldate.h, VERSION, -+ ChangeLog: automatic post-release commit for mutt-1.3.12 -+ -+2000-11-23 10:30:49 roessler (roessler) -+ -+ * contrib/sample.muttrc-tlr: Use display_filter to fix some -+ ugliness people are sending me. -+ -+ * commands.c: Don't endwin() before invoking the display_filter. -+ -+2000-11-21 10:32:34 roessler (roessler) -+ -+ * protos.h, main.c, curs_lib.c, globals.h: [stable] Introduce -+ mutt_curses_message and mutt_nocurses_message. From Olaf Kirch. -+ -+ * globals.h, main.c, protos.h, curs_lib.c: Introduce -+ mutt_curses_message/mutt_nocurses_message. From Olaf Kirch. -+ -+2000-11-20 13:20:28 roessler (roessler) -+ -+ * contrib/gpg.rc: Add a missing --textmode switch. -+ -+2000-11-19 20:39:49 roessler (roessler) -+ -+ * NEWS: Mention $print_split. -+ -+ * contrib/sample.muttrc-tlr: update -+ -+ * mutt.h, pgp.c, protos.h, commands.c, init.h: Introduce a -+ new option named $print_split. While we are on it, unify -+ the pipe-message and print-message code, and fix the PGP -+ key-extraction code so it doesn't interact with OPTPIPEDECODE -+ in strange manners any more. -+ -+2000-11-18 19:50:48 roessler (roessler) -+ -+ * curs_lib.c: Remove an unnecessary include statement. -+ -+2000-11-17 09:19:41 roessler (roessler) -+ -+ * po/sv.po: Small fix from Jörgen Tegnér . -+ -+ * imap/auth_gss.c: [stable] GSSAPI patch from Bill Nottingham -+ . -+ -+ * doc/manual.sgml.tail, curs_main.c, functions.h: Make folder -+ synchronization possible from within the pager. From Chris -+ Cutler . -+ -+2000-11-15 20:29:58 roessler (roessler) -+ -+ * charset.c: Fix langinfo-based character set detection. -+ From Martin Norbäck . -+ -+2000-11-14 16:57:19 roessler (roessler) -+ -+ * curs_main.c: another possibly problematic case. -+ -+ * curs_main.c: Try fixing a possible segmentation fault. I'm not -+ entirely sure how I produced it, but it's at least obvious where -+ it happened. -+ -+2000-11-13 22:19:57 roessler (roessler) -+ -+ * gnupgparse.c, init.h, mutt.h: Add the pgp_ignore_subkeys option. -+ Unset it to get the traditional listing with all the subkeys. -+ (Experimental, may introduce new bugs.) -+ -+ * po/ru.po, po/sv.po: update -+ -+ * remailer.c: Qualify some more header fields. -+ -+2000-11-07 10:31:51 roessler (roessler) -+ -+ * init.h, mutt.h, send.c: Add a sig_on_top option. -+ -+ * po/el.po: update -+ -+2000-11-06 11:27:07 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/da.po: update -+ -+ * configure.in: Make building mutt without iconv support possible. -+ From EGE. -+ -+2000-11-03 10:16:32 roessler (roessler) -+ -+ * init.h: Change pgp_good_sign's default to 0 instead of UL "". -+ This should fix the annoying error messages when starting up -+ mutt on some systems. -+ -+ * init.c: Make error reporting more verbose. -+ -+ * po/de.po, po/fr.po, po/id.po: updates -+ -+2000-11-01 13:14:18 roessler (roessler) -+ -+ * po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, -+ po/uk.po, po/id.po, po/it.po, po/ko.po, po/nl.po, po/pl.po, -+ po/pt_BR.po, po/ru.po, po/cs.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, po/es.po, po/fr.po, po/gl.po, ChangeLog, VERSION, -+ reldate.h: automatic post-release commit for mutt-1.3.11 -+ -+2000-10-27 10:51:01 roessler (roessler) -+ -+ * enter.c: A nicer version of {capitalize,...}-word functions. -+ -+ * doc/manual.sgml.head: Document the recent additions to the -+ line editor. -+ -+ * OPS, enter.c, functions.h: Add capitalize-word, upcase-word, -+ downcase-word functions to the editor. Bindings follow the -+ Emacs conventions (i.e., M-c, M-u, M-d). -+ -+2000-10-25 18:56:20 roessler (roessler) -+ -+ * rfc822.c: Fix parsing of route-addrs. -+ -+2000-10-24 08:59:21 roessler (roessler) -+ -+ * doc/manual.sgml.tail: Document edit-type. From Mikko Hänninen. -+ -+ * po/el.po: update -+ -+2000-10-23 16:39:10 roessler (roessler) -+ -+ * doc/manual.sgml.head: Typo. From Daniel Roesen . -+ -+ * doc/manual.sgml.head: Fix documentation of uznknown MIME type -+ handling. From Brian Salter-Duke -+ -+2000-10-18 09:01:56 roessler (roessler) -+ -+ * recvattach.c: Fix tree formatting in the recvattach menu. -+ -+2000-10-17 15:10:51 roessler (roessler) -+ -+ * commands.c, curs_lib.c, hdrline.c, menu.c, protos.h: Fix -+ pager and index display when non-printable space characters -+ are encountered. From EGE. -+ -+ * sendlib.c: Teach mutt to attach files of arbitrary type. -+ -+2000-10-16 17:29:55 roessler (roessler) -+ -+ * curs_lib.c: nl_langinfo({YES,NO}EXPR) may return an _extended_ -+ regular expression. Close #312. -+ -+ * po/zh_TW.Big5.po, po/id.po, po/sv.po: update -+ -+ * mutt_socket.c: Fix the strange "Can't connect" error messages. -+ From Brendan Cully. -+ -+2000-10-12 14:49:58 roessler (roessler) -+ -+ * po/da.po: update -+ -+2000-10-11 14:17:17 roessler (roessler) -+ -+ * po/de.po: update. -+ -+ * po/fr.po: update -+ -+ * po/uk.po, po/zh_CN.GB2312.po, po/zh_TW.Big5.po, po/pt_BR.po, -+ po/ru.po, po/sk.po, po/sv.po, po/nl.po, po/pl.po, po/ko.po, -+ po/es.po, po/fr.po, po/gl.po, po/id.po, po/it.po, po/cs.po, -+ po/da.po, po/de.po, po/el.po, po/eo.po, ChangeLog, Makefile.am, -+ VERSION, reldate.h: automatic post-release commit for mutt-1.3.10 -+ -+ * buffy.c: Compilation fix from Emil Sit . -+ -+2000-10-10 19:22:48 roessler (roessler) -+ -+ * po/POTFILES.in, doc/manual.sgml.head, globals.h, init.c, -+ init.h, mailbox.h, mutt.h, muttlib.c, mx.c, mx.h, pop.c, pop.h, -+ pop_auth.c, pop_lib.c, protos.h, recvattach.c, Makefile.am, -+ browser.c, buffy.c, commands.c, compose.c, configure.in, -+ curs_main.c: Vsevolod Volkov's POP mailbox patch. -+ -+ * doc/manual.sgml.head: Mixmaster documentation patch from -+ Brian Salter-Duke. -+ -+2000-10-09 08:30:35 roessler (roessler) -+ -+ * main.c: Add an #ifdef for HAVE_GETADDRINFO. -+ -+ * mutt_socket.c: Use AF_INET6 only when necessary. -+ -+2000-10-07 18:06:24 roessler (roessler) -+ -+ * curs_lib.c, help.c: Display fixes from EGE. -+ -+2000-10-05 19:12:28 roessler (roessler) -+ -+ * query.c: Catch some possible NULL pointer deferences. -+ From chris+usenet@chiappa.net (Chris Chiappa), posted to -+ comp.mail.mutt. -+ -+2000-10-04 18:50:35 roessler (roessler) -+ -+ * mutt_ssl_nss.c: Downgrade Michael Elkins' indentation style -+ to the version used throughout mutt. ;-) -+ -+ * Makefile.am, acconfig.h, configure.in, init.c, init.h, -+ mutt.h, mutt_socket.c, mutt_ssl_nss.c, pop.c: Adding support for -+ Netscape's (pardon, Mozilla's) SSL implementation. From Michael -+ Elkins. -+ -+ * globals.h, init.h, mutt_socket.c, protos.h: -+ patch.me.connect_timeout.1 -+ -+ * signal.c: branches: 2.6.2; patch.me.connect_timeout.1 -+ -+2000-10-03 10:47:20 roessler (roessler) -+ -+ * NEWS: Document some of the recent user-visible changes. -+ -+ * doc/manual.sgml.head: More documentation for the "L" to_char. -+ Thanks, Byrial! -+ -+ * hdrline.c, init.h: Adding a list flag to to_chars, From Andreas -+ Plesner Jacobsen . Note: If you don't like the new -+ behaviour, just set $to_chars to the old " +TCF" value. -+ -+ * po/ru.po: update -+ -+2000-10-02 09:11:52 roessler (roessler) -+ -+ * configure.in, mutt_socket.c: patch-bac.ipv6-1 -+ -+ * curs_lib.c: patch-1.3.9.bj.yesno.1 -+ -+2000-09-28 06:53:36 roessler (roessler) -+ -+ * init.h: Fix a minor typo. From Byrial. -+ -+ * INSTALL, charset.c, charset.h, init.c: Document the -+ --without-wc-funcs switch to configure, and clean up the code -+ to set the character set from nl_langinfo from EGE. -+ -+2000-09-27 14:28:35 roessler (roessler) -+ -+ * charset.c: Catch another error condition which may be caused -+ by a broken nl_langinfo() function. -+ -+ * COPYRIGHT: We don't need to mention EAY's copyright any more. -+ -+ * charset.c: Fix #287. -+ -+2000-09-26 23:05:46 roessler (roessler) -+ -+ * po/eo.po: update -+ -+ * Makefile.am, checktypes.c, main.c, pgppubring.c, sha.h, sha1.c, -+ sha1.h, sha1dgst.c, sha_locl.h: Replace the BSD-licensed sha-1 -+ from SSLeay with a public domain version in order to satisfy -+ GPL license zelots. -+ -+2000-09-25 13:03:09 roessler (roessler) -+ -+ * po/sv.po: update -+ -+ * send.c: patch-1.3.9.bj.f-up-prompt.1 -+ -+2000-09-21 09:37:14 roessler (roessler) -+ -+ * po/sk.po, po/sv.po, po/uk.po, po/zh_CN.GB2312.po, -+ po/zh_TW.Big5.po, po/ru.po, po/nl.po, po/pl.po, po/pt_BR.po, -+ po/it.po, po/ko.po, po/es.po, po/fr.po, po/gl.po, po/id.po, -+ po/el.po, po/eo.po, po/da.po, po/de.po, po/cs.po, ChangeLog, -+ VERSION, reldate.h: automatic post-release commit for mutt-1.3.9 -+ -+ * rfc2047.c: Make some of the code more readable. From EGE. -+ -+2000-09-15 09:19:29 roessler (roessler) -+ -+ * rfc2047.c, rfc2047.h, sendlib.c: Fix some RFC2047 encoding bugs. -+ -+2000-09-13 21:01:31 roessler (roessler) -+ -+ * rfc2047.c: Undo part of the character set canonicalization. -+ EGE pointed out it isn't needed. -+ -+ * rfc2231.c: Replace "unknown" by "unknown-8bit". -+ -+ * sendlib.c: s/iconv_open/mutt_iconv_open/. Suggested by EGE. -+ -+ * charset.c: Add "646" as an alias for us-ascii. SunOS 5.8 -+ seems to need it. -+ -+ * browser.c: Let the browser handle non-existent directories -+ more gracefully. From Byrial Jensen. -+ -+2000-09-12 23:18:47 roessler (roessler) -+ -+ * configure.in: Remove some caching. From EGE. -+ -+2000-09-11 10:50:37 roessler (roessler) -+ -+ * charset.c, copy.c, mbyte.c, rfc2047.c, sendlib.c: Fix some -+ more character set glitches. -+ -+2000-09-09 07:30:29 roessler (roessler) -+ -+ * charset.c: sizeof (dest) == 4. I should have written dlen -+ instead. Noted by EGE. -+ -+2000-09-08 21:52:04 roessler (roessler) -+ -+ * imap/imap.c: Brendan's version of the last fix. I put it in -+ since he's most likely the next one to look at or change this. ,-) -+ -+ * imap/imap.c: Fix a silly little IMAP bug. From Daniel -+ Jacobowitz . -+ -+ * charset.c, protos.h, rfc2231.c, sendlib.c: Add a character -+ set comparison function. -+ -+2000-09-07 21:56:00 roessler (roessler) -+ -+ * charset.c: Add a table of official character set names. -+ Data taken from www.iana.org. -+ -+ * rfc2231.c: Detect pure 7bit data and don't encode them. -+ This helps a bit in situations where mutt believes it has some -+ really strange us-ascii alias as the character set. -+ -+ * po/es.po, po/es.po, po/el.po: update -+ -+ * curs_lib.c: Make the use of nl_langinfo(YESEXPR/NOEXPR) -+ more robust. Problem noted by Wolfgang Baumann . -+ -+2000-09-06 08:47:13 roessler (roessler) -+ -+ * snprintf.c: Fix the MAX fix. from Byrial Jensen. -+ -+2000-09-05 22:14:36 roessler (roessler) -+ -+ * init.c, muttlib.c, pgppubring.c, protos.h, snprintf.c: Clean -+ up some warning messages. From Bob Bell. -+ -+ * hook.c: Fix a segmentation fault in hook parsing. From Bob -+ Bell. -+ -+2000-09-04 10:49:48 roessler (roessler) -+ -+ * imap/browse.c, imap/imap.c, imap/imap.h, imap/imap_private.h, -+ imap/util.c, account.c, account.h, browser.c, curs_main.c, url.c, -+ url.h: patch-bac.imapurl-4 -+ -+ * po/ru.po, po/da.po, po/da.po: update -+ -+ * po/id.po: update. -+ -+ * recvcmd.c: Fix a segmentation fault when replying to multiple -+ message/rfc822-type attachments. Noted by David Champion. -+ -+2000-09-01 08:58:39 roessler (roessler) -+ -+ * init.c: Don't mutt_pretty_mailbox when setting variables, -+ since this may badly interact with non-default settings. -+ Suggested by Byrial Jensen. -+ -+2000-08-31 15:14:25 roessler (roessler) -+ -+ * muttlib.c: patch-1.3.8.bj.pretty_mailbox.1 -+ -+ * doc/manual.sgml.head: patch-1.3.8.bj.manquote.1 -+ -+ * imap/command.c, imap/imap.c: patch-bac.command-3 -+ -+2000-08-30 21:34:42 roessler (roessler) -+ -+ * pager.c: Fix display of backspace sequences. From EGE. -+ -+ * po/fr.po, po/de.po: update -+ -+ * po/sk.po, po/sv.po, po/uk.po, po/zh_CN.GB2312.po, -+ po/zh_TW.Big5.po, po/id.po, po/it.po, po/ko.po, po/nl.po, -+ po/pl.po, po/pt_BR.po, po/ru.po, po/cs.po, po/da.po, po/de.po, -+ po/el.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, ChangeLog, -+ VERSION: automatic post-release commit for mutt-1.3.8 -+ -+ * VERSION: ups -+ -+ * po/POTFILES.in, imap/Makefile.am, imap/imap_ssl.c, -+ imap/imap_ssl.h, imap/md5.h, imap/md5c.c, imap/util.c, ChangeLog, -+ Makefile.am, VERSION, configure.in, curs_main.c, init.c, md5.h, -+ md5c.c, mutt_socket.c, mutt_ssl.c, mutt_ssl.h, reldate.h: SSL -+ unification patch from Vsevolod. -+ -+ * imap/command.c, imap/imap.c, imap/message.c, imap/message.h: -+ patch-bac.expunge-2 -+ -+ * muttlib.c: Fix mutt_prety_mailbox. From Vsevolod. -+ -+2000-08-29 11:36:25 roessler (roessler) -+ -+ * curs_lib.c: The next version of Byrial Jensen's yesorno patch, -+ this time without a memory leak. -+ -+ * acconfig.h, configure.in, curs_lib.c, main.c: Use locale for -+ yes/no expressions. -+ -+2000-08-28 13:14:55 roessler (roessler) -+ -+ * rfc2231.c: Little fix from EGE. -+ -+ * po/ru.po: Update from Vsevolod. -+ -+2000-08-28 09:40:28 EGE (roessler) -+ -+ * complete.c: Fix a buffer overrun in complete.c. -+ -+2000-08-28 09:39:36 Brendan Cully (roessler) -+ -+ * imap/auth_sasl.c, imap/command.c, imap/imap_private.h, -+ muttlib.c: The attached small patch adjusts mutt_pretty_mailbox -+ to handle URLs. -+ -+2000-08-28 09:38:42 Edmund GRIMLEY EVANS (roessler) -+ -+ * browser.c, curs_lib.c, hdrline.c, protos.h, recvattach.c: This -+ patch moves hdr_format_s from hdrline.c to curs_lib.c and renames -+ it to mutt_format_s. The function is then used in various places -+ in browser.c and recvattach.c where previously there was "%%%ss". -+ -+2000-08-28 09:37:44 roessler (roessler) -+ -+ * rfc2047.c, rfc2047.h, rfc2231.c, rfc2231.h, sendlib.c: Do -+ character set selection for RFC2231 encodings. From EGE, but -+ with choose_charset renamed to mutt_choose_charset. -+ -+2000-08-28 09:32:58 edmundo@rano.org (EGE) (roessler) -+ -+ * mbyte.c, protos.h, utf8.c, wcwidth.c: This is the patch TAKIZAWA -+ Takashi and I came up with in the end. -+ -+ When the Charset is euc-jp or shift_jis, iconv is used for -+ mbrtowc and wcrtomb. The worst part is mbrtowc_iconv(), where -+ I attempted to make mbrtowc both restartable (it can process -+ part of multibyte character) and fast in the case where there -+ is nothing left over from a previous character. Also I try to -+ make no assumptions about how those character sets work, which -+ is easy, because I know very little about them ... -+ -+ People who don't use one of those two stateless Japanese display -+ charsets shouldn't be affected. People whose systems provide -+ the wchar_t functions should be even less affected, because they -+ don't even get this code in their binary. -+ -+2000-08-25 06:28:24 roessler (roessler) -+ -+ * imap/imap.c, imap/imap_ssl.c, imap/imap_ssl.h, imap/util.c, -+ account.c, account.h, browser.c, mutt_socket.c, mx.c, url.c, -+ url.h: patch-bac.imapurl-2, with small modifications. -+ -+2000-08-22 22:23:10 roessler (roessler) -+ -+ * muttlib.c: Fix #251, from Brendan. -+ -+ * Makefile.am, main.c, parse.c, protos.h, url.c, url.h: Add an -+ URL parser, and support for mailto URLs. -+ -+ * doc/manual.sgml.head: Minor fixes from Will Fiveash. -+ -+ * po/ru.po: update -+ -+ * hdrline.c: Fix %B in index_format. -+ -+2000-08-21 19:25:26 roessler (roessler) -+ -+ * imap/browse.c, imap/imap.c, mutt_socket.c, muttlib.c: -+ patch-bac.parsepath-2 -+ -+ * doc/manual.sgml.head, doc/manual.sgml.tail: Documentation -+ patch from Lars Hecking. -+ -+ * imap/imap.h, imap/imap_private.h, imap/message.c, imap/util.c, -+ imap/browse.c, imap/command.c, imap/imap.c, doc/manual.sgml.head, -+ browser.c, browser.h, buffy.c, functions.h, globals.h, init.h, -+ OPS: patch-bac.createplus-1 -+ -+ * imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c, -+ imap/auth_login.c, imap/auth_sasl.c, imap/browse.c, -+ imap/command.c, imap/imap.c, imap/imap_private.h, imap/message.c: -+ patch-bac.command-2 -+ -+2000-08-17 06:06:02 roessler (roessler) -+ -+ * po/zh_CN.GB2312.po, configure.in: Adding zh_CN.GB2312 -+ translation. -+ -+ * imap/Makefile.am, doc/Makefile.in, mutt_socket.c, mx.c: Random -+ cleanup from Brendan Cully. -+ -+ * hdrline.c: Fix justification of number formats. (EGE) -+ -+2000-08-15 17:21:19 roessler (roessler) -+ -+ * po/ru.po: update -+ -+ * mbyte.c, pager.c, protos.h: Another charset fix from EGE. -+ -+2000-08-10 15:48:13 roessler (roessler) -+ -+ * imap/Makefile.am: Fix from Brendan Cully. -+ -+ * doc/mutt.man, doc/muttrc.man.tail: More minor fixes. -+ -+ * doc/mutt.man: Document $MAILDIR. -+ -+ * init.c: Tell mutt about the MAILDIR environment variable DJB -+ talks about in maildir (5). -+ -+ * doc/muttbug.man: Fix a typo. -+ -+ * doc/mbox.man: fix some typos. -+ -+2000-08-09 21:14:35 roessler (roessler) -+ -+ * doc/Makefile.in, doc/mbox.man: Install mbox (5), and fix a typo. -+ -+ * doc/mbox.man: Document the mbox format in a manual page. -+ There may be some need for this. -+ -+ * Makefile.am, configure.in, init.c, main.c: Minor portability -+ and compilation fixes. -+ -+2000-08-08 18:17:54 roessler (roessler) -+ -+ * po/POTFILES.in: Some files were missing. From Vsevolod Volkov. -+ -+ * imap/Makefile.am, imap/command.c, imap/imap.c, -+ imap/imap_private.h, imap/message.c, init.c, mutt_socket.c, -+ mx.c: * handles expunged messages better. Previously mutt's -+ state was only updated when syncing the mailbox. This was the -+ reason for Bob Bell's segfault when manipulating mailboxes -+ with multiple simultaneous clients. -+ * makes a small adjustment for Sam's weird Courier server, which -+ returns an OK FETCH completed response even when FETCH fails. I -+ should probably report that behaviour to him as a bug, though. -+ * renames IMAP_REOPEN_PENDING to IMAP_EXPUNGE_PENDING * gets -+ rid of the _("Closing mailbox...") message, which was obscuring -+ the status updates. * clears some spurious mutt_clear_error -+ calls in imap_cmd_finish. * makes socket reads and writes check -+ that they have an open -+ connection. Shouldn't be necessary (and such calls are logged), -+ but can happen currently. -+ * Some SASL vs regular authenticator tweaks in the imap Makefile. -+ -+ (From Brendan Cully.) -+ -+2000-08-07 08:31:36 roessler (roessler) -+ -+ * po/Makefile.in.in, imap/Makefile.am, Makefile.am, configure.in, -+ mapping.h, sort.h: Cross compilation patches from Rüdiger Kuhlmann -+ . -+ -+2000-08-06 14:35:15 roessler (roessler) -+ -+ * curs_lib.c: Return an exit value of 1 if mutt is left via -+ ctrl-c. From Andre Albsmeier . -+ -+2000-08-05 17:50:03 roessler (roessler) -+ -+ * imap/imap.c, imap/imap_private.h, imap/message.c, -+ imap/Makefile.am, imap/auth_anon.c, imap/auth_cram.c, -+ imap/auth_gss.c, imap/auth_login.c, imap/auth_sasl.c, -+ imap/browse.c, imap/command.c, mutt_socket.c: Unified IMAP -+ command code. -+ -+ * doc/manual.sgml.head, doc/manual.sgml.head: Fix keyboard -+ binding documentation. From Thomas Schultz . -+ -+2000-08-04 21:47:11 roessler (roessler) -+ -+ * sendlib.c: Fix a character set encoding bug. From EGE. -+ -+ * imap/auth_sasl.c, imap/imap_ssl.c, doc/manual.sgml.head, -+ account.c, mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h: -+ SASL patch from Brendan Cully. -+ -+2000-08-03 22:08:13 roessler (roessler) -+ -+ * charset.c: fix a segmentation fault. -+ -+ * po/eo.po, po/sv.po: update. -+ -+ * po/ru.po, po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, -+ po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/fr.po, po/gl.po, -+ po/id.po, po/it.po, VERSION, imap/Makefile.am, po/cs.po, po/da.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po, reldate.h, ChangeLog: -+ automatic post-release commit for mutt-1.3.7 -+ -+ * sendlib.c: Use a correct Envelope from when bouncing with -+ $envelope_from enabled. -+ -+ * imap/BUGS, imap/auth_sasl.c, imap/imap.c, imap/imap_ssl.c, -+ mutt_sasl.c: More IMAP fixes from Brendan. -+ -+2000-08-02 18:03:21 roessler (roessler) -+ -+ * po/it.po: update -+ -+2000-08-01 18:04:42 roessler (roessler) -+ -+ * mx.c: Fix from BC -+ -+ * imap/auth.c, imap/auth_gss.c, imap/auth_sasl.c, imap/message.c: -+ Brendan's latest patches. -+ -+2000-07-31 10:49:00 roessler (roessler) -+ -+ * po/fr.po: update. -+ -+ * m4/gettext.m4, imap/Makefile.am, imap/auth.c, imap/auth.h, -+ imap/auth_anon.c, imap/auth_cram.c, imap/auth_gss.c, -+ imap/auth_login.c, imap/auth_sasl.c, imap/command.c, -+ imap/imap.c, imap/imap_private.h, Makefile.am, acconfig.h, -+ account.c, account.h, configure.in, globals.h, init.h, main.c, -+ mutt_sasl.c, mutt_sasl.h, mutt_socket.c, mutt_socket.h: Brendan -+ Cully's SASL patch. I hope I didn't miss any files. -+ -+2000-07-29 16:33:53 roessler (roessler) -+ -+ * po/id.po: update. -+ -+ * imap/README: updated readme file. -+ -+ * Makefile.am: Make sure checktypes and makedoc don't depend on -+ the intl library. -+ -+ * po/de.po: update. -+ -+2000-07-28 19:00:31 roessler (roessler) -+ -+ * po/ru.po, po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, -+ po/it.po, po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/eo.po, -+ po/es.po, po/fr.po, po/gl.po, po/id.po, po/cs.po, po/da.po, -+ po/de.po, po/el.po, ChangeLog, VERSION, reldate.h: automatic -+ post-release commit for mutt-1.3.6 -+ -+ * Makefile.am: parse.h no longer exists, so don't try to -+ distribute it. -+ -+ * po/sv.po: branches: 1.27.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/uk.po: branches: 1.42.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/zh_TW.Big5.po: branches: 1.30.2.6.2; automatic post-release -+ commit for mutt-1.2.5 -+ -+ * po/pt_BR.po: branches: 1.20.2.6.2; automatic post-release -+ commit for mutt-1.2.5 -+ -+ * po/ru.po: branches: 1.67.2.7.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/sk.po: branches: 1.28.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/ko.po: branches: 1.31.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/nl.po: branches: 1.36.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/pl.po: branches: 1.39.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/gl.po: branches: 1.23.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/id.po: branches: 1.31.2.7.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/it.po: branches: 1.59.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/el.po: branches: 1.31.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/eo.po: branches: 1.30.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/es.po: branches: 1.49.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/fr.po: branches: 1.45.2.7.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/cs.po: branches: 1.35.2.7.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/da.po: branches: 1.13.2.7.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * po/de.po: branches: 1.99.2.7.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * reldate.h: automatic post-release commit for mutt-1.2.5 -+ -+ * ChangeLog: branches: 2.40.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * VERSION: branches: 2.28.2.6.2; automatic post-release commit -+ for mutt-1.2.5 -+ -+ * imap/imap.c, imap/imap_private.h, imap/message.c: Use UIDs -+ instead of sequence numbers in IMAP. (Brendan) -+ -+ * imap/imap.c, imap/imap_private.h, imap/message.c, -+ imap/message.h, imap/command.c, mutt.h, muttlib.c, mx.c: Handle -+ expunged messages. From Brendan Cully. -+ -+2000-07-26 09:30:01 roessler (roessler) -+ -+ * doc/manual.sgml.head: Nits from Michael Sobolev. -+ -+2000-07-25 16:35:48 roessler (roessler) -+ -+ * Makefile.am: Include the muttbug wrapper with the distribution. -+ -+ * doc/Makefile.in: Install muttbug.man als flea.1. -+ -+ * doc/mutt.man, doc/muttbug.man, Makefile.am, main.c, muttbug: -+ Install muttbug(1) as flea(1), and adjust the documentation -+ accordingly. Note: Typing muttbug will still work. -+ -+ * doc/muttbug.man: More tiny fixes. -+ -+ * doc/muttbug.man: Fix some typos. In particular, it's bug -+ tracking system, not buck tracking system. Oh well. -+ -+ * doc/Makefile.in, doc/mutt.man, doc/muttbug.man: muttbug(1) -+ has a manual page of it's own now. -+ -+ * muttbug.sh.in: Fix a little bug concerning version numbers. -+ -+ * Makefile.am: The warning about README.UPGRADE can go. -+ -+ * doc/mutt.man: Mention the bug tracking system. -+ -+ * INSTALL: Mention that mutt needs an iconv implementation, -+ and point users to libiconv. -+ -+ * INSTALL: Mention OpenBSD -+ -+ * Makefile.am: Remove types.h at "make clean" time. -+ -+ * curs_main.c: Fix a segmentation fault in the index. -+ -+ * curs_main.c: Try to fix a segmentation fault in the index. -+ -+2000-07-24 07:48:53 roessler (roessler) -+ -+ * browser.h: make bit types unsigned. From albert chin -+ . -+ -+ * curs_lib.c, hdrline.c, help.c, mbyte.c, mbyte.h, menu.c: -+ Replace wctomb and mbtowc with wcrtomb and mbrtowc. From TAKIZAWA -+ Takashi , with small changes from Edmund -+ Grimley Evans. -+ -+2000-07-23 21:47:01 roessler (roessler) -+ -+ * menu.c: Fix #108, from Gero Treuner. -+ -+ * configure.in, resize.c: sys/ioctl.h vs. ioctl.h. From Sam -+ Roberts. -+ -+ * rfc2231.c: Fix an obvious bug which prevented rfc2231 _encoding_ -+ support from working. -+ -+2000-07-22 09:01:43 roessler (roessler) -+ -+ * configure.in, mutt.h: Some more QNX compiling aides. -+ -+2000-07-21 07:32:12 roessler (roessler) -+ -+ * imap/md5.h, Makefile.am, checktypes.c: Try to be smart about -+ integer types. -+ -+ * imap/imap.c: Fix imap_passive. From Brendan Cully. -+ -+ * contrib/Makefile.in: Fix #150. From Brendan Cully. -+ -+2000-07-20 17:51:52 roessler (roessler) -+ -+ * doc/devel-notes.txt: Typo. -+ -+ * imap/browse.c, imap/command.c, imap/imap.c, imap/imap.h, -+ imap/imap_private.h, imap/util.c, mutt_socket.c, mutt_socket.h, -+ mx.c, pop.c: Another IMAP patch from Brendan. -+ -+ * imap/util.c: quick hack against mx->mbox being NULL. -+ -+ * imap/BUGS, imap/imap.c, imap/imap.h, imap/util.c, postpone.c: -+ patch-bac.postpone-2 -+ -+ * pop.c: Use shared socket code, from Vsevolod Volkov. -+ -+2000-07-19 10:21:57 roessler (roessler) -+ -+ * po/POTFILES.in, imap/Makefile.am, imap/auth.c, imap/auth_gss.c, -+ imap/browse.c, imap/imap.c, imap/imap.h, imap/imap_private.h, -+ imap/imap_socket.h, imap/imap_ssl.c, imap/imap_ssl.h, -+ imap/message.c, imap/socket.c, imap/util.c, Makefile.am, -+ acconfig.h, account.c, account.h, browser.c, configure.in, -+ gettext.c, globals.h, init.c, init.h, mutt_socket.c, -+ mutt_socket.h: IMAP socket moves by Brendan Cully, with a fix -+ from Tommi Komulainen, and most likely based on input from -+ Vsevolod Voykov (sp?). -+ -+ * imap/util.c: Fix more possible IMAP memory corruption. -+ From Brendan Cully. -+ -+ * imap/util.c: Fix possible memory corruption in stable. -+ From Brendan Cully. -+ -+ * imap/imap_private.h, imap/message.c, imap/socket.c, imap/imap.c: -+ Backport various IMAP bug-fixes to stable. From Brendan Cully. -+ -+2000-07-18 14:38:13 roessler (roessler) -+ -+ * imap/auth.c, imap/auth_gss.c, imap/browse.c, imap/command.c, -+ imap/imap.c, imap/imap_private.h, imap/message.c, imap/socket.c: -+ More IMAP clean-up from Brendan Cully. -+ -+ * imap/imap.c, imap/imap_private.h, imap/message.c, imap/socket.c, -+ imap/utf7.c: IMAP fixes from Brendan Cully. -+ -+ * init.h, init.h: Documentation fix. -+ -+2000-07-17 18:08:27 roessler (roessler) -+ -+ * imap/message.c: Fix possible heap corruption. From Brendan -+ Cully. -+ -+ * imap/utf7.c: Name changes left out by EGE's patch. -+ -+ * imap/util.c, imap/imap_private.h: imap/UTF7 related fixes -+ from EGE. -+ -+ * curs_main.c: Fix #192. -+ -+2000-07-16 15:35:14 roessler (roessler) -+ -+ * imap/Makefile.am, imap/browse.c, imap/imap.c, -+ imap/imap_private.h, imap/message.c, imap/utf7.c, imap/util.c: -+ Support modified UTF-7 in folder names. From Edmund Grimley -+ Evans, modified by Brendan Cully. -+ -+ * handler.c: Another qp fix. -+ -+ * handler.c: More qp decoder modifications: We should handle -+ multibyte characters spanning soft line breaks. -+ -+ * handler.c: Rewrite the quoted-printable decoder so it properly -+ chops off trailing white space. Problem noted by Byrial Jensen. -+ -+2000-07-15 06:51:47 roessler (roessler) -+ -+ * imap/socket.c: Add a message that we are looking up a host. -+ -+2000-07-14 15:03:43 roessler (roessler) -+ -+ * imap/message.c, imap/message.h: Brendan's latest IMAP changes. -+ -+ * README.SSL: Tommi Komulainen's entropy gathering patch - -+ documentation. -+ -+2000-07-12 14:17:46 roessler (roessler) -+ -+ * po/cs.po: update. -+ -+ * imap/imap_ssl.c: Entropy gathering fixes. -+ -+ * configure.in: Re-apply the iconv patch from vvv. -+ -+ * configure.in: undo the enable-external-dotlock patch. -+ -+ * handler.c: Initialize a variable in order to avoid a -+ segmentation fault. From Aaron Schrab. -+ -+2000-07-11 20:38:49 roessler (roessler) -+ -+ * imap/imap.c, imap/imap_private.h, imap/socket.c: Unify logout -+ stuff in _one_ function. From Vsevolod Volkov. -+ -+ * imap/message.c: Disable a bug work-around which actually -+ breaks things. -+ -+ * configure.in: Typo, noted by Brad . -+ -+2000-07-10 19:52:12 roessler (roessler) -+ -+ * main.c: Typo. -+ -+ * po/id.po: update. -+ -+ * rfc2047.c: Fix some possible NULL pointer deferences in the -+ RFC2047 code. -+ -+ * imap/command.c, imap/imap.c, imap/message.c, imap/socket.c, -+ browser.c, pgpkey.c, pop.c, query.c, remailer.c: Fix a bunch -+ of cases where format parameters were missing from calls to -+ mutt_message and mutt_error. -+ -+ * imap/command.c, imap/imap.c, imap/message.c, browser.c, -+ pgpkey.c, pop.c, query.c, remailer.c: [stable] Fix a bunch of -+ cases where format parameters were missing to calls of mutt_error -+ and mutt_message. -+ -+ * po/ru.po, po/de.po, po/da.po: update. -+ -+ * po/da.po: Update. -+ -+ * INSTALL, acconfig.h, charset.c, configure.in, main.c: Some -+ changes from EGE. -+ -+2000-07-07 15:12:37 roessler (roessler) -+ -+ * po/fr.po: update -+ -+ * attach.c, copy.c, editmsg.c, from.c, mbox.c, parse.c, parse.h, -+ pgp.c, protos.h: Fix #185: is_from would return 0 (i.e., error) -+ when parsing Jan 1 1970 12:00 - apparently, this point of time -+ occurs on real mail folders. -+ -+2000-07-06 23:08:39 roessler (roessler) -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/pt_BR.po, po/ru.po, -+ po/sk.po, po/nl.po, po/pl.po, po/it.po, po/ko.po, po/es.po, -+ po/fr.po, po/gl.po, po/id.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, ChangeLog, VERSION, po/cs.po: automatic post-release -+ commit for mutt-1.2.4 -+ -+ * muttlib.c: ups, this should be fixed in stable. -+ -+ * po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, po/uk.po, -+ po/zh_TW.Big5.po, po/ko.po, po/nl.po, po/pl.po, po/eo.po, -+ po/es.po, po/fr.po, po/gl.po, po/id.po, po/it.po, po/cs.po, -+ po/da.po, po/de.po, po/el.po, reldate.h, ChangeLog, VERSION: -+ automatic post-release commit for mutt-1.3.5 -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/pt_BR.po, po/ru.po, -+ po/sk.po, po/ko.po, po/nl.po, po/pl.po, po/fr.po, po/gl.po, -+ po/id.po, po/it.po, po/el.po, po/eo.po, po/es.po, po/cs.po, -+ po/da.po, po/de.po, reldate.h, ChangeLog, VERSION: automatic -+ post-release commit for mutt-1.2.3 -+ -+ * po/fr.po: update. -+ -+ * imap/auth.c, imap/auth_gss.c, imap/browse.c, imap/command.c, -+ imap/imap.c, imap/imap_private.h, imap/imap_socket.h, -+ imap/message.c, imap/socket.c: More IMAP clean-up. -+ -+ * imap/imap_private.h, imap/imap_socket.h, imap/message.c, -+ imap/socket.c, imap/util.c, imap/browse.c, imap/command.c, -+ imap/imap.c: More IMAP fixes from Brendan Cully. -+ -+2000-07-05 14:39:14 roessler (roessler) -+ -+ * imap/socket.c: Fix the Fix. From TK. -+ -+2000-07-05 10:32:17 Tommi Komulainen -+(roessler) -+ -+ * imap/imap_ssl.c, imap/socket.c: - imap_logout_all assumed -+ every connection with descriptor value != 0 to be ready for -+ reading/writing. Unfortunately when the descriptor was closed, -+ conn->fd remained untouched. This is why mutt segfaulted if -+ IMAP login was aborted with ^G. -+ -+ - ssl_socket_close was called without calling ssl_socket_open -+ first. This caused a segfault because conn->sockdata was -+ NULL. Apparently there was also a memory leak, because -+ conn->sockdata was never free'd :-] -+ -+2000-07-05 08:05:03 roessler (roessler) -+ -+ * imap/BUGS, imap/TODO, imap/auth.c, imap/imap.c, imap/socket.c: -+ IMAP cosmetics from Brendan Cully. -+ -+2000-07-04 17:59:10 roessler (roessler) -+ -+ * doc/manual.sgml.head: slight documentation imrpovement from -+ Will Fiveash. -+ -+2000-07-03 15:26:22 roessler (roessler) -+ -+ * po/de.po: update -+ -+ * imap/BUGS, imap/command.c, imap/imap.c, imap/imap.h, -+ imap/imap_socket.h, imap/socket.c, imap/util.c, curs_main.c: -+ IMAP logout patch from Brendan Cully. -+ -+ * po/id.po: update -+ -+ * po/id.po: update. -+ -+ * rfc2047.c: "Where have all the headers gone" fix from EGE. -+ -+ * sendlib.c: utf8 -> utf8 fix (From EGE). -+ -+ * rfc2047.c: RFC 2047 patch from EGE. -+ -+2000-06-30 08:28:56 roessler (roessler) -+ -+ * po/pl.po: fix a format. -+ -+ * sendlib.c: Character set fix from EGE. -+ -+2000-06-27 22:28:01 roessler (roessler) -+ -+ * sendlib.c: minor change from EGE. -+ -+ * main.c, rfc2047.c: Cosmetics. No, I didn't touch the word-wrap -+ code. ;-) -+ -+2000-06-26 23:10:26 roessler (roessler) -+ -+ * muttlib.c: Fix a possible segfault in mutt_expand_folder. Noted -+ by AMK; [stable]. -+ -+ * muttlib.c: Fix a possible segmentation fault in -+ mutt_expand_path. Noted by Andreas M. Kirchwitz. -+ -+ * doc/Makefile.in, contrib/Makefile.in: "make check" cosmetics. -+ -+ * contrib/sample.muttrc-tlr: update. -+ -+ * configure.in: Iconv detection patch. From Lars Hecking. -+ -+ * color.c, color.c: Fix #173. From Roland Rosenfeld. -+ -+2000-06-22 23:18:36 roessler (roessler) -+ -+ * muttlib.c: Avoid crashing when forwarding message/rfc822-type -+ attachments. -+ -+ * Makefile.am, prepare: Lars Hecking's build process patch -+ for stable. -+ -+ * rfc822.c: branches: 2.9.2.1.2; Fix stack corruption -+ in the RFC822 parser. Noted by Ari Gordon-Schlosberg -+ . -+ -+ * rfc822.c: Fix stack corruption in the RFC822 parser. -+ Problem noted by Ari Gordon-Schlosberg . -+ -+ * recvattach.c: Merge two almost-identical string constants. -+ From Byrial. -+ -+2000-06-21 19:23:23 roessler (roessler) -+ -+ * imap/auth_gss.c: More debug code which needs #ifdefs. -+ -+ * imap/auth_gss.c: More debugging code which needs #ifdefs. -+ -+ * po/eo.po: update. -+ -+ * Makefile.am, prepare: Work-around for keymap_defs and other -+ dependency problems. From Lars Hecking. -+ -+ * muttlib.c: Fix ~logname expansion for stable. -+ -+ * muttlib.c: Fix ~logname expansion. -+ -+ * README: Remove explicit list of mirrors, and refer to -+ download.html. -+ -+ * mbox.c: Fix another mbox synch problem. -+ -+ * mbox.c: Fix another bug in mbox synching. -+ -+ * postpone.c: Some more character set cleanup,. -+ -+ * commands.c, compose.c, muttlib.c, pgpkey.c, postpone.c, -+ protos.h, recvattach.c, send.c, sendlib.c: More character set -+ clean-up. -+ -+ * postpone.c: Improve character set handling when postponing -+ messages. This patch may lead to information loss under very -+ special circumstances. -+ -+ * muttlib.c, protos.h: Remove unused mutt_dup_body () function. -+ -+ * compose.c, pgpkey.c, protos.h, recvattach.c, send.c, sendlib.c: -+ Fix character set selection. Postponing and recalling messages -+ should work again, now. -+ -+ * postpone.c, sendlib.c: Fix a file descriptor leak in sendlib.c. -+ -+ * main.c, main.c: patch-1.3.2.tbm.lastfolder, from Martin -+ Michlmayr . -+ -+ * commands.c, hook.c, protos.h, recvattach.c, recvcmd.c, send.c: -+ Apply message-hook to more commands, and make it more useful by -+ permitting the "~h" and "~b" pattern specifiers. Bad enough, this -+ removes message-hook abilities from the receive-attachment menu. -+ -+2000-06-20 22:23:37 roessler (roessler) -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/pl.po, po/pt_BR.po, -+ po/ru.po, po/sk.po, po/it.po, po/ko.po, po/nl.po, po/es.po, -+ po/fr.po, po/gl.po, po/id.po, po/el.po, po/eo.po, po/cs.po, -+ po/da.po, po/de.po, ChangeLog, VERSION, reldate.h: automatic -+ post-release commit for mutt-1.2.2 -+ -+ * build-release: Add a "make" call, so build-release will also -+ work from a source tree which hasn't been built recently. -+ -+ * commands.c: Do some comparisons case-insensitive. -+ -+ * po/ru.po: update. -+ -+ * doc/muttrc.man.head: s/display-hook/message-hook/ -+ -+ * po/de.po: Fix a misleading fuzzy translation about PGP -+ signature validity. From Roland Rosenfeld. -+ -+ * imap/imap.c: Don't use debuglevel unless DEBUG is defined. -+ Noted by china@thewrittenword.com. -+ -+ * imap/imap.c: Only use debuglevel if DEBUG is defined. Noted by -+ Albert Chin , -+ -+ * po/fr.po: update. -+ -+2000-06-19 21:13:19 roessler (roessler) -+ -+ * doc/devel-notes.txt, doc/manual.sgml.head, init.h, makedoc.c: -+ patch-1.3.3.bj.docref.1 -+ -+ * build-release: Make sure m4/Makefile is _really_ rebuilt. -+ -+ * po/zh_TW.Big5.po, po/ru.po, po/sk.po, po/sv.po, po/uk.po, -+ po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/es.po, po/fr.po, -+ po/gl.po, po/id.po, po/it.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, po/cs.po, ChangeLog, VERSION, reldate.h: automatic -+ post-release commit for mutt-1.2.1 -+ -+ * doc/manual.sgml.head: Fix some more mentions of display-hook. -+ -+ * po/ru.po, po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, -+ po/fr.po, po/gl.po, po/id.po, po/it.po, po/ko.po, po/nl.po, -+ po/pl.po, po/pt_BR.po, ChangeLog, VERSION, po/cs.po, po/da.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po, reldate.h: automatic -+ post-release commit for mutt-1.3.4 -+ -+ * compose.c: No need to include iconv.h. -+ -+ * po/da.po: update. -+ -+ * po/ru.po: update -+ -+2000-06-17 08:07:36 roessler (roessler) -+ -+ * imap/imap_ssl.c: Certificate verification fix from Tommi -+ Komulainen. -+ -+ * imap/imap_ssl.c: SSL fix. -+ -+ * po/ru.po: upate -+ -+2000-06-16 10:21:34 roessler (roessler) -+ -+ * OPS, commands.c, compose.c, functions.h, mutt.h, sendlib.c: -+ patch-1.3.3.tlr.change_charset.1 -+ -+ * po/ru.po: nit. -+ -+2000-06-15 21:37:07 roessler (roessler) -+ -+ * doc/manual.sgml.head, doc/muttrc.man.head, commands.c, hook.c, -+ init.h, mutt.h, recvcmd.c, send.c: patch-1.3.3.tlr.message_hook.1 -+ -+ * mutt.h, sendlib.c: patch-1.3.3.tlr.content_info.1 -+ -+ * imap/imap.c: shut up the compiler. -+ -+ * po/ru.po, commands.c, init.h: nits. -+ -+ * commands.c, globals.h, init.h: patch-1.2.bbell.display_filter.2. -+ -+ * complete.c: patch-1.3.2.bbell.complete.1 - autocomplete "!", -+ which is helpful in certain IMAP contexts. -+ -+ * copy.c, mbox.c, mh.c, mx.c: [stable] Prevent data corruption -+ when the temporary space runs full. Backport from unstable. -+ -+ * po/el.po, po/fr.po: updates. -+ -+ * po/ru.po: update. -+ -+ * rfc2047.c, sendlib.c, copy.c, handler.c: Avoid dumping core -+ when Charset isn't set. -+ -+ * init.h: Little documentation fix from Aaron Schrab. -+ -+2000-06-14 09:23:45 roessler (roessler) -+ -+ * OPS, charset.c, charset.h, compose.c, functions.h, handler.c: -+ Remove recode-attachment, and the "decoder" API. (EGE) -+ -+ * gettext.c: Make sure --disable-nls works. (EGE) -+ -+2000-06-13 20:36:33 roessler (roessler) -+ -+ * init.h, mutt.h, sendlib.c: EGE's latest send-charset patch. -+ -+ * m4/curslib.m4: New file, contains Tom Dickey's CF_CURSES_LIBS -+ macro from lynx. -+ -+ * configure.in: Use CF_CURSES_LIBS macro for better detection -+ of platform-specific curses libraries. From Lars Hecking. -+ -+ * main.c: Inform us about ICONV_NOTRANS. From EGE. -+ -+ * configure.in: iconv detection. From EGE. -+ -+ * commands.c: Only display PGP signature verification status if -+ verification was tried. -+ -+2000-06-12 07:02:42 roessler (roessler) -+ -+ * configure.in: A new check for working wchar functions. -+ -+2000-06-11 19:05:12 roessler (roessler) -+ -+ * mh.c, mx.c: Fix some issues with synching of maildir/mh folders. -+ Problems noted by Byrial Jensen. -+ -+2000-06-09 17:42:14 roessler (roessler) -+ -+ * pattern.c: Force decimal parsing on dates, so 09 is parsed as 9, -+ and not as "invalid". -+ -+ * imap/imap_ssl.c, imap/imap_ssl.c: Fix a mix-up. -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/de.po, po/el.po, -+ po/eo.po, po/es.po, po/fr.po, po/gl.po, po/id.po, po/it.po, -+ po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, -+ VERSION, po/cs.po, po/da.po, ChangeLog, po/ru.po, po/sk.po, -+ po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/da.po, po/de.po, -+ po/el.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, po/id.po, -+ po/it.po, po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/cs.po, -+ reldate.h, ChangeLog: automatic post-release commit for mutt-1.3.3 -+ -+ * charset.c, init.c: Fix some typos in the nl_langinfo stuff. -+ -+ * rfc2047.c: Latest patch from EGE. -+ -+2000-06-08 21:44:14 roessler (roessler) -+ -+ * copy.c, mbox.c: This patch should fix the mailbox corruption -+ various people observed. -+ -+ * charset.c, charset.h, init.c: Fix up the value returned by -+ nl_langinfo(CODESET). -+ -+ * mbox.c: Improve error reporting with mbox folders a bit. -+ -+ * send.c: patch-1.2.bj.ed_mtime.1 -+ -+ * Makefile.am, acconfig.h, configure.in, main.c, mbyte.c: -+ Removing the built-in charset support. -+ -+ * doc/muttrc.man.head: one-character typo. -+ -+ * imap/imap_ssl.c: Fix #157. From Enrik Berkhan -+ . -+ -+ * imap/imap_ssl.c: [stable] Fix #157. From Enrik Berkhan -+ . -+ -+ * README.SSL, init.h, mutt.h, imap/imap_ssl.c: [stable] -+ patch-1.3.2.tl.sslcerts.1. -+ -+ * charset.c: Don't return data on the stack. Noted by "Andrew -+ W. Nosenko" . -+ -+ * po/sv.po: update. -+ -+2000-06-04 18:18:56 roessler (roessler) -+ -+ * doc/manual.sgml.head: Nits from Mikko Hänninen. -+ -+2000-06-02 10:05:41 roessler (roessler) -+ -+ * imap/imap.h, imap/imap.h, pgp.c: Fix #152. -+ -+2000-05-30 12:52:41 roessler (roessler) -+ -+ * po/pl.po: update -+ -+2000-05-29 22:34:12 roessler (roessler) -+ -+ * rfc2047.c, rfc2047.h, send.c, sendlib.c: Edmund's latest -+ RFC2047 encoding update. -+ -+2000-05-28 20:32:05 roessler (roessler) -+ -+ * commands.c: Don't bother the user with messages about PGP -+ signature verification when there is no PGP stuff about the -+ message. -+ -+ * README.SSL, init.h, mutt.h: SSL certificate verification fixes -+ from Tommi Komulainen. -+ -+ * imap/imap_ssl.c: SSL certificate verification fix from Tommi -+ Komulainen. -+ -+ * imap/command.c: [stable] Handle connection take-down by servers -+ more graciously. From Patrick Caulfield. -+ -+ * doc/manual.sgml.head, contrib/pgp2.rc, contrib/pgp5.rc, -+ commands.c, init.h, pgp.c, pgp.h: Modified version of Byrial -+ Jensen's signature verification patch. -+ -+2000-05-25 12:21:29 roessler (roessler) -+ -+ * pgp.c: Use strftime for time indications with PGP verification. -+ -+ * curs_lib.c, mbyte.c: Somewhat different sigsegv fix suggested -+ by EGE. -+ -+ * mbyte.c: wctomb(0,wc) is needed to work for bounds checking. -+ -+ * mutt.h: Include stdlib.h from mutt.h. -+ -+ * makedoc.c, init.h: Minor fixes from Byrial. -+ -+ * doc/manual.sgml.head: typo. -+ -+ * doc/devel-notes.txt, init.h, makedoc.c: Documentation -+ beautification patch from Byrial Jensen. Thanks! -+ -+2000-05-24 19:20:07 roessler (roessler) -+ -+ * po/ru.po: Fixes #143. -+ -+ * po/ru.po: Some fixes - #143. -+ -+ * charset.c, charset.h, compose.c, gnupgparse.c: Make charset-hook -+ work with an external iconv implementation. -+ -+ * imap/command.c: Handle disconnects more gracefully. -+ From Patrick Caulfield . -+ -+ * config.guess, config.sub: [stable] Latest versions from -+ ftp.gnu.org/pub/gnu/config -+ -+ * config.guess, config.sub: Latest versions from -+ ftp.gnu.org/pub/gnu/config. -+ -+2000-05-23 17:16:46 roessler (roessler) -+ -+ * po/id.po, po/it.po, po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, -+ po/ru.po, po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, -+ ChangeLog, VERSION, po/cs.po, po/da.po, po/de.po, po/el.po, -+ po/eo.po, po/es.po, po/fr.po, po/gl.po, reldate.h: automatic -+ post-release commit for mutt-1.3.2 -+ -+ * contrib/gpg.rc: Make this work on QNX. -+ -+ * contrib/gpg.rc: Change suggested by Sam Roberts -+ to make this work on QNX. -+ -+2000-05-22 16:15:35 roessler (roessler) -+ -+ * po/pl.po: update -+ -+ * rfc2047.c: Fix a stupid segmentation fault. -+ -+ * lib.c: cosmetics. -+ -+ * rfc2047.c: Fix a memory leak. -+ -+ * charset.c, lib.c, lib.h, protos.h: Add mutt_str_adjust (). -+ -+ * parse.c: Fix a possible cause for heap corruption. -+ -+ * po/de.po: update. -+ -+ * charset.c, gettext.c: Make mutt_gettext () a bit more compact. -+ -+2000-05-21 18:45:15 roessler (roessler) -+ -+ * mbyte.h: Small fix from EGE. -+ -+ * sendlib.c: Some fixes so ISO-2022-JP* works with mutt. -+ Mostly from TAKIZAWA Takashi . -+ -+ * muttlib.c: Comment a bit of code. -+ -+2000-05-20 18:16:18 roessler (roessler) -+ -+ * po/fr.po: update. -+ -+ * charset.c, charset.h, curs_lib.c, rfc2047.c, rfc2231.c: String -+ conversion patch from EGE. -+ -+ * doc/manual.sgml.head, hook.c: Second version of Byrial's -+ display-hook patch. -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/fr.po, po/gl.po, po/id.po, -+ po/it.po, po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, -+ po/sk.po, po/sv.po, ChangeLog, VERSION, po/cs.po, po/da.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po, reldate.h: automatic -+ post-release commit for mutt-1.3.1 -+ -+ * doc/muttrc.man.head: Document display-hook in the manual page. -+ -+ * commands.c, hook.c, init.h, mutt.h, protos.h, send.c: Add a -+ display-hook command. From Byrial Jensen. -+ -+ * alias.c, browser.c, init.c, lib.c, mutt.h, muttlib.c, protos.h: -+ Add mutt_gecos_name function which centrally handles the GECOS -+ processing. -+ -+ * imap/imap.c: Shut up some warnings. We may have to think -+ about mutt_stristr again. -+ -+ * configure.in: Verify that regmatch_t has offsets, and not -+ only pointers. From Sam Roberts . -+ -+ * configure.in: Don't look for curses in /usr/5lib any more - -+ this broke things for some people. -+ -+ * configure.in: Don't look for the curses library in /usr/5lib -+ any more. This broke things for some people. -+ -+ * sendlib.c: Real fix for the pointer problem noted by Heiko -+ Schlichting. -+ -+ * sendlib.c: Fix a "string on stack returned" bug found by -+ Heiko Schlichting. -+ -+2000-05-19 07:36:42 roessler (roessler) -+ -+ * hdrline.c: Fix %. formats. From EGE. -+ -+2000-05-18 17:06:59 roessler (roessler) -+ -+ * copy.c, parse.c, rfc2047.c, rfc2047.h, rfc2231.c, send.c, -+ sendlib.c: rfc2047_decode change from EGE. -+ -+ * charset.c: Catch a segmentation fault in mutt_convert_string (). -+ -+ * acconfig.h: Don't enable debugging by default in the stable -+ branch. -+ -+ * configure.in, main.c: More debugging output, and a warning -+ in configure.in. -+ -+ * main.c: Tell us something about internal iconv and CHARMAPS_DIR -+ from mutt -v. -+ -+2000-05-17 12:39:16 roessler (roessler) -+ -+ * mkjtags.c: handle ^L lines correctly. -+ -+ * mkjtags.c: Some beautifications. -+ -+ * Makefile.am, mkjtags.c: Add a little tool to help with building -+ tags files my editor groks. -+ -+ * handler.c: When displaying a deleted attachment's information, -+ present the file name if it is present. Suggested by Pete -+ Wenzel . -+ -+ * imap/imap_ssl.c: SSL certificate check fix. From Tommi -+ Komulainen. -+ -+ * imap/imap_ssl.c: Certificate check fix, from Tommi Komulainen. -+ -+ * OPS, enter.c, functions.h: Add forward-word and backward-word -+ functions to the editor. -+ -+ * OPS, enter.c, functions.h: Add a kill-eow function to the -+ line editor. -+ -+ * init.c: Small fix to mutt_set_default(). -+ -+2000-05-16 19:01:50 roessler (roessler) -+ -+ * Makefile.am: We don't need to build in the charmaps/ directory -+ unless we use the included iconv. -+ -+ * compose.c, mutt.h, protos.h, sendlib.c: Some fixes to the size -+ calculation code. -+ -+ * compose.c, globals.h, init.h, sendlib.c: A modified version -+ of Will Fiveash's compose format patch. -+ -+ * acconfig.h, configure.in, init.c, init.h: Use nl_langinfo's -+ return value as the default for $charset. -+ -+ * init.c: More default setting. This can easily be done much -+ cleaner than the last version of the patch. -+ -+ * init.c: Hack: mutt_restore_default() now stores the latest -+ value of a variable as it's default if there was no default -+ before. The code in question is executed precisely once: when -+ mutt_restore_default() is invoked from mutt_init(). -+ -+ * hook.c, lib.c, lib.h, muttlib.c, protos.h: Let _mutt_expand_path -+ escape regular expression special characters. For stable. -+ -+ * hook.c, lib.c, lib.h, muttlib.c, protos.h: mutt_expand_path -+ is now able to escape special characters for use in regular -+ expressions. This is needed to make folder-hooks work like -+ intended. -+ -+ * muttlib.c: Sanitize file names passed to mutt_adv_mktemp. -+ -+ * muttlib.c: Sanitize file name suggestions passed to -+ mutt_adv_mktemp. -+ -+ * doc/manual.sgml.tail, OPS, enter.c, functions.h: Add a -+ transpose-character function to the editor. From Aaron Schrab. -+ -+ * configure.in: Improve the wchar_t checks. From "Andrew -+ W. Nosenko" . -+ -+2000-05-15 12:00:53 roessler (roessler) -+ -+ * configure.in, mbyte.c, pager.c: More iconv-related patches -+ from EGE. -+ -+2000-05-13 17:39:03 roessler (roessler) -+ -+ * configure.in: HP/UX vs. ANSI C. From Lars Hecking and Albert -+ Chin. [stable] -+ -+ * configure.in: Configuration for ANSI C / HP/UX. From albert -+ chin and Lars Hecking. -+ -+2000-05-12 13:41:34 roessler (roessler) -+ -+ * mbyte.c, wcwidth.c: Make things compile. ;-) -+ -+ * mbyte.c, mbyte.h, wcwidth.c: Isprint-related changes. -+ Suggested by Andrew Nosenko, adapted by EGE. -+ -+ * gettext.c: Replacing some more free() calls by safe_free(). -+ -+ * acconfig.h, configure.in, curs_lib.c, gettext.c, help.c, -+ mbyte.c, mbyte.h, mutt.h, pager.c, wcwidth.c: wide-character -+ related patches. From Edmund Grimley Evans. -+ -+ * configure.in: HP/UX -Ae detection. From Albert Chin. [stable] -+ -+ * configure.in: Improve the HP/UX check for the -Ae command -+ line parameter. From albert chin (china@thewrittenword.com). -+ -+ * gen_defs: Make sure gen_defs returns success. [stable] -+ -+ * gen_defs: Sam Roberts reports that some shells do strange -+ things with exit states. -+ -+ * doc/manual.sgml.head: Fix $spool vs. $spoolfile. From David -+ Ellement. -+ -+2000-05-11 07:10:32 roessler (roessler) -+ -+ * doc/mutt.man: Remove some unnecessary spaces. -+ -+ * doc/mutt.man, main.c: Fix usage information. Noted by Mikko -+ Hänninen. -+ -+ * acconfig.h, configure.in, globals.h: Check volatility of -+ sig_atomic_t. -+ -+2000-05-10 18:02:31 roessler (roessler) -+ -+ * configure.in: Support for old Kerberos versions. From David -+ Champion . -+ -+ * configure.in: Fix support for old Kerberos libraries. -+ -+ * hdrline.c, thread.c: updated messages-in-thread (%e) patch -+ from Markus Holmberg. -+ -+ * po/pl.po: update. -+ -+ * init.h, mutt.h, pop.c: Fix a segmentation fault introduced by -+ the change of pop_delete to a quad option. -+ -+ * po/fr.po: Update the French translation. -+ -+2000-05-09 20:19:28 roessler (roessler) -+ -+ * parse.c: more mailtool brain-damage support. -+ -+ * acconfig.h, configure.in, parse.c: Sun mailtool message support. -+ The format is ugly, but the patch is reasonably clean. -+ -+ * Makefile.am: include mbyte.h with the distribution. -+ -+ * doc/devel-notes.txt: Add a word about format flags. -+ -+ * imap/message.c: Make the X-Label patch work over IMAP. -+ -+ * po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, po/sv.po, -+ po/uk.po, po/zh_TW.Big5.po, po/cs.po, po/da.po, po/de.po, -+ po/el.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, po/id.po, -+ po/it.po, po/ko.po, reldate.h, ChangeLog, VERSION: automatic -+ post-release commit for mutt-1.3 -+ -+ * hdrline.c, init.h, protos.h, thread.c: Add a %e option -+ for thread-relative message numbers. From Markus Holmberg -+ . -+ -+ * doc/manual.sgml.head, hdrline.c, init.h, mutt.h, parse.c, -+ pattern.c: X-Label header support from David Champion -+ . -+ -+ * init.h, pop.c: Make pop_delete a quad-option. From Honza -+ Pazdziora . -+ -+ * VERSION: Ups, we should leave the version file on 1.2, so the -+ diff will get built properly when I release 1.3. -+ -+ * lib.h, mbyte.c, mbyte.h, menu.c, muttlib.c, pager.c, -+ pgppubring.c, protos.h, rfc2047.c, rfc2231.c, sendlib.c, -+ utf8.c, wcwidth.c, Makefile.am, VERSION, charset.c, charset.h, -+ commands.c, compose.c, configure.in, curs_lib.c, curs_main.c, -+ enter.c, gettext.c, gnupgparse.c, hdrline.c, help.c, init.c: -+ Edmund Grimley Evans' UTF-8 patch. -+ -+ * po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, -+ po/sv.po, po/uk.po, po/zh_TW.Big5.po, VERSION, po/cs.po, -+ po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, po/fr.po, -+ po/gl.po, po/id.po, po/it.po, reldate.h, ChangeLog: automatic -+ post-release commit for mutt-1.2 -+ -+ * build-release: unstable branch. -+ -+ * build-release: start preparing 1.2. -+ -+2000-05-03 07:48:46 roessler (roessler) -+ -+ * po/zh_TW.Big5.po: branches: 1.30.2; automatic post-release -+ commit for mutt-1.1.14 -+ -+ * po/da.po: branches: 1.13.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/de.po: branches: 1.99.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/el.po: branches: 1.31.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/eo.po: branches: 1.30.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/es.po: branches: 1.49.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/fr.po: branches: 1.45.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/gl.po: branches: 1.23.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/id.po: branches: 1.31.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/it.po: branches: 1.59.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/ko.po: branches: 1.31.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/nl.po: branches: 1.36.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/pl.po: branches: 1.39.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/pt_BR.po: branches: 1.20.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/ru.po: branches: 1.67.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/sk.po: branches: 1.28.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/sv.po: branches: 1.27.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/uk.po: branches: 1.42.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * ChangeLog: branches: 2.40.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * VERSION: branches: 2.28.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/cs.po: branches: 1.35.2; automatic post-release commit -+ for mutt-1.1.14 -+ -+ * po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/da.po, -+ po/de.po, po/el.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, -+ po/id.po, po/it.po, po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, -+ po/ru.po, ChangeLog, VERSION, po/cs.po: automatic post-release -+ commit for mutt-1.1.13 -+ -+ * reldate.h: branches: 2.25.2; automatic post-release commit -+ for mutt-1.1.13 -+ -+2000-04-30 06:58:21 roessler (roessler) -+ -+ * imap/message.c: branches: 1.24.2; Catch the case that an IMAP -+ server sends "\n\n" after a mail header. Diagnosed by Brendan. -+ -+2000-04-29 13:38:05 roessler (roessler) -+ -+ * query.c: branches: 2.5.2; Fix a possible segmentation fault -+ with the external query feature. -+ -+ * imap/imap.c: branches: 1.26.2; Fix the "empty screen after -+ sync" bug observed with certain versions of the Courier IMAP -+ server. From Brendan Cully. -+ -+2000-04-26 17:43:00 roessler (roessler) -+ -+ * imap/util.c: branches: 1.23.2; Fix the imap_force_ssl option. -+ -+ * po/da.po: update. -+ -+ * contrib/pgp6.rc: Fix a little typo. Noted by Steve Brewer -+ . -+ -+ * imap/imap_ssl.c: branches: 1.12.2; Add a new option named -+ imap_force_ssl. -+ -+ * imap/imap_ssl.h, imap/util.c: Add a new option named -+ imap_force_ssl. -+ -+ * init.h: branches: 2.80.2; Add a new option named -+ imap_force_ssl. -+ -+ * mutt.h: branches: 2.62.2; Add a new option named -+ imap_force_ssl. -+ -+2000-04-25 18:39:01 roessler (roessler) -+ -+ * acconfig.h: branches: 2.15.2; Revised version of Lars' patch. -+ -+ * configure.in: branches: 2.61.2; Revised version of Lars' patch. -+ -+ * m4/funcdecl.m4: New macros CF_CHECK_FUNCDECL, -+ CF_CHECK_FUNCDECLS, CF_UPPER. These are slightly modified versions -+ of T. E. Dickey's macros from the lynx distribution. (From -+ Lars Hecking.) -+ -+ * configure.in: Use new CF_CHECK_FUNCDECLS macro for curses -+ functions. This should catch function declarations and macros -+ alike. Due to a misfeature in autoheader, we have to explicitly -+ AC_DEFINE the curses functions. (From Lars Hecking.) -+ -+ * acconfig.h: acconfig.h: Remove duplicate VERSION and unused -+ HAVE_GETOPT_DECL. Remove DEBUGGER (it's AC_SUBST'ed, not -+ AC_DEFINE'd). Add defines for curses functions. (From Lars -+ Hecking.) -+ -+ * po/it.po: update. -+ -+2000-04-24 13:10:11 roessler (roessler) -+ -+ * imap/util.c: Fix a segmentation fault with folder completion. -+ From Brendan. -+ -+ * imap/message.c: Fall back to INTERNALDATE when Date header -+ isn't present. From Brendan. -+ -+2000-04-22 18:34:29 roessler (roessler) -+ -+ * po/ko.po, po/nl.po, po/pl.po, po/pt_BR.po, po/ru.po, po/sk.po, -+ po/sv.po, po/uk.po, po/zh_TW.Big5.po, ChangeLog, VERSION, -+ po/cs.po, po/da.po, po/de.po, po/el.po, po/eo.po, po/es.po, -+ po/fr.po, po/gl.po, po/id.po, po/it.po, reldate.h: automatic -+ post-release commit for mutt-1.1.12 -+ -+ * doc/manual.sgml.head: branches: 1.31.2; Add a link to -+ http://www.mutt.org/download.html. -+ -+ * init.c, init.h, thread.c: Handle sort_aux="threads" -+ somewhat different, and probably more safely. Problem and -+ principle of fix noted by Gero Treuner and Michael Tatge -+ . -+ -+ * lib.c: branches: 2.23.2; Coda compatibility. From Jan Harkes -+ . -+ -+ * parse.c: Fix message parsing. This fixes the "Reply-To in -+ body" bug. From Edmund GRIMLEY EVANS. -+ -+ * doc/manual.sgml.tail: Fix the sgmltools URL. From Martin -+ Michlmayr. -+ -+ * charset.c: branches: 2.19.2; Comment cosmetics. From Martin -+ Michlmayer. -+ -+ * editmsg.c, extlib.c, gnupgparse.c, lib.c: Comment cosmetics. -+ From Martin Michlmayer. -+ -+ * lib.h: branches: 2.7.2; Comment cosmetics. From Martin -+ Michlmayer. -+ -+ * pgpinvoke.c: Comment cosmetics. From Martin Michlmayer. -+ -+ * pgpkey.c: branches: 2.24.2; Comment cosmetics. From Martin -+ Michlmayer. -+ -+ * pgplib.c, pgppubring.c, recvcmd.c: Comment cosmetics. -+ From Martin Michlmayer. -+ -+ * remailer.c: branches: 2.11.2; Comment cosmetics. From Martin -+ Michlmayer. -+ -+ * rfc2231.c, rfc2231.h: Comment cosmetics. From Martin -+ Michlmayer. -+ -+ * doc/manual.sgml.head: Document the elmish "!!" shortcut for -+ the last folder. From Martin Michlmayr . -+ -+ * curs_main.c: branches: 2.44.2; Fix various inconsistencies -+ with respect to thread deletion. -+ -+ * pager.c: Fix various inconsistencies with respect to thread -+ deletion. -+ -+2000-04-12 16:32:26 roessler (roessler) -+ -+ * browser.c: branches: 2.21.2; Initialize some more memory. -+ Noted by Vsevolod Volkov . -+ -+ * headers.c: Catch some error conditions. -+ -+ * main.c: branches: 2.29.2; Tell us whether debugging is enabled -+ or not. -+ -+2000-04-09 13:32:36 roessler (roessler) -+ -+ * po/sv.po: Update. -+ -+ * imap/imap_ssl.c: Another file mode change. -+ -+ * po/fr.po, po/es.po, po/el.po: update. -+ -+ * imap/imap_ssl.c: Save more than one SSL certificate to the -+ certificate file. -+ -+ * po/da.po, po/cs.po: update. -+ -+ * imap/socket.c: branches: 1.9.2; Make host name comparison -+ case-insensitive. -+ -+ * doc/manual.sgml.head: Minor typo in the documentation. -+ Noted by Vsevolod Volkov . -+ -+ * muttlib.c: branches: 2.16.2; The "!!" shortcut had another -+ flaw. Noted by Martin Michlmayr . -+ -+ * imap/BUGS: branches: 1.12.2; Documentation patch from Brendan -+ Cully. -+ -+ * pattern.c: Fix ^ and ! pattern modifiers. -+ -+2000-03-31 12:37:21 roessler (roessler) -+ -+ * po/pl.po, po/id.po: update. -+ -+2000-03-30 15:33:14 roessler (roessler) -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/pt_BR.po, -+ po/ru.po, po/nl.po, po/pl.po, po/ko.po, po/it.po, po/fr.po, -+ po/gl.po, po/id.po, po/eo.po, po/es.po, po/el.po, po/da.po, -+ po/de.po, po/cs.po, VERSION, reldate.h, ChangeLog: automatic -+ post-release commit for mutt-1.1.11 -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/sv.po, po/sk.po, po/pt_BR.po, -+ po/ru.po, po/nl.po, po/pl.po, po/ko.po, po/id.po, po/it.po, -+ po/gl.po, po/fr.po, po/es.po, po/eo.po, po/el.po, po/de.po, -+ po/da.po, po/Makefile.in.in, po/POTFILES.in, po/cs.po: make -+ update-po, and undo most parts of Lars' and Tommi's patch - -+ it broke things here. -+ -+ * imap/imap_ssl.c: Typo, noticed by Vsevolod Volkov -+ . -+ -+ * po/de.po: update. -+ -+ * po/eo.po: fix. -+ -+ * contrib/Makefile.in: Distribute pgp6.rc. Ups. -+ -+ * po/uk.po: Updated Ukrainian translation. -+ -+ * curs_main.c: Cursor cosmetics. From Byrial. -+ -+ * contrib/Makefile.in: Installation process patch from Bill -+ Nottingham . -+ -+ * build-release: Explicitly use scp1. -+ -+2000-03-29 20:16:36 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/sv.po, po/uk.po, po/sk.po, po/pt_BR.po, -+ po/ru.po, po/pl.po, po/ko.po, po/nl.po, po/id.po, po/it.po, -+ po/gl.po, po/fr.po, po/eo.po, po/es.po, po/el.po, po/de.po, -+ po/da.po, po/cs.po, VERSION, reldate.h, ChangeLog: automatic -+ post-release commit for mutt-1.1.10 -+ -+ * imap/message.c: Fix access to read-only folders via IMAP. -+ -+ * po/de.po, doc/Makefile.in, doc/manual.sgml.head, init.c, -+ thread.c: Various little patches from Gero Treuner. -+ -+ * imap/Makefile.am: Build diff from Brendan Cully. -+ -+ * Makefile.am: branches: 2.61.2; Build diff from Brendan Cully. -+ -+2000-03-28 10:09:19 roessler (roessler) -+ -+ * po/Makefile.in.in, po/POTFILES.in, Makefile.am: A patch from -+ Tommi Komulainen (and Lars Hecking) for building outside the -+ source directory. -+ -+2000-03-27 23:56:35 roessler (roessler) -+ -+ * imap/auth_gss.c: branches: 1.3.2; NetBSD portability patches -+ from Brendan Cully. -+ -+ * imap/imap_ssl.c, acconfig.h, configure.in: NetBSD portability -+ patches from Brendan Cully. -+ -+2000-03-25 18:22:09 roessler (roessler) -+ -+ * keymap.c: Timeout occasionally in menus, with the notable -+ exception of the editor. This is needed to avoid some more -+ IMAP timeouts. [patch-1.1.9.tlr.timeout.1] -+ -+2000-03-23 12:21:10 roessler (roessler) -+ -+ * remailer.c: Little fix for the remailer menu. -+ -+ * configure.in: Fix Kerberos configuration. From David Champion -+ . -+ -+2000-03-22 08:24:45 roessler (roessler) -+ -+ * mutt.h, sort.c, init.h: Sorting fix from Gero Treuner. -+ -+2000-03-21 22:01:42 roessler (roessler) -+ -+ * configure.in: Fix charmap configuration. This was broken in -+ configure.in,v 2.54. -+ -+2000-03-20 10:32:18 roessler (roessler) -+ -+ * muttlib.c: Fix the "!!" shortcut for the last folder. Noted by -+ Byrial Jensen. -+ -+ * po/da.po, po/eo.po: update -+ -+ * configure.in, Muttrc.head, Muttrc.head.in: Put Muttrc.head under -+ autoconf control - we need to substitute @docdir@ for the -+ macro to work. -+ -+2000-03-19 09:19:30 roessler (roessler) -+ -+ * po/nl.po: Fix some sloppiness errors. From Brendan Cully. -+ -+2000-03-17 08:26:22 roessler (roessler) -+ -+ * po/nl.po: update -+ -+ * rfc2047.c: Don't override iso-2022-jp with us-ascii. -+ -+ * sendlib.c: branches: 2.46.2; Don't override iso-2022-jp -+ with us-ascii. -+ -+2000-03-16 10:01:43 roessler (roessler) -+ -+ * commands.c, init.h, mutt.h: Add the $print_decode option. -+ -+ * po/ru.po, po/sv.po: updates -+ -+ * po/it.po: update. -+ -+ * editmsg.c: Use Editor with a fall-back to visual when editing -+ messages. -+ -+ * muttlib.c: Localization nit from Byrial Jensen. -+ -+ * doc/manual.sgml.head, init.h: Documentation fixes from Mikko -+ Hänninen. -+ -+2000-03-15 23:25:47 roessler (roessler) -+ -+ * imap/imap_ssl.c, imap/imap_ssl.h, imap/socket.c: Fix entropy -+ gathering in the IMAP SSL support. From Tommi Komulainen. -+ -+ * README.SSL: branches: 2.4.2; Fix entropy gathering in the -+ IMAP SSL support. From Tommi Komulainen. -+ -+ * configure.in, init.h: Fix entropy gathering in the IMAP SSL -+ support. From Tommi Komulainen. -+ -+ * Makefile.am: Add a dependency for keymap_defs.h. Hope it -+ works now. -+ -+ * po/da.po: update -+ -+2000-03-14 21:05:00 roessler (roessler) -+ -+ * po/pl.po, po/cs.po: updates. -+ -+ * configure.in: Fix a charmap configuration flaw. From Gero -+ Treuner. -+ -+ * doc/Makefile.in: Install all the documentation. Problem noted -+ and fix supplied by Gero Treuner. -+ -+ * po/es.po: Update from Boris Wesslowski. -+ -+ * base64.c: Add the original fetchmail copyright notice. -+ -+ * contrib/Makefile.in, contrib/pgp6.rc: More nits: Include a -+ sample configuration file for using mutt with pgp6, and install -+ and actually distribute Tin.rc. -+ -+2000-03-13 22:36:56 roessler (roessler) -+ -+ * makedoc.c, send.c, charset.h, init.h: Various nits, noted by -+ Gero Treuner. -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/pt_BR.po, -+ po/ru.po, po/pl.po, po/id.po, po/it.po, po/ko.po, po/nl.po, -+ po/gl.po, po/es.po, po/fr.po, po/eo.po, po/el.po, po/da.po, -+ po/de.po, po/cs.po, reldate.h, VERSION, ChangeLog: automatic -+ post-release commit for mutt-1.1.9 -+ -+ * build-release: change code for going on-line. -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/pl.po, -+ po/pt_BR.po, po/ru.po, po/ko.po, po/nl.po, po/gl.po, po/id.po, -+ po/it.po, po/eo.po, po/es.po, po/fr.po, po/el.po, po/de.po, -+ po/cs.po, po/da.po: make update-po. -+ -+ * po/sv.po, po/fr.po: updates. -+ -+2000-03-10 11:38:32 roessler (roessler) -+ -+ * handler.c: Fix the handling of raw carriage return characters -+ in the base64 handler. -+ -+2000-03-09 11:58:11 roessler (roessler) -+ -+ * pgpinvoke.c: Bail on empty PGP formats. -+ -+ * po/ko.po: update. -+ -+2000-03-08 18:08:03 roessler (roessler) -+ -+ * imap/message.c: Another fix from Brendan Cully. -+ -+ * po/pl.po: update. -+ -+ * sendlib.c, parse.c: Fix more RFC2047 encoding bugs. Once again -+ from Gero Treuner . -+ -+2000-03-07 19:53:19 roessler (roessler) -+ -+ * po/da.po, configure.in: Adding a Danish translation. -+ Thanks to Morten Bo Johansen and -+ the members of the sslug-locale mailing list, see -+ http://www.sslug.dk/emailarkiv/locale/. -+ -+ * color.c: branches: 2.8.2; The uncolor/unmono commands weren't -+ parsed correctly when not applicable. This fixes bug#65. -+ -+ * makedoc.c: Make gcc happy. -+ -+ * TODO: Remove an old item from this list. From Brendan Cully. -+ -+ * sendlib.c, TODO: Correct header encodings when postponing -+ messages. -+ -+ * protos.h: branches: 2.40.2; Correct header encodings when -+ postponing messages. -+ -+ * send.c: Correct header encodings when postponing messages. -+ -+ * po/de.po: update -+ -+ * po/pt_BR.po, po/el.po: updates. -+ -+ * curs_main.c: Fix NULL pointer deferences. -+ -+2000-03-04 12:57:53 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/sv.po, po/pt_BR.po, -+ po/ru.po, po/pl.po, po/nl.po, po/ko.po, po/it.po, po/id.po, -+ po/gl.po, po/fr.po, po/eo.po, po/es.po, po/el.po, po/de.po, -+ po/cs.po, reldate.h, build-release, VERSION, ChangeLog: automatic -+ post-release commit for mutt-1.1.8 -+ -+ * protos.h, send.c, alias.c, headers.c: Unify alias expansion. -+ -+2000-03-03 16:52:41 roessler (roessler) -+ -+ * contrib/gpg.rc: branches: 1.5.2; Don't use gpg-2comp by -+ default, but leave the command lines using this one there as -+ comments. -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/ru.po, po/sk.po, -+ po/pl.po, po/pt_BR.po, po/nl.po, po/it.po, po/ko.po, po/es.po, -+ po/fr.po, po/gl.po, po/id.po, po/el.po, po/eo.po, po/cs.po, -+ po/de.po, imap/imap_ssl.c, imap/imap_ssl.h, imap/message.c, -+ imap/message.h, imap/socket.c, imap/util.c, imap/auth.c, -+ imap/auth_gss.c, imap/browse.c: The FSF apparently has moved. -+ -+ * imap/command.c: branches: 1.8.2; The FSF apparently has moved. -+ -+ * imap/imap.c: The FSF apparently has moved. -+ -+ * imap/imap.h: branches: 1.16.2; The FSF apparently has moved. -+ -+ * imap/imap_private.h: branches: 1.17.2; The FSF apparently -+ has moved. -+ -+ * imap/imap_socket.h, doc/dotlock.man, doc/manual.sgml.head, -+ doc/mutt.man, doc/muttrc.man.head, rfc822.h, score.c, send.c, -+ sendlib.c, signal.c, sort.c, sort.h, status.c, system.c, thread.c, -+ recvcmd.c, remailer.c, remailer.h, resize.c, rfc1524.c, rfc1524.h, -+ rfc2047.c, rfc2047.h, rfc2231.c, rfc2231.h: The FSF apparently -+ has moved. -+ -+ * rfc822.c: branches: 2.9.2; The FSF apparently has moved. -+ -+ * pgpinvoke.c, pgpkey.c, pgplib.c, pgplib.h, pgppubring.c: -+ The FSF apparently has moved. -+ -+ * pop.c: branches: 2.7.2; The FSF apparently has moved. -+ -+ * postpone.c, protos.h, query.c, recvattach.c, mx.h, pager.c, -+ pager.h, parse.c, pattern.c, pgp.c, pgp.h, menu.c: The FSF -+ apparently has moved. -+ -+ * mh.c: branches: 2.22.2; The FSF apparently has moved. -+ -+ * mime.h, mutt.h, mutt_curses.h, mutt_menu.h, mutt_regex.h, -+ muttbug.sh.in, muttlib.c: The FSF apparently has moved. -+ -+ * mx.c: branches: 2.41.2; The FSF apparently has moved. -+ -+ * history.c: branches: 2.5.6; The FSF apparently has moved. -+ -+ * history.h: The FSF apparently has moved. -+ -+ * hook.c: branches: 2.9.2; The FSF apparently has moved. -+ -+ * init.c, init.h, keymap.c, keymap.h, lib.c, lib.h, mailbox.h, -+ main.c, makedoc.c, mapping.h: The FSF apparently has moved. -+ -+ * mbox.c: branches: 2.15.2; The FSF apparently has moved. -+ -+ * dotlock.h, edit.c, editmsg.c, enter.c, extlib.c, filter.c, -+ flags.c, from.c, functions.h: The FSF apparently has moved. -+ -+ * globals.h: branches: 2.23.2; The FSF apparently has moved. -+ -+ * gnupgparse.c, handler.c, hash.c, hash.h, hdrline.c, headers.c, -+ help.c, charset.c, charset.h, color.c, commands.c, complete.c, -+ compose.c: The FSF apparently has moved. -+ -+ * copy.c: branches: 2.13.2; The FSF apparently has moved. -+ -+ * copy.h: The FSF apparently has moved. -+ -+ * curs_lib.c: branches: 2.18.2; The FSF apparently has moved. -+ -+ * curs_main.c, date.c, dotlock.c, COPYRIGHT, addrbook.c, alias.c, -+ attach.c, attach.h, base64.c, browser.c, browser.h, buffy.c, -+ buffy.h: The FSF apparently has moved. -+ -+ * po/sv.po: Swedish translation. -+ -+ * imap/imap.h, imap/imap.c, commands.c, compose.c, curs_main.c, -+ editmsg.c, mailbox.h, mbox.c, mh.c, mx.c, mx.h, pop.c, postpone.c, -+ send.c, sendlib.c, attach.c: Fix index updates when closing or -+ synching mail folders fails. There were some bug-fixes hidden -+ in that code. -+ -+ * imap/message.c: More missing fclose (3) calls. -+ -+2000-03-02 21:01:27 roessler (roessler) -+ -+ * imap/imap_ssl.c, imap/message.c: Fix a bunch of file descriptor -+ leaks. -+ -+ * po/de.po: A one-character patch from Gero Treuner. -+ -+ * INSTALL, README.SSL: Add some SSL documentation. From Tommi -+ Komulainen. -+ -+ * mh.c, mx.c: Fix incompatible return value checking. This should -+ fix #29. -+ -+ * mutt.h, send.c, init.h: Add $reverse_realname option. -+ Essentially suggested by ws@rhein.de. -+ -+2000-03-01 21:27:36 roessler (roessler) -+ -+ * Muttrc.head: Fix #26: A little typo. -+ -+ * contrib/Makefile.in, contrib/sample.muttrc-tlr: Add a commented -+ version of my .muttrc as an example. -+ -+ * contrib/sample.muttrc: Fix some mail addresses. -+ -+ * README.UPGRADE: Add some more documentation for users who -+ are upgrading. This is more precise than the NEWS file, but -+ confined to the more notable changes. -+ -+ * configure.in: Another fix from Tommi Komulainen. -+ -+ * po/eo.po, po/id.po, po/de.po: update. -+ -+ * imap/util.c: Don't crash with NULL Context pointers. -+ -+ * po/fr.po: Update. -+ -+ * doc/dotlock.man, doc/mutt.man: dotlock is called mutt_dotlock -+ for quite some time now. -+ -+ * po/sk.po, po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/pt_BR.po, -+ po/ru.po, po/nl.po, po/pl.po, po/fr.po, po/gl.po, po/id.po, -+ po/it.po, po/ko.po, po/el.po, po/eo.po, po/es.po, po/de.po, -+ po/cs.po, VERSION, reldate.h, ChangeLog: automatic post-release -+ commit for mutt-1.1.7 -+ -+ * imap/command.c, init.h, mutt.h, README.SECURITY, configure.in: -+ Add $imap_servernoise option to suppress IMAP server messages. -+ From Brendan Cully. -+ -+ * imap/Makefile.am: Include auth_gss.c with the distribution. -+ -+2000-02-29 22:40:46 roessler (roessler) -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/pt_BR.po, -+ po/ru.po, po/ko.po, po/nl.po, po/pl.po, po/it.po, po/fr.po, -+ po/gl.po, po/id.po, po/eo.po, po/es.po, po/el.po, po/de.po, -+ po/cs.po, reldate.h, VERSION, ChangeLog: automatic post-release -+ commit for mutt-1.1.6 -+ -+ * po/zh_TW.Big5.po, po/sv.po, po/uk.po, po/sk.po, po/ru.po, -+ po/pt_BR.po, po/nl.po, po/pl.po, po/ko.po, po/gl.po, po/id.po, -+ po/it.po, po/es.po, po/fr.po, po/el.po, po/eo.po, po/cs.po, -+ po/de.po: Some updates; make update-po. -+ -+ * charset.c: Add error checking to the recode-attachment code. -+ From "Andrew W. Nosenko" . -+ -+ * configure.in: Replace --enable-ssl by --with-ssl. From Tommi -+ Komulainen. -+ -+ * imap/imap.c, mx.c, curs_main.c: More IMAP folder update hacks. -+ Brendan says it works. -+ -+2000-02-28 18:06:35 roessler (roessler) -+ -+ * doc/manual.sgml.head: Martin Michlmayr told me about a typo. -+ -+ * imap/imap.h, imap/util.c, menu.c, pager.c: New IMAP keep-alive -+ code. This should work from all menus, and it should always -+ poll the current folder. -+ -+ * menu.c, pager.c: Do IMAP keep-alive polls from all menus. -+ -+ * curs_main.c, pager.c: Don't do Context updates from the -+ background, part 2. -+ -+ * imap/imap.h, imap/imap_private.h, imap/util.c, imap/command.c, -+ imap/imap.c: Don't do Context updates from the background. -+ -+2000-02-27 08:49:34 roessler (roessler) -+ -+ * po/POTFILES.in: imap/auth_gss.c was missing. Noted by "Andrew -+ W. Nosenko" . -+ -+2000-02-26 18:14:24 roessler (roessler) -+ -+ * Makefile.am: muttbug is a script, not a program. Tell automake -+ about this. -+ -+ * mx.c: Don't use an uninitialized string for error reporting. -+ -+ * imap/browse.c: Fix a segmentation fault. Patch from Brendan -+ Cully. -+ -+2000-02-25 08:57:05 roessler (roessler) -+ -+ * .cvsignore: ignore muttbug{,.sh} -+ -+ * Makefile.am: Tell users about README.UPGRADE. -+ -+2000-02-24 21:34:10 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/uk.po, po/ru.po, -+ po/pt_BR.po, po/pl.po, po/ko.po, po/nl.po, po/fr.po, po/gl.po, -+ po/id.po, po/it.po, po/es.po, po/cs.po, po/de.po, po/el.po, -+ po/eo.po, reldate.h, ChangeLog, VERSION: automatic post-release -+ commit for mutt-1.1.5 -+ -+ * main.c: Fix #52, from Mikko.Hanninen@iki.fi. -+ -+2000-02-23 13:26:03 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/uk.po, po/pl.po, -+ po/pt_BR.po, po/ru.po, po/nl.po, po/id.po, po/it.po, po/ko.po, -+ po/el.po, po/eo.po, po/es.po, po/fr.po, po/gl.po, po/cs.po, -+ po/de.po: New German translation; make update-po. -+ -+ * po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/uk.po, po/pt_BR.po, -+ po/ru.po, po/ko.po, po/nl.po, po/pl.po, po/fr.po, po/gl.po, -+ po/id.po, po/it.po, po/eo.po, po/es.po, po/Makefile.in.in, -+ po/cs.po, po/de.po, po/el.po: Fix some dependency, and do -+ update-po again. Also, Edmund Evans submitted a new Esperanto -+ translation. -+ -+ * mx.c: safe_fclose() doesn't like FILE pointers. -+ -+ * mx.h, mx.c: Don't core dump when locking a folder fails. -+ -+2000-02-22 19:22:29 roessler (roessler) -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/ru.po, -+ po/pl.po, po/pt_BR.po, po/ko.po, po/nl.po, po/id.po, po/it.po, -+ po/fr.po, po/gl.po, po/el.po, po/eo.po, po/es.po, po/de.po, -+ po/cs.po: update-po. -+ -+ * po/ko.po: New Korean translation from -+ . -+ -+ * muttbug.sh.in: Fix bug#42: A missing "'". -+ -+ * main.c: Cosmetic fix from Marco d'Itri. -+ -+ * imap/browse.c, browser.c, doc/manual.sgml.head: Brendan Cully's -+ latest IMAP browser fixes. -+ -+2000-02-18 10:56:24 roessler (roessler) -+ -+ * muttlib.c: In mutt_copy_body(), we also need to strdup() -+ the content-description. -+ -+ * imap/command.c: Reasonably handle suerfluous EXIST messages -+ from IMAP servers. From Brendan Cully. -+ -+2000-02-17 18:22:27 roessler (roessler) -+ -+ * send.c: Fix content-description encoding - it was done after -+ signing, not before signing. -+ -+ * sendlib.c, attach.c, mx.c, pop.c: Do more error checking when -+ writing messages to folders. -+ -+2000-02-16 17:29:33 roessler (roessler) -+ -+ * send.c: Fix mail-followup-to generation. -+ -+ * sendlib.c: Don't output empty header fields. This is made -+ necessary by the addition of possibly empty my_hdr commands. -+ -+ * init.c: Permit empty my_hdrs. Suggested by Edmund Grimley -+ Evans. -+ -+ * po/cs.po: update. -+ -+ * pattern.c, protos.h, send.c: Generate mail-followup-to headers -+ which contain the user's mail address when sending messages to -+ _known_ mailing lists. -+ -+ * po/de.po: update. -+ -+2000-02-15 22:26:39 roessler (roessler) -+ -+ * po/fr.po: update. -+ -+ * po/eo.po: New translation from Edmund Grimley. -+ -+ * OPS: Fix a typo. -+ -+ * globals.h: Increase the size of ErrorBuf. -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/pl.po, po/ru.po, -+ po/sk.po, po/id.po, po/it.po, po/ko.po, po/nl.po, po/eo.po, -+ po/es.po, po/fr.po, po/gl.po, po/cs.po, po/de.po, po/el.po, -+ VERSION, reldate.h, ChangeLog: automatic post-release commit -+ for mutt-1.1.4 -+ -+ * doc/manual.sgml.head: Add improved documentation for the "push" -+ command, and macros. From Byrial Jensen, based on a patch by -+ Mikko Hanninen. -+ -+ * functions.h: Fix the function on the pager. -+ -+ * doc/manual.sgml.head, doc/muttrc.man.head, hook.c, init.c, -+ init.h, protos.h: Byrial Jensen's unhook command patch. -+ -+ * doc/Makefile.in: Remove superfluous empty lines from the text -+ version of the manual. -+ -+ * OPS: Change the documentation string for OP_MAIN_PREV_UNDELETED -+ - it may be confusing. -+ -+ * functions.h, keymap.c: More OP_EXIT fixes. -+ -+ * OPS, functions.h, keymap.c, pager.c: Remove the OP_PAGER_EXIT -+ opcode, and change it to OP_EXIT. -+ -+ * doc/manual.sgml.head: Add more documentation for subscribe -+ and lists. -+ -+2000-02-14 20:51:37 roessler (roessler) -+ -+ * init.h: Fix documentation for $followup_to. -+ -+ * po/de.po: Fix the fixes. Folks, when submitting changes to the -+ .po files, please try a "make" in the po subdirectory afterwards. -+ -+ * po/it.po: New Italian translation from Marco d'Itri. -+ -+ * imap/imap.c, imap/Makefile.am, imap/auth.c, imap/auth_gss.c, -+ imap/browse.c, doc/manual.sgml.head, mx.c, .cvsignore, -+ Makefile.am, browser.c, browser.h, configure.in: Brendan Cully's -+ patch from <20000212185021.A7365@xanadu.kublai.com>. -+ -+ * po/de.po: Fixes from Roland Rosenfeld. -+ -+ * attach.c, compose.c: Fix a couple of random perror() calls -+ and related problems. -+ -+ * sendlib.c: Fix encoding for text/* attachments with long lines. -+ -+2000-02-11 09:04:22 roessler (roessler) -+ -+ * contrib/Pine.rc: Fix bug #23. -+ -+ * init.h, makedoc.c: Fix minor documentation problems noted by -+ Marius Gedminas . -+ -+2000-02-10 19:46:13 roessler (roessler) -+ -+ * imap/message.c, pager.c, parse.c, pattern.c, pgp.c, pgp.h, -+ pgpkey.c, pgplib.h, postpone.c, protos.h, recvattach.c, send.c, -+ sendlib.c, sort.h, functions.h, globals.h, handler.c, hdrline.c, -+ headers.c, hook.c, init.c, init.h, keymap.c, keymap.h, main.c, -+ mutt.h, muttlib.c, mx.c, Makefile.am, acconfig.h, attach.c, -+ commands.c, compose.c, configure.in, copy.c, copy.h, curs_main.c: -+ PGP-cleanup patch from Roland Rosenfeld. Thanks! -+ -+ * muttbug.sh.in: ${prefix} should be defined, as it may be used -+ by autoconf. -+ -+2000-02-09 18:28:45 roessler (roessler) -+ -+ * doc/manual.sgml.head: Fix a minor typo. From Mikko Hänninen. -+ -+ * muttbug.sh.in: Mostly Debian-related fixes from Roland -+ Rosenfeld. -+ -+ * main.c: Small translation-related fix from Roland. -+ -+ * po/fr.po: Update from Vincent Lefevre. -+ -+ * pgpewrap: Portability patch to make pgpewrap work under HP/UX. -+ From David Ellement . -+ -+ * doc/Makefile.in, doc/manual.sgml.head, doc/manual.sgml.tail, -+ init.h: Documentation changes from Roland Rosenfeld. -+ -+2000-02-08 20:55:33 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/uk.po, po/ru.po, -+ po/ko.po, po/nl.po, po/pl.po, po/fr.po, po/gl.po, po/id.po, -+ po/it.po, po/de.po, po/el.po, po/eo.po, po/es.po, build-release, -+ po/cs.po, reldate.h, Makefile.am, VERSION, ChangeLog: automatic -+ post-release commit for mutt-1.1.3 -+ -+ * build-release: Don't build US releases. RedHat and Caldera -+ don't object, Debian uses the international version anyways, -+ and SuSE (1) sits in Germany and (2) doesn't react. -+ -+ * contrib/pgp2.rc: add a comment concerning +encrypttoself. -+ -+ * pager.c, keymap.c: Avoid IMAP timeouts when viewing messages. -+ From Tommi.Komulainen@iki.fi. -+ -+ * po/eo.po: Small fix from Edmund. -+ -+2000-02-07 19:16:41 roessler (roessler) -+ -+ * doc/manual.sgml.head: Add a note on my_hdr when used from -+ send-hook. -+ -+ * muttbug.sh.in: Remove another Debian reference from the severity -+ level descriptions. -+ -+ * muttbug.sh.in: More fixes. -+ -+ * muttlib.c, protos.h, rfc2047.c, rfc2231.c: Fix bug#22. -+ -+ * muttbug.sh.in: Various fixes from Roland Rosenfeld. -+ -+ * buffy.c: Fix a NULL pointer deference. -+ -+2000-02-03 13:41:38 roessler (roessler) -+ -+ * acconfig.h, configure.in, muttbug.sh.in: Add debugger support -+ to muttbug. -+ -+ * init.c: Add a comment concerning muttbug.sh. -+ -+ * muttbug.sh.in: More changes to the bug report script. Most of -+ them were suggest by Roland Rosenfeld. -+ -+ * po/de.po: Minor fixes from Roland Rosenfeld. -+ -+ * muttbug.sh.in: Add some Debian specifics. -+ -+ * muttbug.sh.in: Strip comments from included configuration files. -+ -+ * muttbug.sh.in: another minor fix. -+ -+ * muttbug.sh.in: Minor fixes. -+ -+ * Makefile.am, configure.in, main.c, muttbug.sh.in: Add muttbug, -+ the bug reporting utility. (Yes, we are about to get a real -+ bug-tracking system, see http://bugs.guug.de/.) -+ -+ * doc/manual.sgml.head: Documentation fix. -+ -+2000-02-02 10:53:28 roessler (roessler) -+ -+ * init.c: Make the parsing of integers more -+ -+ * lib.c: Use O_NOFOLLOW when it's there, and needed. -+ -+2000-02-01 18:47:49 roessler (roessler) -+ -+ * main.c: Cosmetics. -+ -+ * doc/mutt.man, doc/muttrc.man.head: Cosmetics. Additionally, -+ remove the y2k compliance notice from the manual page. -+ -+ * makedoc.c: Change the font used for typesetting "tables", -+ so we get usable output when roffing the muttrc (5) manual page -+ for a postscript printer. -+ -+ * po/zh_TW.Big5.po, po/sk.po, po/sv.po, po/uk.po, po/pl.po, -+ po/ru.po, po/ko.po, po/nl.po, po/gl.po, po/id.po, po/it.po, -+ po/el.po, po/eo.po, po/es.po, po/fr.po, po/cs.po, po/de.po: -+ Include various po-file updaes, and make update-po. -+ -+ * po/Makefile.in.in, po/POTFILES.in, Makefile.am: Build fix for -+ the po/ subdirectory, from Edmund G. Evans. -+ -+ * po/eo.po: New Esperanto translation. -+ -+ * init.h: Add a bit more documentation on $recall. -+ -+2000-01-30 13:35:22 roessler (roessler) -+ -+ * po/sv.po, po/uk.po, po/zh_TW.Big5.po, po/ru.po, po/sk.po, -+ po/nl.po, po/pl.po, po/id.po, po/it.po, po/ko.po, po/es.po, -+ po/fr.po, po/gl.po, po/eo.po, po/POTFILES.in, po/cs.po, po/de.po, -+ po/el.po, po/Makefile.in.in, configure.in: Try to fix the build -+ process in the po/ subdirectory. -+ -+ * configure.in: Add some languages to ALL_LINGUAS. -+ -+ * po/gl.po, po/sv.po: Adding translations from stable to unstable. -+ -+ * po/ru.po, po/zh_TW.Big5.po, po/fr.po, po/id.po, po/ko.po, -+ po/pl.po, po/de.po, po/el.po, po/eo.po: make update-po; including -+ new revisions submitted so far. -+ -+2000-01-29 08:03:48 roessler (roessler) -+ -+ * init.h: Another change to attach_format. -+ -+ * pgp.c, recvattach.c, send.c, sendlib.c, OPS, compose.c, -+ functions.h, init.h, mutt.h, parse.c: Michael Elkins' -+ content-disposition patch, with some small changes. -+ -+2000-01-28 21:32:47 roessler (roessler) -+ -+ * init.h: Make the documentation for rfc2047_parameters -+ comprehensible to the end user. -+ -+ * init.h: Documentation fix. -+ -+ * rfc2231.c: RFC2231 support should understand utf-8. -+ -+2000-01-27 09:57:09 roessler (roessler) -+ -+ * imap/imap_ssl.c, README.SSL, init.h, mutt.h: Add options -+ to disallow individual SSL protocols. From Jeremy Katz -+ . -+ -+2000-01-25 21:21:10 roessler (roessler) -+ -+ * imap/BUGS: Brendan Cully's latest changes: -+ -+ Here is a patch to add some support for read-only IMAP folders. -+ This is most useful if you have multiple copies of mutt open, -+ but it also allows you to open a folder read-only and not -+ have to worry about flags getting changed. Toggling read-only -+ still doesn't work correctly - you may lose your 'N' flags -+ if you open a folder normally and switch to read-only. -+ -+ I've also decided to try using UID FETCH, although I'm not -+ sure if older IMAP servers support it, but then again I'm -+ not sure if anyone's using any really old IMAP servers. The -+ main advantage is in the case of multiple clients, where -+ one client is deleting messages and the other isn't getting -+ notification. I'm experiencing that on my UW-IMAP 4.6 server. On -+ the other hand, this server seems to have all sorts of terrible -+ problems with this scenario, so I'm not sure how well the code -+ functions. It's a two-line change so far, it's experimental, -+ and it's the only IMAP code in an #if 0 block... -+ -+ * imap/README: branches: 1.4.2; Brendan Cully's latest changes: -+ -+ Here is a patch to add some support for read-only IMAP folders. -+ This is most useful if you have multiple copies of mutt open, -+ but it also allows you to open a folder read-only and not -+ have to worry about flags getting changed. Toggling read-only -+ still doesn't work correctly - you may lose your 'N' flags -+ if you open a folder normally and switch to read-only. -+ -+ I've also decided to try using UID FETCH, although I'm not -+ sure if older IMAP servers support it, but then again I'm -+ not sure if anyone's using any really old IMAP servers. The -+ main advantage is in the case of multiple clients, where -+ one client is deleting messages and the other isn't getting -+ notification. I'm experiencing that on my UW-IMAP 4.6 server. On -+ the other hand, this server seems to have all sorts of terrible -+ problems with this scenario, so I'm not sure how well the code -+ functions. It's a two-line change so far, it's experimental, -+ and it's the only IMAP code in an #if 0 block... -+ -+ * imap/TODO, imap/command.c, imap/imap.c, imap/message.c: -+ Brendan Cully's latest changes: -+ -+ Here is a patch to add some support for read-only IMAP folders. -+ This is most useful if you have multiple copies of mutt open, -+ but it also allows you to open a folder read-only and not -+ have to worry about flags getting changed. Toggling read-only -+ still doesn't work correctly - you may lose your 'N' flags -+ if you open a folder normally and switch to read-only. -+ -+ I've also decided to try using UID FETCH, although I'm not -+ sure if older IMAP servers support it, but then again I'm -+ not sure if anyone's using any really old IMAP servers. The -+ main advantage is in the case of multiple clients, where -+ one client is deleting messages and the other isn't getting -+ notification. I'm experiencing that on my UW-IMAP 4.6 server. On -+ the other hand, this server seems to have all sorts of terrible -+ problems with this scenario, so I'm not sure how well the code -+ functions. It's a two-line change so far, it's experimental, -+ and it's the only IMAP code in an #if 0 block... -+ -+ * doc/Makefile.in: Make the build process work when sgmltools -+ aren't present. From Lawrence Greenfield . -+ -+ * imap/auth.c: Fix GSSAPI support. From Lawrence Greenfield -+ . -+ -+2000-01-24 13:17:17 roessler (roessler) -+ -+ * dotlock.h, mx.c, dotlock.c: Locking fix. -+ -+ * enter.c: patch-1.1.2.mg.autocomplete.1 - from Marius Gedminas -+ . -+ -+ * Makefile.am: small build process fix. -+ -+ * m4/Makefile.am.in: Patch from Lars Hecking in order to build -+ mutt cleanly under Solaris 2.6. -+ -+ * doc/manual.sgml.head: More list-reply documentation from -+ Mikko.Hanninen@iki.fi. -+ -+ * init.h, mutt.h, rfc822.c: Removing rewrite_uucp. There were -+ too many objections against it. -+ -+ * init.h, mutt.h, rfc822.c: Adding the $rewrite_uucp option. -+ -+ * po/ru.po: update. -+ -+ * po/eo.po, configure.in: Adding the Esperanto translation -+ to unstable. From Edmund GRIMLEY EVANS . -+ -+2000-01-21 09:28:56 roessler (roessler) -+ -+ * po/el.po: New greek translation. -+ -+ * po/id.po: updated translation. -+ -+2000-01-20 17:35:41 roessler (roessler) -+ -+ * po/pl.po: Updated polish translation. -+ -+ * contrib/Makefile.in, Makefile.am: "make distclean" fixes from -+ Marco d'Itri. -+ -+ * compose.c: Typo noted by edmundo@rano.org. -+ -+ * po/ko.po: Update. -+ -+ * send.c: Honor mail-followup-to when doing a list-reply. -+ From Mikko.Hanninen@iki.fi. -+ -+2000-01-19 14:59:01 roessler (roessler) -+ -+ * commands.c: Don't move the index cursor after a failed attempt -+ to save a message. From Joe Orton . -+ -+ * po/de.po: New German translation for unstable, from Roland -+ Rosenfeld. -+ -+ * pgp.c: Fiksing a speling mysdeik nodet by Michael Sobolev. ;-) -+ -+ * NEWS: Add a notice on display-toggle-weed. -+ -+ * doc/manual.sgml.head, doc/manual.sgml.tail, OPS, functions.h: -+ Rename display-headers to display-toggle-weed. -+ -+2000-01-18 22:46:18 roessler (roessler) -+ -+ * mx.c: mx_open_mailbox_append: Add an error message and remove -+ a file descriptor leak when we can open, but can't lock an MMDF -+ or MBOX folder. -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sv.po, po/sk.po, po/ru.po, -+ po/pt_BR.po, po/pl.po, po/nl.po, po/ko.po, po/it.po, po/gl.po, -+ po/id.po, po/fr.po, po/eo.po, po/es.po, po/el.po, po/de.po, -+ po/cs.po, reldate.h, VERSION, ChangeLog: automatic post-release -+ commit for mutt-1.0.1 -+ -+ * contrib/Makefile.in: Respect $DESTDIR in contrib/Makefile. -+ From Hao Li . -+ -+ * imap/imap.c, imap/message.c: Fix use of confirmcreate with IMAP. -+ A patch for this was suggested by Brian R. Gaeke. -+ -+ * init.h, alias.c: Documentation fix about gecos_mask. From Will -+ Fiveash. -+ -+2000-01-16 14:44:12 roessler (roessler) -+ -+ * po/eo.po: new esperanto translation from edmundo@rano.org. -+ -+ * editmsg.c: Use Visual, not Editor, for editing messages. -+ Noted by Marius Gedminas . -+ -+ * rfc822.c: quote-related fix to the RFC822 parser. From Edmund -+ Grimley Evans. -+ -+2000-01-12 09:20:34 roessler (roessler) -+ -+ * init.c: It was impossible to unset a string. If you did -+ "unset realname" it would just print out the value of the string. -+ Attached is the fix. -+ -+2000-01-10 21:34:06 roessler (roessler) -+ -+ * reap.pl: Handle #ifndef in reap.pl. -+ -+ * configure.in: Recognize differently-named gccs as such, and -+ enable warnings. From "Andrew W. Nosenko" . -+ -+ * pgp.c: To compile on SunOs 4.1.4, the order of two includes -+ needs to be switched ( contains a struct timeval.) -+ -+ From Mark Seiden . -+ -+ * doc/manual.sgml.head, pgplib.h, postpone.c, recvattach.c, -+ recvcmd.c, remailer.c, remailer.h, rfc2231.c, rfc2231.h, -+ attach.c, charset.c, charset.h, dotlock.h, editmsg.c, extlib.c, -+ gnupgparse.c, lib.c, lib.h, makedoc.c, mh.c, muttlib.c, mx.c, -+ mx.h, pgp.h: More copyright cosmetics - noted by Martin Michlmayr -+ . -+ -+ * lib.c: Use safe_free() instead of free() with mutt_str_replace - -+ equivalent, but nicer. -+ -+ * parse.c, pgpkey.c, postpone.c, protos.h, recvattach.c, -+ rfc1524.c, rfc2047.c, send.c, sendlib.c, attach.c, browser.c, -+ compose.c, curs_main.c, edit.c, history.c, init.c, lib.c, -+ main.c, menu.c, mh.c, muttlib.c: Add (and use) a function -+ mutt_str_replace, which essentially replaces the sequence: -+ -+ safe_free (&s); s = safe_strdup (t); -+ -+ * build-release, gnupgparse.c: Fix PGP uid parsing. Noted by -+ Edmund GRIMLEY EVANS . -+ -+2000-01-08 10:31:28 roessler (roessler) -+ -+ * VERSION, reldate.h, ChangeLog: automatic post-release commit -+ for mutt-1.1.2 -+ -+ * keymap.c: Fix a macro-related segmentation fault in stable. -+ From Byrial Jensen. -+ -+ * keymap.c: Fix a macro-related segmentation fault. From Byrial -+ Jensen. -+ -+ * OPS, commands.c, compose.c, curs_main.c, functions.h, protos.h, -+ recvattach.c: Unified edit-type function for the index, compose, -+ and receive-attachment menus. Mostly by Michael Elkins. -+ -+ * curs_lib.c: patch-1.1.1.me.endwin.1, from Michael Elkins. -+ -+ * mutt.h, parse.c, init.h: Undo Michaels "pgpsearchext" patch. -+ -+2000-01-06 12:00:50 roessler (roessler) -+ -+ * rfc2231.c, rfc2231.h, rfc822.c, rfc822.h, score.c, send.c, -+ sendlib.c, signal.c, sort.c, sort.h, status.c, system.c, thread.c, -+ pgplib.c, pgplib.h, pgppubring.c, pop.c, postpone.c, protos.h, -+ query.c, recvattach.c, recvcmd.c, remailer.c, remailer.h, -+ resize.c, rfc1524.c, rfc1524.h, rfc2047.c, rfc2047.h, mh.c, -+ mime.h, mutt.h, mutt_curses.h, mutt_menu.h, mutt_regex.h, -+ muttlib.c, mx.c, mx.h, pager.c, pager.h, parse.c, pattern.c, -+ pgp.h, pgpinvoke.c, keymap.c, keymap.h, lib.c, lib.h, mailbox.h, -+ main.c, makedoc.c, mapping.h, mbox.c, menu.c, init.h, hash.h, -+ hdrline.c, headers.c, help.c, history.c, history.h, hook.c, -+ init.c, copy.h, curs_lib.c, curs_main.c, date.c, dotlock.c, -+ dotlock.h, edit.c, editmsg.c, enter.c, extlib.c, filter.c, -+ flags.c, from.c, functions.h, globals.h, gnupgparse.c, handler.c, -+ hash.c, attach.c, attach.h, browser.c, browser.h, buffy.c, -+ buffy.h, charset.c, charset.h, color.c, commands.c, complete.c, -+ compose.c, copy.c, addrbook.c, alias.c: Update copyright notices -+ for unstable. -+ -+ * signal.c, socket.c, sort.c, sort.h, status.c, system.c, -+ thread.c, query.c, recvattach.c, resize.c, rfc1524.c, -+ rfc1524.h, rfc2047.c, rfc2047.h, rfc822.c, rfc822.h, score.c, -+ send.c, sendlib.c, pattern.c, pgp.c, pgpinvoke.c, pgpkey.c, -+ pgppubring.c, pop.c, postpone.c, protos.h, pager.h, parse.c, -+ menu.c, mh.c, mime.h, mutt.h, mutt_curses.h, mutt_menu.h, -+ mutt_regex.h, mutt_socket.h, mx.c, mx.h, pager.c, imap.h, -+ init.c, init.h, keymap.c, keymap.h, lib.c, mailbox.h, main.c, -+ mapping.h, mbox.c, hash.c, hash.h, hdrline.c, headers.c, -+ help.c, history.c, history.h, hook.c, imap.c, curs_main.c, -+ date.c, dotlock.c, dotlock.h, edit.c, enter.c, filter.c, flags.c, -+ from.c, functions.h, globals.h, gnupgparse.c, handler.c, buffy.c, -+ buffy.h, charset.c, charset.h, color.c, commands.c, complete.c, -+ compose.c, copy.c, copy.h, curs_lib.c, addrbook.c, alias.c, -+ attach.c, attach.h, browser.c: Updat copyright notices in stable. -+ -+2000-01-05 09:40:52 roessler (roessler) -+ -+ * init.h, mutt.h, parse.c: patch-1.1.1.me.pgpsearchtext.1. -+ From Michael Elkins. -+ -+2000-01-03 10:15:54 roessler (roessler) -+ -+ * strcasecmp.c: New str*casecmp replacements for stable. -+ -+ * strcasecmp.c: Fix strncasecmp and strcasecmp replacement -+ functions. Problem noted by Stu Heiss . -+ -+2000-01-01 17:59:51 roessler (roessler) -+ -+ * parse.c: y2k fix for 1.0. -+ -+ * parse.c: A y2k fix for those who still use two-digit year -+ numbers as originally specified in RFC 822. -+ -+1999-12-29 18:38:07 roessler (roessler) -+ -+ * po/zh_TW.Big5.po: New Chinese translation; from Anthnoy Wong -+ ; Dec 21 1999. -+ -+ * sort.c: Fix a minor threading bug. From Edmund GRIMLEY EVANS -+ , Dec 14 1999. -+ -+ * browser.c: Fix the use of link_is_dir() in the file -+ browser. This should fix the bug reported by John Yates -+ on Dec 07 1999. (Details noted by Byrial -+ Jensen on Dec 09 1999.) -+ -+ * send.c: Don't use IMAP folders for FCCs when sending messages -+ in batch mode. This is _not_ Brendan's patch, which may be -+ included later. -+ -+1999-12-14 10:29:25 roessler (roessler) -+ -+ * INSTALL: Add a short note that EXACT_ADDRESS is broken. -+ In order to fix it, we'd need a RFC 2047 implementation -+ which knows about RFC 822 syntax. (This would also help with -+ In-Reply-To headers, BTW, but would be considerably more complex.) -+ -+1999-12-13 11:36:01 roessler (roessler) -+ -+ * init.h, mutt.h, protos.h, send.c, sendlib.c: Adding the -+ envelope_from option. -+ -+1999-12-09 11:17:35 roessler (roessler) -+ -+ * imap/README, imap/auth.c, imap/browse.c, imap/imap.c, -+ imap/imap.h, imap/imap_private.h, imap/imap_socket.h, -+ imap/imap_ssl.c, imap/message.c, imap/socket.c, imap/util.c, -+ doc/manual.sgml.head, init.c, browser.c: Tommi Komulainen's -+ multiple IMAP usernames patch. -+ -+1999-12-06 09:59:28 roessler (roessler) -+ -+ * mbox.c: Cosmetic improvement for reading mmdf folders. -+ From John Hawkinson . -+ -+1999-12-04 15:42:07 roessler (roessler) -+ -+ * mx.c: Check for the presence of .overview files when testing -+ whether some directory is an MH folder. This way, you can at -+ least read Usenet news from the spool using Mutt. ;-) -+ -+ * alias.c, init.h, mutt_regex.h: William Feavish's GECOS regexp -+ patch. -+ -+1999-12-03 16:54:03 roessler (roessler) -+ -+ * doc/manual.sgml.head: Fix the documentation on how to join -+ the mutt lists. Noted by Marius Gedminas . -+ -+ * init.h: Fix a small bug in the documentation for $hidden_host. -+ -+ * configure.in: Fix the handling of --disable configure switches. -+ -+ * configure.in: patch-1.0.rr.autoconf-disable.1: --disable-pop -+ shouldn't enable pop. -+ -+ * rfc2047.c: Properly tag quoted-printable encoded RFC 2047 -+ strings with $send_charset, not with $charset. -+ -+ * Makefile.am, README, README.UPGRADE: Adding one more readme -+ file. This one is intended to serve as some kind of "howto" -+ for the most notable incompatible configuration changes. -+ -+1999-12-02 16:29:26 roessler (roessler) -+ -+ * pgpkey.c: Fix the PGP key selection menu's title. -+ -+ * imap/imap_ssl.c: SSL fixes from Tommi Kommulainen. -+ -+ * NEWS: Announce edit-message and resend-message, and the changes -+ in recvcmd.c. -+ -+ * doc/manual.sgml.head: Clarify the documentation of -+ lists/unlists/subscribe/unsubscribe a bit. -+ -+1999-12-01 12:06:31 roessler (roessler) -+ -+ * imap/util.c: Now, I should have got the signal handling right. -+ -+ * imap/util.c: another alarm (0) was missing. (However, this -+ one didn't crash mutt.) -+ -+ * imap/util.c: imap_keepalive: cancel pending alarms. Otherwise, -+ mutt will die frequently. -+ -+ * imap/util.c: Re-set the list of blocked signals after the -+ imap_keepalive stuff. -+ -+ * imap/imap.h, imap/util.c, curs_lib.c, mutt.h, system.c: -+ A modified version of Tommi Kommulainen's imap keepalive patch. -+ -+1999-11-26 09:19:03 roessler (roessler) -+ -+ * imap/message.c: Fix the lines header. -+ -+1999-11-25 15:18:02 roessler (roessler) -+ -+ * imap/imap.h, imap/util.c, curs_lib.c, mutt.h, system.c: Undo -+ the IMAP keepalive patch. It has just bitten me while mutt was -+ trying to dotlock a folder. Seems that there needs some more -+ work to be done. -+ -+ * imap/imap.h, imap/util.c, mutt.h, system.c, curs_lib.c: -+ A modified version of Tommi Komulainen's imap keepalive patch. -+ -+1999-11-24 16:29:58 roessler (roessler) -+ -+ * NEWS: Change some headlines: Instead of "major changes -+ since ", it's "major changes since 1.0" now. -+ In addition, I changed the note concerning the lists/subscribe -+ change to be more explicit than the old one. -+ -+ * imap/message.c: IMAP line count fix from -+ Tommi.Komulainen@iki.fi. -+ -+1999-11-23 23:43:51 roessler (roessler) -+ -+ * postpone.c: mutt_prepare_template() didn't work with -+ PGP-encrypted messages due to an - errm - interesting typo. -+ -+ * doc/manual.sgml.head: Document the fact that users can enter -+ a mail-followup-to header in the editor. There seems to have -+ been some confusion about this. -+ -+ * doc/PGP-Notes.txt, acconfig.h, configure.in, pgp.c: Disable -+ core dumps before we ask the user for a pass phrase. Suggested by -+ . -+ -+ * doc/PGP-Notes.txt: Include the maildrop recipe Mark Weinem -+ sent me some weeks ago. -+ -+ * muttlib.c: Permit !! for the last folder. Elm compatibility. -+ -+ * NEWS: Tell our users that fcc_clear exists. -+ -+ * init.h, mutt.h, send.c: Adding an fcc_clear option for -+ unencrypted and unsigned FCCs. -+ -+ * imap/Makefile.am: Include the SSL-related code with "make dist". -+ -+1999-11-22 16:01:42 roessler (roessler) -+ -+ * imap/imap.c, imap/imap.h, imap/imap_private.h, imap/message.c, -+ imap/util.c, imap/BUGS, imap/README, imap/TODO, OPS, browser.c, -+ functions.h, pgppubring.c: IMAP folder creation and deletion. -+ From Brendan Cully. -+ -+ * po/de.po: Der Versuch, "Diskussionsfaden" durch etwas -+ Verständlicheres zu ersetzen. ;-) -+ -+1999-11-18 16:19:35 roessler (roessler) -+ -+ * init.h: Include SSL documentation in the manual. -+ -+ * dotlock.c: indentation noise. -+ -+ * imap/socket.c: Small code clean-up. -+ -+ * mx.c: Detect .mew_cache files in MH folders. Suggested by -+ Kawaguti Ginga . -+ -+ * doc/manual.sgml.head: Documentation nit from Byrial Jensen. -+ -+ * lib.c: patch-1.0.bj.lastline.1: Handle last lines in -+ configuration files nicely, even when they are not terminated -+ by a \n character. -+ -+ * parse.c, rfc2231.c: Some rather cosmetic changes. -+ -+1999-11-17 22:47:59 roessler (roessler) -+ -+ * menu.c: some reorganizations of the dialog menu code. -+ -+ * alias.c: Fix the address sanitizer. You should now be -+ able to auto-create an alias for someone like "Jon K. Hellan" -+ . -+ -+ * imap/Makefile.am, imap/browse.c, imap/imap.c, imap/imap.h, -+ imap/imap_private.h, imap/imap_socket.h, imap/imap_ssl.c, -+ imap/imap_ssl.h, imap/message.c, imap/socket.c, imap/util.c, -+ doc/manual.sgml.head, Makefile.am, NEWS, README.SSL, acconfig.h, -+ configure.in, init.c, init.h, main.c, mutt.h: Tommi Komulainen's -+ IMAP/SSL support patches. -+ -+ * menu.c, mutt_menu.h: Tommi Komulainen's menu/dialog patch. -+ -+1999-11-15 17:44:15 roessler (roessler) -+ -+ * pgp.c: Fix the pgp-hook logic. -+ -+ * color.c: Small color fix from T. E. Dickey. -+ -+ * color.c: A small patch from TE Dickey. -+ -+1999-11-11 18:30:25 roessler (roessler) -+ -+ * rfc822.c: ups, the previous patch included a small buffer -+ overflow. -+ -+ * po/gl.po: Roberto Suarez Soto sent us a -+ new translation. -+ -+ * rfc822.c: Fix a header quoting bug. -+ -+ * doc/Makefile.in: Another build process patch from Brendan Cully. -+ -+1999-11-10 21:35:33 roessler (roessler) -+ -+ * rfc2231.c: Ignore empty MIME parameters. -+ -+1999-11-09 12:40:14 roessler (roessler) -+ -+ * mbox.c, parse.c: Add some more sanity checks about -+ content-length. -+ -+ * curs_lib.c: Fix an SLang-related compilation problem. -+ Originally from Jon Kåre Hellan. -+ -+ * postpone.c: Simplify mutt_prepare_template (). Instead of -+ copying around all kinds of data, we re-parse the postponed -+ message's structure. -+ -+ * postpone.c: Make sure mutt doesn't forget MIME structure when -+ the user resends a message/rfc822 body from the recvattach menu. -+ Note, however, that this is more of a temporary solution -+ - I think there is some more space for improvements in -+ mutt_prepare_template(). -+ -+ * imap/Makefile.am, doc/Makefile.in, contrib/Makefile.in, -+ configure.in, Makefile.am: Build process fixes from Brendan Cully. -+ -+ * pager.c: Add a missing redraw after resend-message. -+ -+1999-11-08 22:10:49 roessler (roessler) -+ -+ * VERSION: Undo changes which are due to release-building tests. -+ After all, we want the _right_ diff next time. -+ -+ * build-release: Finalize the new build-release script. -+ -+ * ChangeLog, VERSION, build-release: automatic post-release -+ commit for mutt-1.1.1.2 -+ -+ * LAST_TAG, Makefile.am, OVERSION, VERSION, build-release, -+ ChangeLog: automatic post-release commit for mutt-1.1.1.1 -+ -+ * LAST_TAG, Makefile.am, OVERSION: Preparing some improvements -+ to the build process. -+ -+ * po/de.po, reldate.h, VERSION, ChangeLog: automatic post-release -+ commit for mutt-1.1.1 -+ -+1999-11-07 22:52:40 roessler (roessler) -+ -+ * sendlib.c: short-cut utf-7 as a 7bit character set. Currently, -+ utf-7 may be overridden by us-ascii. -+ -+ * protos.h, recvattach.c, recvcmd.c, rfc1524.c, rfc1524.h, -+ send.c, sendlib.c, attach.c, attach.h, browser.c, commands.c, -+ compose.c, curs_main.c, functions.h, init.h, mutt.h, muttlib.c, -+ pager.c, pager.h, postpone.c, Makefile.am: Rewriting lots of -+ the recvattach code. -+ -+ * po/eo.po: branches: 1.1.2; file eo.po was initially added on -+ branch mutt-1-0-stable. -+ -+ * po/eo.po, configure.in: Esperanto translation from Edmund -+ GRIMLEY EVANS . -+ -+1999-11-05 07:28:11 roessler (roessler) -+ -+ * pgppubring.c: preprocess out some unused strings. -+ -+1999-11-04 21:35:32 roessler (roessler) -+ -+ * rfc2231.c: Catch a segmenatation fault. Note that this is -+ not the real fix for the problem... -+ -+ * menu.c: Change a short to an int where it should have been one. -+ -+ * po/gl.po: New version. -+ -+ * protos.h, send.c, status.c, buffy.c, globals.h, postpone.c: -+ IMAP postpone changes from Byrial Jensen. -+ -+1999-11-03 20:30:19 roessler (roessler) -+ -+ * recvattach.c: Adding a comment which describes some ideas on -+ how the attachment menu should work. -+ -+1999-11-02 15:51:07 roessler (roessler) -+ -+ * imap/BUGS, imap/command.c, imap/imap.c, imap/imap_private.h, -+ imap/message.c, imap/util.c, buffy.c: Various IMAP-related fixes -+ from Brendan Cully. -+ -+1999-10-31 17:12:55 roessler (roessler) -+ -+ * po/it.po: [stable] Small fix from Marco d'Itri. -+ -+ * m4/.cvsignore, intl/.cvsignore, imap/BUGS, imap/message.c, -+ contrib/.cvsignore: From Brendan Cully: IMAP updates should work -+ properly again. -+ -+1999-10-29 05:43:40 roessler (roessler) -+ -+ * po/.cvsignore: Cosmetics. -+ -+ * imap/BUGS: Update the documentation. -+ -+ * doc/.cvsignore: Cosmetics. -+ -+ * buffy.c, globals.h, postpone.c, send.c, status.c: Don't check -+ the number of postponed messages every time the status line -+ is updated - this gets quite slow when used with slow IMAP -+ connections. -+ -+1999-10-28 17:42:07 roessler (roessler) -+ -+ * README: Fix the version number in the README file. -+ -+ * pop.c: Cosmetic POP fixes from Evan DiBiase -+ . -+ -+ * pop.c: Cosmetic fixes from Evan DiBiase . -+ -+1999-10-28 08:15:38 (roessler) -+ -+ * imap/imap_socket.h, imap/socket.c, init.h, globals.h: Adding -+ imap_preconnect. This way, you can let mutt start an ssh tunnel -+ before it tries to connect to an IMAP server. -+ -+1999-10-27 12:17:34 roessler (roessler) -+ -+ * po/gl.po: branches: 1.1.2; file gl.po was initially added on -+ branch mutt-1-0-stable. -+ -+ * po/gl.po, configure.in: Adding a Galician translation. -+ -+1999-10-26 15:14:01 roessler (roessler) -+ -+ * curs_lib.c, main.c: Some display-related fixes from Andrej -+ Gritsenko. -+ -+ * editmsg.c: Fix a small bug in the new edit-message feature. -+ From Andrej Gritsenko. -+ -+ * imap/imap.c, imap/imap_private.h, imap/util.c, imap/auth.c, -+ imap/browse.c, imap/command.c: * stops mutt from logging CRAM -+ secrets in debug mode. * should fix mutt segfaulting when trying -+ to open {} * helps with the problem of mutt detecting new mail -+ in the wrong -+ folder. Now, IMAP commands from the SELECTED state should call -+ imap_cmd_finish after they've executed commands. I've only put -+ this is imap_buffy_check for now - in my opinion the command -+ execution path is still not stable, and rewrites may obviate -+ the need for this... -+ -+ (From: Brendan Cully ) -+ -+1999-10-25 20:05:14 roessler (roessler) -+ -+ * po/sv.po: branches: 1.1.2; file sv.po was initially added on -+ branch mutt-1-0-stable. -+ -+ * po/sv.po, configure.in: Adding the Swedish translation to -+ stable. -+ -+ * po/de.po: Updated German translation from Roland Rosenfeld. -+ -+ * imap/imap.h, imap/imap_private.h, imap/message.c, imap/util.c, -+ imap/.cvsignore, imap/BUGS, imap/Makefile.am, imap/browse.c, -+ imap/command.c, imap/imap.c, init.h: Brendan Cully's IMAP code -+ movements patch. -+ -+1999-10-22 08:49:30 roessler (roessler) -+ -+ * Makefile.am, VERSION, reldate.h, ChangeLog: automatic -+ post-release commit for mutt-1.1 -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/pt_BR.po, po/ru.po, -+ po/pl.po, po/nl.po, po/ko.po, po/it.po, po/id.po, po/fr.po, -+ po/es.po, po/el.po, po/de.po, po/cs.po, NEWS, VERSION, reldate.h, -+ ChangeLog: post-release commit for one dot zero. (yes, really.) -+ -+1999-10-21 08:07:22 roessler (roessler) -+ -+ * compose.c: Another sprintf-vs-null issue. -+ -+1999-10-20 14:51:57 roessler (roessler) -+ -+ * po/id.po: new indonesian translation. -+ -+ * imap/message.c: Flags should only be modified using -+ mutt_set_flag(). Everything else leads to neglected side effects. -+ In this case, index colors, searches and possibly other side -+ effects were ignored when a message which resides on an IMAP -+ folder was read. -+ -+ * imap/auth.c: Let the user skip CRAM-MD5 by entering an empty -+ secret. -+ -+ * po/id.po, po/el.po: translation updates. -+ -+ * configure.in: Don't use GNU grep specific options. -+ -+1999-10-19 15:34:04 roessler (roessler) -+ -+ * imap/auth.c: Fix some sloppiness-induced, but harmless, -+ nonsense. -+ -+ * imap/imap_private.h, imap/auth.c, imap/imap.c: Add -+ AUTHENTICATE=ANONYMOUS support to the IMAP authentication methods. -+ This is, for instance, needed to access the cyrus-related mailing -+ lists' archives at CMU. -+ -+ * po/el.po: New greek translation. -+ -+1999-10-18 09:13:42 roessler (roessler) -+ -+ * pgp.c: Handle Ctrl-G on the pgp-hook prompt correctly. -+ -+1999-10-16 15:19:29 roessler (roessler) -+ -+ * Makefile.am: doc/PGP-Notes.txt vs. doc/PGP-Notes. -+ -+ * Makefile.am: [stable] doc/PGP-Notes.txt has an extension. ups. -+ -+ * send.c: [stable] Fix Debian bug #47408. -+ -+ * send.c: Fix Debian bug #47408: When the postponed folder -+ is a maildir, messages should only be written to the _new_ -+ subdirectory. -+ -+ * po/nl.po: New nl translation from Johan van Selst -+ . -+ -+ * po/cs.po: New cs translation from Jiri Pavlovsky -+ . -+ -+ * po/zh_TW.Big5.po: [stable] chinese translation fixes from -+ Anthony Wong . -+ -+ * init.h: scoring documentation fix. -+ -+ * globals.h, init.h, mutt.h, mx.c, protos.h, score.c, sort.c: -+ Scoring improvements. -+ -+1999-10-14 16:09:10 roessler (roessler) -+ -+ * po/ru.po: New Russian tranlation for stable. -+ -+ * contrib/gpg.rc: New gpg.rc from Roland Rosenfeld. -+ -+ * po/fr.po: [stable] New french translation. -+ -+ * po/de.po: [stable] Fixes to the German translation. -+ -+ * pattern.c: [stable] Fix a segmentation fault when attempting -+ to search pgp-encrypted messages. -+ -+ * pattern.c: Fix a segmentation fault when search PGP-encrypted -+ messages. -+ -+1999-10-11 20:26:41 roessler (roessler) -+ -+ * VERSION, po/es.po, reldate.h, ChangeLog: automatic post-release -+ commit for mutt-0.96.8 -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/ru.po, po/pl.po, -+ po/nl.po, po/ko.po, po/it.po, po/id.po, po/fr.po, po/es.po, -+ po/el.po, po/de.po, po/cs.po, VERSION, reldate.h, ChangeLog: -+ post-release commit for 1.0pre4. -+ -+ * po/zh_TW.Big5.po: New Chinese Translation. -+ -+ * dotlock.c: [stable] Use dotlock.c from unstable. -+ -+1999-10-06 20:20:54 roessler (roessler) -+ -+ * Makefile.am: Makefile.am fix for unstable. -+ -+ * Makefile.am: [stable] Check for mutt_dotlock in -+ $(DESTDIR)$(bindir), not in $(bindir). This should fix some -+ Debian build problems. -+ -+ * init.h: fix the $from documentation. Noted by David DeSimone. -+ -+1999-10-05 06:50:34 roessler (roessler) -+ -+ * compose.c, mutt.h, recvattach.c: small fixes from Gero Treuner. -+ -+ * mutt.h, recvattach.c, compose.c: [stable] small fixes from -+ Gero Treuner. -+ -+1999-10-04 10:05:26 roessler (roessler) -+ -+ * configure.in: [stable] add pt_BR to ALL_LINGUAS. -+ -+ * configure.in: add pt_BR to ALL_LINGUAS. -+ -+ * po/pt_BR.po: Brasilian translation. -+ -+ * po/pt_BR.po: branches: 1.1.2; file pt_BR.po was initially -+ added on branch mutt-1-0-stable. -+ -+ * po/pt_BR.po: Brasilian translation. -+ -+ * imap/BUGS, imap/Makefile.am, imap/README, imap/auth.c, -+ imap/imap.c, imap/util.c, .cvsignore, mx.c: Some fixes from -+ Brendan Cully. -+ -+ * pgpewrap: pgpewrap spits out ugly error messages when used -+ with ash. -+ -+ * configure.in: AM_C_PROTOTYPES seems to be too recent for the -+ installed automake/autoconf base. -+ -+ * postpone.c: Remove some nonsense from the resend-message -+ patches. -+ -+ * postpone.c: Fix a memory leak. -+ -+1999-09-30 22:05:28 roessler (roessler) -+ -+ * imap/message.c, send.c, sendlib.c, OPS, buffy.c, curs_main.c, -+ functions.h, headers.c, main.c, mbox.c, mh.c, mutt.h, parse.c, -+ parse.h, postpone.c, protos.h, recvattach.c: Add a resend-message -+ function (similar to the _old_ edit-message), and redo large -+ parts of mutt_prepare_edit_message (now mutt_prepare_template). -+ -+ * main.c: unstable cosmetics. -+ -+ * main.c: [stable] cosmetic change suggested by marco d'itri. -+ -+ * po/es.po, po/es.po: New spanish translation from Boris -+ Wesslowsky. -+ -+ * imap/Makefile.am, makedoc.c: Build fixes from Lars Hecking. -+ -+ * doc/manual.sgml.in, Muttrc.in, NEWS, globals.h, init.h, send.c: -+ [stable] Re-add in_reply_to, this time with the right default -+ value. -+ -+ * sendlib.c: [unstable] fix the duplicate x-mailer/uesr-agent -+ problem. -+ -+ * send.c, globals.h, init.h: [unstable] Re-add in-reply-to. -+ This time with a suitable default. #-\ -+ -+1999-09-29 17:47:33 roessler (roessler) -+ -+ * configure.in: More fixes from Lars Hecking. -+ -+ * configure.in: Adding AC_PREREQ to configure.in. -+ -+ * configure.in: make sure the right software is used for building -+ mutt. Patch suggested by Lars Hecking and Will Fiveash. -+ -+ * pgpinvoke.c: don't leak /dev/null file descriptors. From Roland -+ Rosenfeld. -+ -+ * curs_main.c: fix^2 for stable. -+ -+ * curs_main.c: Fixing the fix - missing brackets. -+ -+ * curs_main.c, parse.c: [stable] Fix some memory leaks noted by -+ purify running on behalf of Daniel Eisenbud. -+ -+ * curs_main.c, parse.c: Fix some memory leaks noted by purify -+ running on behalf of Daniel Eisenbud. -+ -+1999-09-28 18:55:31 roessler (roessler) -+ -+ * po/ru.po: Here goes an update for version 1.0-pre3i. The main -+ feature of this translation is that one-letter answers to -+ multiple choice questions are not localized (Thomas, could you -+ please add this as comment to the update in CVS?) -+ -+ (From: Michael Sobolev.) -+ -+ * sendlib.c: [stable] Include SPACE and HT with MIME specials. -+ -+ * sendlib.c: [unstable] Include SPACE and HT with MimeSpecials. -+ -+ * Makefile.am: Better solution for the makedoc build using -+ automake. -+ -+ * Makefile.am: Some makes apparently have to be told about how -+ to build makedoc. -+ -+1999-09-27 17:55:14 roessler (roessler) -+ -+ * copy.c: A back-port from unstable had missed some parts which -+ could lead to message corruption with mh mail folders. -+ -+ * po/it.po: new Italian translation from Marco d'Itri. -+ -+ * po/pl.po: New polish translation. -+ -+ * po/de.po, po/de.po: Translation fix from Roland Rosenfeld. -+ -+ * doc/manual.sgml.in: Documentation fix from Roland Rosenfeld. -+ -+1999-09-25 07:37:51 roessler (roessler) -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/ru.po, po/pl.po, -+ po/nl.po, po/ko.po, po/it.po, po/id.po, po/fr.po, po/es.po, -+ po/el.po, po/de.po, po/cs.po: post-release commit for 1.0pre3. -+ -+ * VERSION, reldate.h, ChangeLog: pre-release commit for 1.0pre3. -+ -+1999-09-24 17:51:55 roessler (roessler) -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/sk.po, po/pl.po, po/ru.po, -+ po/it.po, po/ko.po, po/nl.po, po/fr.po, po/id.po, po/el.po, -+ po/es.po, po/cs.po, po/de.po, ChangeLog, VERSION, reldate.h: -+ automatic post-release commit for mutt-0.96.7 -+ -+1999-09-23 21:13:55 roessler (roessler) -+ -+ * po/el.po: New Greek tranlsation from Fanis . -+ -+ * browser.c: [stable] Solaris snprintf vs. NULL pointers. -+ -+ * browser.c: Try not to pass NULL pointers to snprintf -+ - the Solaris version doesn't like them. (Noted by -+ Thomas.Parmelan@efrei.fr.) -+ -+ * imap/imap_private.h, imap/socket.c, imap/util.c, imap/BUGS, -+ imap/imap.c, buffy.c: Brendan Cully's latest changes: -+ -+ * includes all of my last patch, since it hasn't been committed -+ yet. * catches a couple segfault problems if Context is NULL. -+ * works harder to avoid sending null STORE FLAGS commands. May not -+ be perfect yet, but also has extra debugging code. * has the -+ beginnings of a more interactive IMAP error handler. -+ Doesn't do anything yet, I'm just including it because I want -+ to get the rest of the patch out. -+ -+ * doc/Makefile.in, Makefile.am: Use $(MAKE) instead of make. -+ Noted by Ryan Murray . -+ -+ * doc/Makefile.in, Makefile.am, configure.in, init.h: A small -+ portability fix related to makedoc. -+ -+ * po/es.po: [stable] new spanish translation from Boris Wesslowski -+ . -+ -+ * alias.c: increase this limit for stable as well. -+ -+ * handler.c: [stable] Fix a buffer overflow and a bug helping -+ with exploiting this overflow in the text/enriched handler. -+ -+ * handler.c: Fix a buffer overflow and a bug helping with -+ exploiting this overflow in the text/enriched handler. -+ -+ * imap/browse.c, doc/manual.sgml.head, curs_main.c: This small -+ patch: -+ -+ * catches a possible null-pointer dereference in mx_close_mailbox -+ when logging out of the server. -+ * fixes IMAP tab-completion cosmetics (slightly broken with last -+ Cyrus-compatibility updates) -+ * adds a bit to the IMAP part of the manual. -+ -+ Brendan Cully -+ -+ * alias.c: Increase a buffer to make larger group aliases -+ possible. The current STRING buffer was far too small. -+ -+1999-09-12 19:39:10 roessler (roessler) -+ -+ * po/es.po: [stable] Updated spanish translation from Boris -+ Wesslowski. -+ -+ * po/es.po: [stable] Fixes for the Spanish translation. -+ From Nicolás Lichtmaier . -+ -+ * imap/BUGS, imap/Makefile.am, imap/TODO, imap/auth.c, -+ imap/imap.c, imap/imap.h, imap/imap_private.h, imap/message.c, -+ imap/util.c, buffy.c, commands.c, globals.h, init.h: The attached -+ patch (imap-turbocharge.diff): -+ -+ * changes mutt_buffy_check to only poll the selected folder -+ when it is opened, not all mailboxes (unless the timeout -+ has expired). This is a noticeable win if you have a few -+ IMAP mailboxes. -+ -+ * sets the default checkinterval to 60 seconds from 0. Things -+ are much much slower with 0. -+ -+ * makes some cosmetic renames -+ -+ * moves lots of generic imap stuff into a separate file, -+ imap/util.c -+ -+ * abstracts the process of sending a command to an IMAP server -+ a bit better (lots more to do here, though). -+ -+ * moves the message-set creation code used by the new fastdelete -+ code into its own function, since it is generally useful. -+ -+ * implements server-side copy of messages. Tagged messages -+ are copied in one command, thanks to the message-set -+ function. Speedy! -+ -+ (From: Brendan Cully; modifications by tlr.) -+ -+1999-09-11 17:04:12 roessler (roessler) -+ -+ * po/pl.po: [stable] new polish translation from Pawel Dienkonski. -+ -+ * po/es.po: [stable] New Spanish translation from Boris -+ Wesslowski. -+ -+ * configure.in: [stable] Hurd portability patch from Marcus -+ Brinkmann. -+ -+ * configure.in: Hurd portability patch from Marcus Brinkmann. -+ -+ * imap/browse.c, imap/imap.c: Fix IMAP fast deletion. -+ From Brendan. -+ -+ * Muttrc.in: typos fixed by Telsa. -+ -+ * doc/manual.sgml.in: Small manual fix for stable. Noted by -+ Telsa . -+ -+1999-09-08 06:05:54 roessler (roessler) -+ -+ * imap/imap.c, imap/imap.h, imap/imap_private.h, mx.c, -+ curs_main.c: The attached patch: -+ -+ * gets Mutt to properly log off the IMAP server when -+ quitting. Clients don't care, but it's polite and proper. -+ * further updates the flags changes from yesterday * uses CLOSE -+ instead of EXPUNGE when closing a mailbox and purging -+ messages, for some slight speed gain. * purges all messages -+ marked for deletion in one command (if purging), -+ making for very cool speed gains switching mailboxes if you're -+ on, say, a few high volume mailing lists. Yeah, baby! (I -+ personally love this one). -+ -+ (From Brendan Cully ) -+ -+1999-09-07 17:01:28 roessler (roessler) -+ -+ * Makefile.am: Bail out if the chmod of mutt_dotlock fails. -+ -+ * pgpkey.c: Fix a strtok NULL pointer problem. -+ -+ * doc/manual.sgml.in: notes on how to produce secure mailcaps. -+ -+ * gnupgparse.c, pgpinvoke.c: GPG-related fix from Gero Treuner. -+ -+ * imap/BUGS, imap/Makefile.am, imap/TODO, imap/imap.c, -+ imap/imap_private.h, imap/message.c, imap/message.h, mutt.h, -+ muttlib.c, mx.c, status.c, complete.c, flags.c: * redoes the -+ folder update optimisation I did yesterday. It's somewhat -+ cleaner and less invasive, and I'm not so worried about memory -+ leaks now. -+ -+ * Fixes the bug where mutt would append a '/' to $folder even -+ if it was only {mailhost}, causing mutt to browse the root -+ directory instead of the home directory. -+ -+ * includes a first stab at preserving the D flag on the IMAP -+ server. Now if you answer no to 'Purge deleted', the server -+ still stores the messages as deleted, but doesn't expunge them -+ on exit. -+ -+ NOTE: this is a first attempt. Play around, but don't mark -+ things as deleted that you'd be sorry to see disappear. -+ -+ (From: Brendan Cully ) -+ -+ * doc/manual.sgml.head: Adding notes from README.SECURITY. -+ -+1999-09-06 09:16:53 roessler (roessler) -+ -+ * imap/Makefile.am, imap/TODO, imap/imap.c, imap/imap.h, -+ imap/imap_private.h, imap/message.c, imap/message.h, mutt.h, -+ muttlib.c: * Small imap/Makefile.am tweak for make dist -+ -+ * Hold on to mailbox flags, message flags, do update in one pass -+ instead of two, halving traffic on mailbox sync. -+ -+ * Update message flags at fetch as well as header download, -+ if the server thinks they've changed. Saves some unneeded -+ updates on sync. -+ -+ * Move some structures out of imap_private.h into message.h, -+ since they are local now. -+ -+ (From: Brendan Cully ) -+ -+1999-09-05 08:42:23 roessler (roessler) -+ -+ * contrib/Tin.rc: add a sample of tin/lynx-like key bindings. -+ -+ * imap/Makefile.am: include message.c with the IMAP library. -+ -+ * init.c: [stable] Fixing "unignore *". -+ -+ * init.c: Fix "unignore *": We must not add "*" to the unignore -+ list. -+ -+ * init.h: Documentation nit, from Liviu. -+ -+1999-09-04 04:55:58 roessler (roessler) -+ -+ * imap/BUGS, imap/browse.c, imap/imap.c, imap/imap_private.h, -+ imap/message.c: Fix some more IMAP problems. From Brendan Cully. -+ -+1999-09-03 21:42:16 roessler (roessler) -+ -+ * contrib/sample.muttrc: fix mailing list addresses. Noted by -+ David Benfell . -+ -+ * browser.c: - If the name of the folder returned by an IMAP -+ server is empty, Mutt could segfault in the browser window -+ attempting to display it. -+ - add_folder in browser.c looks like it got corrupted in -+ some CVS update. A small patch makes things work again for -+ examine_mailboxes. -+ (From: Brendan Cully ) -+ -+ * strdup.c, configure.in: strdup for unstable. -+ -+ * configure.in: [stable] Some systems may not have strdup. -+ Substitute it. -+ -+ * strdup.c: branches: 1.1.2; file strdup.c was initially added -+ on branch mutt-1-0-stable. -+ -+ * strdup.c: [stable] Some systems may not have strdup. -+ Substitute it. -+ -+ * browser.c: [stable] cosmetic fix from Brendan Cully. -+ -+1999-09-02 18:50:46 roessler (roessler) -+ -+ * editmsg.c: Don't copy the Status header to the user's edit -+ buffer - we destroy it later when copying the message back. -+ -+ * acconfig.h, configure.in, init.c, init.h, main.c: -+ [stable] Improved pgp 6.5.1 support. From Jochen Schmitt -+ . -+ -+ * doc/manual.sgml.head, Makefile.am, OPS, compose.c, curs_main.c, -+ editmsg.c, mutt.h, protos.h, send.c, sendlib.c: A new edit-message -+ feature, giving the raw message in an editor. -+ -+ * imap/auth.c: Fix a tiny signedness warning. -+ -+ * dotlock.c: Remove a superfluous label. -+ -+ * dotlock.c: [stable] remove a superfluous label. -+ -+ * po/cs.po: New czech translation. From Jiri Pavlovsky -+ . -+ -+ * doc/manual.sgml.in: [stable] It's www.sgmltools.org, not -+ www.sgml-tools.org. Noted by Heiko Schlichting. -+ -+1999-09-01 21:41:19 roessler (roessler) -+ -+ * doc/Makefile.in, Makefile.am: A couple of build process -+ and portability fixes concerning the automatically generated -+ documentation. -+ -+ * mutt.h, init.c: [stable] Fix ignore/unignore. This is a -+ back-port from the unstable branch. -+ -+ * po/ko.po: New Korean translation. From Byeong-Chan Kim -+ . -+ -+ * curs_lib.c, edit.c, hdrline.c, sendlib.c: Fix a couple of -+ possible compilation warnings. (Noted by "John C. Place" -+ .) -+ -+ * hdrline.c, sendlib.c, curs_lib.c, edit.c: [stable] Fix a couple -+ of small warnings. Noted by "John C. Place" . -+ -+ * ChangeLog: check-point commit. -+ -+ * mx.c: Don't clear the error line whenever dotlocking a file. -+ -+ * mx.h: adding a prototype. -+ -+ * curs_main.c, mailbox.h, mx.c: When the user synchronizes a -+ mail folder, do a thorough check. -+ -+1999-08-31 20:26:33 roessler (roessler) -+ -+ * po/uk.po, po/zh_TW.Big5.po, po/ru.po, po/sk.po, po/ko.po, -+ po/nl.po, po/pl.po, po/id.po, po/it.po, po/es.po, po/fr.po, -+ VERSION, po/cs.po, po/de.po, po/el.po, reldate.h, Makefile.am, -+ ChangeLog: automatic post-release commit for mutt-0.96.6 -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/ru.po, po/pl.po, -+ po/nl.po, po/ko.po, po/it.po, po/id.po, po/fr.po, po/es.po, -+ po/el.po, po/de.po, po/cs.po, VERSION, reldate.h, ChangeLog: -+ post-release commit for 1.0pre2. -+ -+ * doc/manual.sgml.tail, doc/manual.sgml.head, protos.h, thread.c, -+ OPS, curs_main.c, functions.h: Adding a -+ function. From Roland Rosenfeld . -+ -+ * curs_lib.c: Fix possible signedness problem with localized -+ y/n responses. -+ -+ * po/ru.po: New russian translation. From Michael Sobolev -+ . -+ -+ * imap.c: [stable] fix IMAP caching. -+ -+1999-08-30 16:10:45 roessler (roessler) -+ -+ * configure.in, imap/imap.c, main.c: Properly handle IMAP -+ cache files. -+ -+ * mh.c: cosmetics. -+ -+ * mh.c: [stable] Back-port various fixes from stable. -+ -+ * mh.c: Avoid a memory and temporary file leak. -+ -+ * mx.c, buffy.c, configure.in, imap.c: [stable] back-port -+ of various IMAP-related fixes. From Brendan Cully -+ . -+ -+1999-08-27 07:41:44 roessler (roessler) -+ -+ * TODO: some notes on generic limiting. -+ -+1999-08-26 20:26:56 roessler (roessler) -+ -+ * keymap.c: Change alias menu key bindings to something more -+ reasonable. -+ -+ * imap/TODO: Adding a TODO list. -+ -+ * mh.c: hrmpf. -+ -+ * doc/manual.sgml.tail: Fix the sgml-tools url. Noted by Heiko -+ Schlichting. -+ -+ * doc/manual.sgml.in: Fix the URL to the sgml-tools package. -+ Noted by Heiko Schlichting. -+ -+ * mh.c: Fixing a somewhat hypothetical error condition. -+ -+ * curs_main.c, keymap.c, pager.c, recvattach.c: IRIX fixes. -+ -+ * keymap.c, main.c, pager.c, recvattach.c, curs_main.c, edit.c: -+ Various fixes to make mutt compile on IRIX. Additionally, -+ we introduce default bindings for the key which is -+ used by xwsh for "return". Suggested by Heiko Schlichting -+ . -+ -+1999-08-25 06:33:37 roessler (roessler) -+ -+ * configure.in: We need ranlib even when we don't use IMAP. -+ -+ * compose.c: Trivial patch to make attach-message work for -+ IMAP folders. -+ -+1999-08-24 21:27:20 roessler (roessler) -+ -+ * po/de.po: Updates from Roland Rosenfeld. -+ -+ * Makefile.am: Automake clean-up. From Lars Hecking. -+ -+ * po/id.po: Updates. -+ -+ * doc/Makefile.in: build muttrc.man before installing it. -+ -+ * reldate.h, Makefile.am, VERSION, ChangeLog: automatic -+ post-release commit for mutt-0.96.5 -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/ru.po, po/pl.po, -+ po/nl.po, po/ko.po, po/it.po, po/id.po, po/fr.po, po/es.po, -+ po/el.po, po/de.po, po/cs.po, NEWS, VERSION, reldate.h, ChangeLog: -+ release-commit 1.0pre1. -+ -+ * Makefile.am: Still more bugs in the release-building process. -+ -+ * Makefile.am: *grrrr* typos. -+ -+ * po/sk.po, po/uk.po, po/zh_TW.Big5.po, po/ru.po, po/nl.po, -+ po/pl.po, po/fr.po, po/id.po, po/it.po, po/ko.po, po/cs.po, -+ po/de.po, po/el.po, po/es.po, ChangeLog: translation update. -+ -+ * Makefile.am: Some of the targets were broken. -+ -+ * Makefile.am: Another tidbit. -+ -+ * Makefile.am: Still more build-process stuff. Let's see whether -+ this automatically builds 0.96.5. -+ -+ * doc/manual.sgml, doc/muttrc.man, Muttrc: Remove some auto-built -+ files from the repository. -+ -+ * Makefile.am: Further distribution process fixes. -+ -+ * po/POTFILES.in: Make translations fit together with actual -+ source tree. -+ -+ * doc/Makefile.in, Muttrc, ChangeLog, Makefile.am: More fixes -+ to the distribution-building process; check-point commit for -+ documentation and ChangeLog. -+ -+ * doc/Makefile.in, doc/manual.sgml, doc/muttrc.man: Various -+ experimental changes to automate the distribution-building -+ process; documentation update. -+ -+ * Makefile.am: Various experimental changes to automate the -+ distribution-building process. -+ -+1999-08-23 22:12:05 roessler (roessler) -+ -+ * configure.in: Fix charmaps part of the build process. -+ -+ * copy.c: Fix an off-by-one error which lead to a segmentation -+ fault. -+ -+ * charset.c: Don't delete symbol -> character code mappings. -+ Character sets may define multiple symbols. :-( -+ -+ * imap/auth.c, imap/browse.c, imap/imap.c, imap/imap.h, -+ imap/imap_private.h, browser.c, configure.in, Makefile.am, -+ acconfig.h: Inclue GSS authentization for IMAP. -+ -+ * dotlock.c, mx.c: Remove a couple of NFS-related hacks which -+ seem to be unnecessary. -+ -+ * main.c: Fix a small typo affecting mutt -v's output. -+ -+1999-08-20 08:24:13 roessler (roessler) -+ -+ * po/fr.po: Fixed french translation. -+ -+ * imap/Makefile.am, imap/auth.c, imap/browse.c, imap/imap.c, -+ imap/imap.h, imap/imap_private.h, imap/imap_socket.h, imap/md5.h, -+ imap/md5c.c, imap/socket.c, socket.c, globals.h, imap.c, imap.h, -+ init.h, lib.h, mime.h, mutt_socket.h: Brendan Cully's latest -+ IMAP clean-up. -+ -+ * prepare: branches: 2.8.2; Brendan Cully's latest IMAP clean-up. -+ -+ * protos.h, rfc2047.c, sendlib.c, Makefile.am, base64.c, -+ configure.in, copy.c: Brendan Cully's latest IMAP clean-up. -+ -+ * doc/manual.sgml.in, NEWS, copy.c, init.h, mutt.h, sendlib.c: -+ Back-port $bounce_delivered from unstable. -+ -+ * po/fr.po: [stable] Small fixes. -+ -+1999-08-19 10:04:28 roessler (roessler) -+ -+ * sendlib.c: [stable] Fix a back-porting bug. -+ -+ * configure.in: [stable] Albert Chin-A-Young -+ suggests a different check for -lnsl -+ and -lsocket. -+ -+ * configure.in: Albert Chin-A-Young suggests a slightly different -+ check for libsocket and libnsl. -+ -+ * doc/manual.sgml.in: [stable] fix the urlview url. -+ -+ * doc/manual.sgml.head: fix the urlview url. -+ -+ * main.c: copyright message cosmetics. -+ -+ * Makefile.am, configure.in, prepare: Remove the $output.in hack, -+ and create a fake charmaps directory instead. -+ -+ * acconfig.h, configure.in: [stable] check signal.h for -+ sig_atomic_t. This should help to build this version of mutt -+ on systems such as SunOS 4.1. -+ -+ * sendlib.c: [stable] Force quotes around the boundary parameter's -+ value. -+ -+ * sendlib.c: Force quotes around the boundary parameter. -+ Another courtesy towards Outlook. -+ -+ * pgp.c: [stable] Make sure the boundary MIME parameter is the -+ last one on multipart/signed. Otherwise, Outlook will fail. -+ Pointed out by Ian Bell, Turnpike. -+ -+ * muttlib.c, pgp.c: Ian Bell (turnpike) reports that Outlook -+ Express expects the boundary parameter to be the _last_ MIME -+ parameter on a multipart/* body part, and otherwise displays -+ messages as empty. -+ -+1999-08-18 06:54:13 roessler (roessler) -+ -+ * doc/muttrc.man, doc/muttrc.man.head, doc/manual.sgml, NEWS: -+ documentation fixes. -+ -+ * commands.c: Fetch senders' keys also when decrypting a message. -+ There may be a signature. -+ -+ * main.c: Don't try to create $maildir if it's an IMAP folder. -+ -+1999-08-17 20:04:07 roessler (roessler) -+ -+ * reldate.h: :-( -+ -+ * reldate.h: *grmbls* -+ -+ * po/de.po, ChangeLog, VERSION: post-release commit for 0.96.4. -+ -+ * po/de.po, VERSION, ChangeLog: post-release commit for 0.95.7. -+ -+ * doc/manual.sgml, doc/muttrc.man, Muttrc: ispell's default path. -+ -+ * postpone.c: Fixing a mutt -p segfault. -+ -+ * doc/mutt.man, main.c: cosmetics; mention warranties in the -+ manual page. -+ -+1999-08-15 19:59:09 roessler (roessler) -+ -+ * compose.c: Make attach-message work with IMAP folders. -+ -+ * po/cs.po: New CS translation. -+ -+ * doc/Makefile.in, doc/manual.sgml, doc/muttrc.man, mutt.h, mx.c, -+ pgp.c, pgp.h, pgpinvoke.c, prepare, send.c, Makefile.am, Muttrc, -+ NEWS, README.SECURITY, browser.c, browser.h, commands.c, copy.c, -+ curs_main.c, globals.h, init.c, init.h, main.c: Various changes -+ added over the last week: -+ -+ - $delete_untag - creation of "application/pgp" messages - -+ an attempt to fix prepare. - Browser format changes -+ -+ * dotlock.h: cosmetics. -+ -+ * dotlock.c: [stable] take dotlock.c from unstable. -+ -+ * dotlock.c: Commit remaining changes. -+ -+ * copy.c, mh.c, mutt.h: Remove ugly mh-synching kludge. -+ -+ * dotlock.c, dotlock.h: Really fix $save_empty, even when the -+ dotlocking code is compiled into mutt. -+ -+ * dotlock.c, dotlock.h: [stable] Fix $save_empty even when the -+ dotlocking code is linked into mutt. -+ -+1999-08-09 19:03:12 roessler (roessler) -+ -+ * ChangeLog, ChangeLog: check-point commit. -+ -+ * po/sk.po, po/uk.po, po/zh_TW.Big5.po, po/ko.po, po/nl.po, -+ po/pl.po, po/ru.po, po/de.po, po/el.po, po/es.po, po/fr.po, -+ po/id.po, po/it.po, po/cs.po: update-po. -+ -+ * po/zh_TW.Big5.po: [stable] Fixing a small typo in the Chinese -+ translation. -+ -+ * po/zh_TW.Big5.po, po/uk.po, po/sk.po, po/ru.po, po/pl.po, -+ po/nl.po, po/ko.po, po/it.po, po/id.po, po/fr.po, po/el.po, -+ po/es.po, po/de.po, po/cs.po: [stable] Adding the new polish -+ translation; general "make update-po". -+ -+ * Muttrc, doc/muttrc.man, doc/muttrc.man.head, main.c, -+ po/zh_TW.Big5.po: Various fixes. Additionally, mutt will now -+ create the $folder directory when started in curses mode and if -+ it doesn't exist. -+ -+1999-08-08 14:57:13 roessler (roessler) -+ -+ * po/zh_TW.Big5.po: new chinese translation. -+ -+ * po/zh_TW.Big5.po: New chinese translation. -+ -+ * Makefile.am: Fix order of some dependencies. -+ -+ * Makefile.am: Fix keymap_defs.h dependency. -+ -+ * po/it.po: Fix a translation string in it.po. -+ -+ * po/it.po: Fixing a message. From Marco. -+ -+ * doc/muttrc.man, init.h: Include complete documentation -+ regardless of actual features. -+ -+ * doc/manual.sgml.in, doc/manual.sgml.tail, doc/mutt.man, -+ doc/mutt.man.in, doc/muttrc.man, doc/muttrc.man.head, -+ doc/muttrc.man.tail, contrib/Makefile.in, contrib/gpg.rc, -+ doc/Makefile.in, doc/devel-notes.txt, doc/dotlock.man, -+ doc/dotlock.man.in, doc/manual.sgml, doc/manual.sgml.head, -+ Makefile.am, Muttrc.head, Muttrc.in, NEWS, configure.in, init.h, -+ makedoc.c: Documentation updates; autogeneration of documentation -+ from init.h. -+ -+1999-08-04 19:58:13 roessler (roessler) -+ -+ * NEWS: documentation to prepare the next release. -+ -+ * doc/dotlock.man.in, dotlock.c, dotlock.h, mbox.c, mx.c, mx.h: -+ [stable] Fix $save_empty. -+ -+ * ChangeLog: ChangeLog. -+ -+ * NEWS, protos.h, send.c: Various fixes; documentation. -+ -+ * doc/dotlock.man.in: Document the -d option. -+ -+ * dotlock.h, mbox.c, mx.c, mx.h, dotlock.c: Fix $save_empty. -+ -+1999-07-29 09:17:29 roessler (roessler) -+ -+ * doc/manual.sgml.in: Remove references to the old PGP -+ configuration interface. Noted by Hanno Wagner . -+ -+ * browser.c, complete.c, enter.c, imap.c, imap.h, main.c, -+ protos.h: Brendan Cully's latest IMAP patches. -+ -+1999-07-28 20:40:49 roessler (roessler) -+ -+ * doc/manual.sgml.in: Fix "lists" documentation. From Jeremy -+ Blosser . -+ -+ * doc/manual.sgml.in: Fix the description of the lists command. -+ Patch provided by Jeremy Blosser . -+ -+ * doc/PGP-Notes.txt, pgp.h, pgpinvoke.c, init.c, init.h, pgp.c: -+ PGP 6 support. -+ -+ * doc/manual.sgml.in, doc/mutt.man.in, doc/manual.sgml.in, -+ doc/mutt.man.in: Documentation fixes from Jeremy Blosser. -+ -+ * mh.c: Replarse mh message' headers when updating them. -+ -+ * mh.c: Re-parse mh messages when committing them to disk. -+ The structure may have changed. -+ -+ * rfc822.h, commands.c, init.h, pgp.c, pgp.h, pgpinvoke.c: Add a -+ hook which enables us to fetch PGP keys from servers on demand. -+ Look out for pkspxy. :-) -+ -+ * hdrline.c: Enable the use of %F in conditionals. From Aaron -+ Schrab . -+ -+1999-07-26 21:04:53 roessler (roessler) -+ -+ * dotlock.c: impose a hard limit on the number of locking -+ attempts. -+ -+ * dotlock.c: Impose a hard limit on dotlock attempts. -+ -+ * recvattach.c, gnupgparse.c, pgpinvoke.c: Fix an error message. -+ Also, close Debian bug #37394 for stable. -+ -+ * acconfig.h, configure.in: Check for gpgm. -+ -+ * recvattach.c: Make an error message ready for translation. -+ From Gero Treuner. -+ -+ * Makefile.am: Add missing dependencies for pgpring. Fix from -+ David Ellement -+ -+ * Makefile.am: Create keymap_defs.h when it isn't present. -+ Fix from Lars Hecking . -+ -+ * Makefile.am: Generate keymap_defs.h when it isn't present. -+ Fix proposed by Lars Hecking . -+ -+ * doc/manual.sgml.in, handler.c, init.h, mutt.h, parse.c: Undo -+ the content-disposition changes. They don't merge well with -+ operations such as printing, and need some more thought. -+ -+ * doc/manual.sgml.in, init.h, mutt.h, parse.c, handler.c: When an -+ attachment's content-disposition is different from "inline", and -+ if the user sets the use_cdisp option, don't auto_view this part. -+ -+ * ChangeLog: checkpointing. -+ -+ * flags.c, protos.h, recvattach.c: When replying to message/rfc822 -+ type attachments, Context statistics would go out of order. -+ Problem noted by Johan van Selst . -+ -+ * flags.c, protos.h, recvattach.c: When replying to a -+ message/rfc822 attachment, the Context statistics would get out -+ of order. Problem noted by Johan van Selst . -+ -+ * curs_lib.c: Dynamically allocate the unget buffer. Fixes Debian -+ bug #41042. From Gero Treuner. -+ -+ * curs_lib.c: Dynamically allocate the unget buffer. Fixes Debian -+ bug #41042. From Gero Treuner . -+ -+ * curs_main.c: Fix read_only in folder-hooks. -+ -+ * curs_main.c, ChangeLog: The following: -+ -+ folder-hook !asdf unset read_only folder-hook asdf -+ set read_only -+ -+ wouldn't work. Fix from Gero Treuner -+ . -+ -+ * browser.h, imap.c, imap.h, mx.c, postpone.c, browser.c: -+ Assorted IMAP fixes. From Brendan Cully , -+ message <19990725150346.A19750@xanadu.kublai.com>. -+ -+ * parse.c, rfc2047.c, rfc2231.c, rfc2231.h, sendlib.c, -+ Makefile.am, TODO, copy.c, init.h, mutt.h: Implement RFC 2231. -+ -+ * ChangeLog: *** empty log message *** -+ -+ * commands.c: Fix a missing #ifdef. From Matt Armstrong -+ . -+ -+ * doc/devel-notes.txt: Add some notes. From Matt Armstrong -+ . -+ -+1999-07-24 14:55:45 roessler (roessler) -+ -+ * rfc2047.c: Add some sanity checks to the RFC 2047 decoder. -+ From "Alexander V. Lukyanov" . -+ -+1999-07-23 06:31:09 roessler (roessler) -+ -+ * parse.c: There was some code missing about TYPEMODEL. Noted by -+ Brian Salter-Duke . -+ -+1999-07-22 14:56:44 roessler (roessler) -+ -+ * mutt.h: Fix content-type's widths. -+ -+1999-07-21 13:02:12 roessler (roessler) -+ -+ * recvattach.c: When forwarding or replying to attachments, -+ use the proper time stamp for From_ lines of Fccs. Note: This -+ code may need some clean-up, it's horribly slow. -+ -+ * buffy.c: Fix compilation problem for non-imap systems. -+ -+ * compose.c: *grr* avoid a warning about /* in a comment. -+ -+ * compose.c: call mutt_update_encoding() after changing an -+ attachment's content type. -+ -+1999-07-20 20:09:13 roessler (roessler) -+ -+ * send.c, sendlib.c, protos.h: Use $from for resent-from headers -+ when bouncing messages. -+ -+ * imap.c: Fix from Gero Treuner. -+ -+ * init.c: Fix value completion for DT_ADDR variables. While we -+ are on it, proper quoting is added. -+ -+ * init.h, send.c, alias.c, globals.h, init.c: As Aaron Schrab -+ noted, patch-0.95.6.tlr.reverse_name.1 broke the use of my_hdr -+ from send-hooks. This patch introduces a new variable $from -+ which can be used to use a default sender address; to make this -+ possible, a new variable class DT_ADDR is defined. -+ -+ We now have the following algorithm for determining the from -+ address: -+ -+ - $from is used as the default from address, if defined. -+ Otherwise, the local user name and (if the user wishes so) -+ the local domain are used. -+ - This address can be overridden by $reverse_name, if set. -+ - Now, send-hooks are evaluated. - Afterwards, user headers -+ are evaluated. In this step, the from -+ header can be overridden using my_hdr From:. - When there is -+ no real name, $realname is used for it. Note that, -+ when the default from header is used and $from defines a real -+ name, it takes precedence over $realname. -+ -+ * buffy.c, complete.c, imap.c, imap.h: Bugs fixed * Mutt sometimes -+ forgets that IMAP folders with new mail have new -+ mail. * On some common IMAP servers, Mutt erroneously insists -+ that the -+ current folder has new mail. * Mutt constantly polls the -+ server for new messages, -+ disregarding the imap_checkinterval option. -+ -+ New features * tab-completion of IMAP folders. Not yet namespace -+ aware, though it -+ will work within an alternate namespace (eg won't complete -+ #ft -> #ftp, but will complete #ftp/pu -> #ftp/pub). Some -+ tweaking of the browser was necessary to get it to cooperate -+ with completion. Some remains to be done. -+ -+ (From: From: Brendan Cully ) -+ -+ * doc/manual.sgml.in, globals.h, init.h, send.c, Muttrc.in: -+ Remove the $in_reply_to configuration variable. -+ -+ * doc/manual.sgml.in, globals.h, init.h, send.c, Muttrc.in: -+ Remove the $in_reply_to configuration variable and always use -+ the message-ID for that header. -+ -+ * pgp.c: patch-0.95.6.pgperror.1 -+ -+ * po/de.po, curs_main.c, pager.c, po/de.po, curs_main.c, pager.c: -+ patch-0.95.6.gettext.1.gz, from Gero Treuner. -+ -+ * pager.c, pager.c: patch-0.95.6.search_in_help.1, from Gero -+ Treuner. -+ -+ * po/sk.po: New sk translation. -+ -+ * alias.c, enter.c: patch-0.95.6.alias_compl.1.gz, from Gero -+ Treuner -+ -+1999-07-19 19:18:05 roessler (roessler) -+ -+ * configure.in, pgppubring.c: Fix compilation problems with -+ SunOS 4. From Lars Hecking. -+ -+ * po/sk.po: new sk translation. -+ -+ * buffy.c: Consider empty folders to be non-existent for buffy's -+ purposes. -+ -+1999-07-06 22:57:08 roessler (roessler) -+ -+ * send.c, sendlib.c, signal.c, system.c, curs_lib.c, curs_main.c, -+ globals.h, menu.c, mutt.h, pager.c, pattern.c, protos.h, -+ attach.c, commands.c, compose.c: Applying Liviu Daia's signal -+ handling patches. They work fine with unstable for months now, -+ so we may wish to use them with stable. -+ -+ * po/zh_TW.Big5.po, po/el.po, configure.in: Greek and Chinese -+ translations for unstable. -+ -+ * po/zh_TW.Big5.po: branches: 1.1.2; file zh_TW.Big5.po was -+ initially added on branch mutt-1-0-stable. -+ -+ * po/zh_TW.Big5.po: Chinese translation for stable. -+ -+ * configure.in: Adding chinese (big5) translation. -+ -+ * po/el.po: branches: 1.1.2; file el.po was initially added on -+ branch mutt-1-0-stable. -+ -+ * po/el.po, configure.in: Adding greek translation from Fanis -+ . -+ -+ * mx.c, mx.h, parse.c, pop.c, postpone.c, protos.h, recvattach.c, -+ sendlib.c, attach.c, buffy.c, copy.c, lib.c, mailbox.h, mh.c: -+ New mh and maildir folder writing code. Back-port from unstable. -+ -+ * color.c: Fix color problem noted by Todd Larson. From unstable. -+ -+ * color.c: Fixing a string buffer problem noted by Todd Larason -+ . -+ -+ * imap.c: Try creating an IMAP folder before writing to it. -+ Hack from "Neulinger, Nathan R." . -+ -+ * contrib/pgp5.rc, contrib/pgp2.rc: Fix various bugs. -+ -+1999-07-01 11:22:22 roessler (roessler) -+ -+ * contrib/gpg.rc: Fix gpg invocation. Noted by Werner Koch. -+ -+ * mx.c: Fix a small imap-related bug. -+ -+ * recvattach.c, sendlib.c, buffy.c, copy.c, curs_lib.c, -+ globals.h, gnupgparse.c, hdrline.c, init.c, init.h, lib.c, -+ lib.h, mailbox.h, mh.c, mutt.h, mx.c, mx.h, parse.c, pattern.c, -+ pgpkey.c, pgppubring.c, pop.c, postpone.c, protos.h, attach.c: -+ Various patches from last week, including: -+ -+ - new mh/maildir access code. - subscribe/unsubscribe - -+ various fixes. -+ -+1999-06-14 21:20:42 roessler (roessler) -+ -+ * mutt.h, parse.c, sendlib.c: - Handle CRLF properly in non-text -+ MIME parts. - Correctly parse attachments with CRLF line endings, -+ but without a -+ trailing CRLF. -+ -+ * alias.c, enter.c: Completion fixes from Gero Treuner -+ . -+ -+1999-06-10 09:30:39 roessler (roessler) -+ -+ * alias.c, commands.c, curs_main.c, pager.c, protos.h: Use the -+ same address with take-alias and display-address. -+ -+1999-06-09 17:17:53 roessler (roessler) -+ -+ * recvattach.c: Fix the fix. Most of it was wrong. -+ -+ * recvattach.c: There was bogus bug-fixing in the last fix. -+ -+ * recvattach.c: Fix attachment forwading. Same problem as -+ in unstable. -+ -+ * recvattach.c: Fix attachment forwarding. The leading newline -+ for certain MIME boundaries was missing. *grrrr* -+ -+ * send.c: Give reverse_name precedence over my_hdr From: -+ -+1999-06-08 18:30:42 roessler (roessler) -+ -+ * acconfig.h, configure.in, pgppubring.c, protos.h: Portability -+ patches for SunOS 4.1. From Lars Hecking. -+ -+ * curs_main.c, curs_main.c: Fix "Tab" behaviour when returning -+ from the pager. -+ -+ * mutt.h, pattern.c, send.c, sendlib.c, commands.c, copy.c, -+ copy.h, handler.c, imap.c, attach.c: Don't do charset conversions -+ when they aren't necessary. -+ -+ Back-port from unstable. -+ -+ * pgp.c, pgpinvoke.c, pgpkey.c, pgplib.h, pgppubring.c, -+ recvattach.c, Makefile.am, commands.c, compose.c, configure.in, -+ hdrline.c, init.c, init.h, mutt.h: - Add a $weed option. - -+ Add out-of-band reporting of signature status. -+ -+1999-06-03 21:48:24 roessler (roessler) -+ -+ * curs_main.c: Another header weeding change. Experimental. -+ -+ * commands.c, init.h, mutt.h, send.c: Experimental: Use OPTWEED -+ for _all_ header weeding throughout mutt. -+ -+ * contrib/Makefile.in, Makefile.am, NEWS, VERSION, reldate.h, -+ ChangeLog: post-release commit 0.96.3. -+ -+ * po/uk.po, po/sk.po, po/ru.po, po/pl.po, po/nl.po, po/ko.po, -+ po/it.po, po/id.po, po/fr.po, po/es.po, po/de.po, po/cs.po, -+ gnupgparse.c, reldate.h, NEWS, VERSION, ChangeLog: release -+ commit 0.95.6. -+ -+ * po/pl.po, po/ko.po, po/fr.po, po/de.po, po/cs.po: Latest -+ chagnes. -+ -+ * doc/PGP-Notes.txt, contrib/pgp2.rc, contrib/pgp5.rc, -+ pgppubring.c: Hardwire some mechanisms for finding secret and -+ public key-rings. This way, we need to hard-wire less stuff in -+ the various configuration files, making the use of PGP with mutt -+ a bit simpler again. -+ -+ * contrib/pgp2.rc: Another little fix. -+ -+ * contrib/pgp2.rc: ups, wrong order of arguments when verifying -+ signatures. -+ -+ * doc/PGP-Notes.txt: Document the new PGP configuration interface. -+ -+ * contrib/gpg.rc, contrib/pgp2.rc, contrib/pgp5.rc, pgp.c, pgp.h, -+ pgpewrap, pgpinvoke.c, pgpkey.c, pgplib.c, pgplib.h, pgppubring.c, -+ Makefile.am, compose.c, configure.in, gnupgparse.c, init.c, -+ init.h, mutt.h: Experimental: New PGP invocation interface. The -+ invocations are done through formats, so all this should fit -+ more cleanly into mutt now. -+ -+1999-06-02 18:52:19 roessler (roessler) -+ -+ * Makefile.am, extlib.c, init.c, lib.c, lib.h, mutt.h, muttlib.c, -+ protos.h: Major cutting & pasting: We now have a "real" library -+ in lib.c which can be linked against external programs without -+ much effort. -+ -+ * po/ko.po, po/pl.po, po/es.po, po/it.po, po/de.po: various -+ updates. -+ -+1999-06-01 14:52:09 roessler (roessler) -+ -+ * flags.c, mh.c, curs_main.c: Back-porting the maildir fixes -+ from 0.96.2. -+ -+1999-05-31 16:11:32 roessler (roessler) -+ -+ * VERSION: Preparing pre-release for 0.95.6. -+ -+ * po/uk.po, po/sk.po, po/ru.po, po/pl.po, po/nl.po, po/ko.po, -+ po/it.po, po/id.po, po/fr.po, po/es.po, po/de.po, po/cs.po: -+ translation updates -+ -+ * hook.c, pattern.c, pgp.c, send.c: Backporting fixes from -+ unstable. -+ -+ * pattern.c, pgp.c, send.c, hook.c: Minor bug-fixes. -+ -+1999-05-21 15:55:27 roessler (roessler) -+ -+ * po/ko.po: Adding the Korean translation. -+ -+ * configure.in: Korean translation. -+ -+ * po/ko.po: branches: 1.1.2; Korean translation. -+ -+ * configure.in: Korean translation. -+ -+1999-05-18 19:22:55 roessler (roessler) -+ -+ * imap.c, imap.c: Latest IMAP fixes from Brandon. -+ -+ * imap.c: The current code wasn't asking for the capabilities -+ of the server in the case where the user is using PREAUTH. -+ -+ * imap.c: The current IMAP code wasn't asking for the capabilities -+ of the server in the case where the user is using PREAUTH. -+ -+1999-05-16 06:26:11 roessler (roessler) -+ -+ * po/it.po: New IT translation. -+ -+ * pgpkey.c: Add a couple of token delimiters when constructing -+ hints. This way, addresses like "Chr. xyz" -+ will match key IDs like xyz . -+ -+ * handler.c: Fix base64 decoding. -+ -+1999-05-06 08:29:17 roessler (roessler) -+ -+ * curs_main.c, flags.c, mh.c: Fixing more maildir cursor problems. -+ -+1999-05-05 20:33:57 roessler (roessler) -+ -+ * imap.c: The latest IMAP fixes. -+ -+ * imap.c: Fixing imap_check_mailbox(). From Brandon Long. -+ -+ * imap.c: Mutt would lose user-set "N" flags. -+ -+1999-05-03 16:17:29 roessler (roessler) -+ -+ * gnupgparse.c: gnupg gives reasonable trust values now. -+ -+ * po/uk.po, po/sk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, -+ po/id.po, po/fr.po, po/es.po, po/de.po, po/cs.po, keymap.c, -+ menu.c, send.c: Various fixes from last week. -+ -+ * keymap.c, menu.c, pgpkey.c, send.c: Various fixes. -+ -+1999-04-23 09:01:42 roessler (roessler) -+ -+ * reldate.h: ups, this should also be updated for 0.95.5 final. -+ -+ * ChangeLog: preparing the final 0.95.5. -+ -+ * po/uk.po, po/sk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, -+ po/id.po, po/fr.po, po/es.po, po/de.po, po/cs.po: New translations -+ and typo fixes. -+ -+ * OPS: Fix a documentation typo. -+ -+ * po/de.po: translation fixes from Roland and Gero. -+ -+1999-04-22 10:21:41 roessler (roessler) -+ -+ * doc/manual.sgml.in: Document %_. -+ -+ * menu.c: Fix redraws. Back-port from unstable. -+ -+ * lib.c: Add "_" as an expando option. -+ -+ * imap.h, init.h, mutt.h, mutt_socket.h, socket.c, imap.c: -+ IMAP update from Brandon Long. -+ -+ * send.c: Fix FCC-related SNAFU in the ci_send_message() -+ spaghetti. -+ -+1999-04-20 19:26:28 roessler (roessler) -+ -+ * sendlib.c: [stable] fix timezone snafu. -+ -+ * sendlib.c: Fix a time zone snafu. -+ -+ * po/ru.po, po/sk.po, po/uk.po, po/fr.po, po/id.po, po/it.po, -+ po/nl.po, po/pl.po, po/cs.po, po/de.po, po/es.po, VERSION, -+ reldate.h, ChangeLog: Preparing 0.96.2. -+ -+ * po/uk.po, po/sk.po, po/ru.po, po/pl.po, po/nl.po, po/id.po, -+ po/it.po, po/fr.po, po/es.po, po/de.po, po/cs.po, VERSION, -+ reldate.h, ChangeLog: preparing 0.95.5 -+ -+1999-04-12 21:02:35 roessler (roessler) -+ -+ * recvattach.c: more multipart/alternative handling. -+ -+ * recvattach.c: Change multipart handling when receiving messages. -+ -+ * compose.c: Clean-up, from Vikas. -+ -+ * parse.c: typo. -+ -+ * parse.c: us-ascii is the default character set for text -+ attachments we receive. -+ -+ * compose.c, sendlib.c: Fix default character set setting when -+ attaching text files. -+ -+ * imap.c: Fix an IMAP quoting problem. Essentially from Randall -+ Nortman . -+ -+ * po/sk.po, po/id.po, configure.in: new languages: id, sk. -+ -+ * po/id.po, po/sk.po: branches: 1.1.2; New translations: id, sk. -+ -+ * configure.in: New translations: id, sk. -+ -+1999-03-31 06:35:03 roessler (roessler) -+ -+ * charset.c: Stupid error. -+ -+ * charset.c, charset.h: Another small charset optimization. -+ -+ * charset.h, handler.c, charset.c: A couple of optimizations, -+ most notably for the special case of a non-prefix state. -+ -+1999-03-30 23:50:33 roessler (roessler) -+ -+ * charset.c, charset.h, handler.c: This patch removes at least -+ some of the horrible utf-8 kluges in charset.c. The new DECODER -+ framework is currently only used in handler.c, and there in -+ a horribly inefficient manner. We should use greater blocks -+ of data, which would be much more efficient than what we are -+ currently doing. -+ -+ Most of the other charset-related code still uses the old -+ mutt_display_char() &friends interface, which is actually ok as -+ long as you don't try to handle multibyte character sets. -+ -+ The most notable change should be the one to -+ mutt_get_translation(): It will delay the loading and parsing -+ of character set information files until it's really needed, -+ catching a huge amount of standard cases. As a side effect, -+ this will make "iso tagged as ascii" "work" again, as long as -+ both sides use the same iso character set. -+ -+ * send.c: resort headers when forward-decoding them with weed -+ switched on. -+ -+ * pager.c: Fix a pager failure for long messages. From Liviu. -+ -+ * pager.c: Fix pager failure for long messages, changing two -+ shorts to ints. From Liviu Daia. -+ -+ * recvattach.c: Add some user feedback to attachment forwarding. -+ From Vikas. -+ -+1999-03-25 19:46:52 roessler (roessler) -+ -+ * doc/manual.sgml.in, init.h, pgpkey.c, sort.h, Muttrc.in, -+ init.c: Roland's sort_keys patch. -+ -+1999-03-24 20:35:38 roessler (roessler) -+ -+ * doc/manual.sgml.in, Muttrc.in, recvattach.c: Vikas' latest -+ version of attachment forwarding. -+ -+ * recvattach.c: patch-0.96.1.vikas.forward_attachment.2 -+ -+ * main.c: Only exit with "no recipients specified", when -+ $auto_edit is set. -+ -+1999-03-23 20:21:50 roessler (roessler) -+ -+ * postpone.c, recvattach.c, init.h, mutt.h: Vikas' -+ forward_attachment patch. -+ -+1999-03-22 16:00:39 roessler (roessler) -+ -+ * doc/manual.sgml.in, pgppubring.c, gnupgparse.c, pgp.h, pgpkey.c: -+ PGP key creation time fix by Roland Rosenfeld. -+ -+1999-03-17 14:45:10 roessler (roessler) -+ -+ * recvattach.c, recvattach.c: Vikas' attach_tag patch. -+ -+1999-03-16 21:42:06 roessler (roessler) -+ -+ * thread.c, configure.in: bug fixes. -+ -+ * thread.c: Detect thread loops. -+ -+1999-03-15 15:32:19 roessler (roessler) -+ -+ * doc/manual.sgml.in, copy.c, init.h, mutt.h, sendlib.c: Add -+ $bounce_delivered. -+ -+ * edit.c: another digital unix compile problem. -+ -+ * main.c: _Fix_ the compile problems, don't install new ones. -+ -+ * send.c: Cleanly handle fcc when the user unsets it and the -+ message is postponed. -+ -+ * main.c: Fix compilation problems under digital unix. -+ -+ * configure.in: Fix sendmail autodetection. -+ -+ * color.c: Fix colorN, N > 7 for Slang's curses emulation. From -+ Vikas. -+ -+1999-03-09 13:34:52 roessler (roessler) -+ -+ * menu.c: another menu.c fix from Kim DeVaughn. -+ -+ * send.c, menu.c, handler.c: Fixes. -+ -+ * send.c, menu.c, handler.c: handler.c: Properly handle -+ message/external-body expiry. menu.c: Small fix from -+ Liviu. send.c: Honor confirm_create for FCCs. cvs: -+ ---------------------------------------------------------------------- -+ -+1999-03-04 08:00:38 roessler (roessler) -+ -+ * Makefile.am: post-postrelease commit. -+ -+1999-03-03 20:06:33 roessler (roessler) -+ -+ * rfc2047.c: ups. -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po, ChangeLog: releasing 0.95.4. -+ -+ * sendlib.c, rfc2047.c, reldate.h, curs_main.c, VERSION, -+ ChangeLog: releasing 0.96.1. -+ -+ * reldate.h, regex.c, VERSION, Makefile.am, ChangeLog: release -+ preparations; back-port a couple of things from unstable. -+ -+ * curs_main.c: Vikas' resort_index.3. -+ -+ * sendlib.c, imap.c, from.c, curs_main.c: from.c: Backport -+ from unstable. others: latest imap related patches. -+ -+1999-03-02 22:13:30 roessler (roessler) -+ -+ * curs_main.c, charset.c: Some small fixes from Vikas. -+ -+ * parse.c, init.h, imap.c, globals.h: Brandon Long's latest -+ IMAP fixes. -+ -+ * parse.c: Latest IMAP-related fix from Brandon Long. -+ -+ * thread.c: Correctly handle messages which have themselves in -+ their references header. -+ -+ * thread.c: Properly handle messages which have themselves in -+ "References". -+ -+1999-02-28 08:30:19 roessler (roessler) -+ -+ * rfc822.c: Fix a memory leak. From Liviu. -+ -+ * rfc822.c: Fix a memory leak. From Liviu. -+ -+ * rfc1524.c, mutt.h, lib.c, attach.c: Fix the $TMPDIR raace -+ noted by Hamish Moffat. -+ -+ * rfc1524.c, mutt.h, lib.c, attach.c: Fix a $TMPDIR race -+ condition. -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po: post-snapshot commit. -+ -+1999-02-26 15:42:07 roessler (roessler) -+ -+ * doc/manual.sgml.in, send.c, regex.c, mutt.h, init.h: Adding -+ pgp_replyencrypt. -+ -+1999-02-25 06:58:01 roessler (roessler) -+ -+ * from.c: parse some more from_ lines. Before, there were -+ problems with cases like this: -+ -+ >From <@x400host:"/G=Bob/S=Allinson/CN=Has -+ embedded spaces/OU=X400HOST/ -+ >OU=xxxx/O=xxx/PRMD=xxxxx/ADMD=XXXXXX/C=GB/"@x400host> >Tue Feb -+ 23 09:44:52 1999 -+ -+ Problem noted by johnm@sirius3.demon.co.uk -+ -+1999-02-23 20:38:49 roessler (roessler) -+ -+ * imap.c: fix a segfault. From Brandon. -+ -+1999-02-22 12:37:43 roessler (roessler) -+ -+ * curs_main.c: Vikas' latest collapse fix. -+ -+ * curs_main.c: collapse fix from Vikas. -+ -+ * mbox.c, imap.c: Avoid reading past actual headers when reopening -+ mailboxes. From Daniel Eisenbud. -+ -+ * mbox.c, imap.c: Avoid reading past the end of actual headers -+ when reopening folders. From Daniel Eisenbud. -+ -+ * pgp.c: Don't override base64 by quoted-printable. -+ -+ * menu.c: replace clear() by clrtobot(). -+ -+ * pgp.c: Currently, PGP signing messages will force -+ quoted-printable encoding even if we should use base64. -+ -+1999-02-19 07:38:17 roessler (roessler) -+ -+ * sendlib.c: Don't qp-encode multiparts. ugh. -+ -+ * sendlib.c: ... message and multipart, not just message. -+ -+ * sendlib.c, mutt.h, init.h: Add $encode_from: This option causes -+ mutt to trigger quoted-printable encoding for any non-multipart -+ attachments which have ^From at the beginning of a line. -+ Note that we don't trigger on ^From_ since either procmail or -+ sendmail is >-escaping on ^From, and note that this won't help -+ against sites where sendmail has the '9' flag set on the local -+ mailer, as these sites will inevitably transform to 8bit (sic!). -+ -+1999-02-18 23:14:36 roessler (roessler) -+ -+ * pgp.c, mutt.h, init.h: Add retainable signatures. This should -+ work nicely with encrypted mailing lists. -+ -+ * mx.c, init.h, globals.h, configure.in, acconfig.h, Makefile.am: -+ Introduce $dotlock_program: This makes the mutt_dotlock program's -+ location a run-time configuration variable. -+ -+ * send.c, mutt.h, init.h: Introduce $honor_followup_to. The user -+ will now be asked whether he wants to honor mail-followup-to -+ or not. -+ -+ * curs_main.c: properly handle OP_FLAG_MESSAGE when applied to -+ tagged messages. -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po: Updated translations. -+ -+ * contrib/sample.mailcap: Fix the text/html entry. -+ -+ * regex.c, headers.c, copy.h, configure.in: copy.h: Some flags -+ were used with multiple meanings. bad. configure.in, regex.c: -+ Make regex autoconfiguration work. headers.c: expand aliases -+ on the from header. -+ -+ * headers.c: Expand aliases on the From header. -+ -+1999-02-17 15:48:05 roessler (roessler) -+ -+ * doc/mutt.man.in: Fix the URL. -+ -+ * sendlib.c, init.h: User-Agent, not X-Mailer. -+ -+ * po/fr.po: update. -+ -+ * copy.h: Some of the M_CM flags erroneously had been defined -+ to have the same value. _Very_ bad. -+ -+ * contrib/sample.mailcap: Correct the netscape text/html entry. -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po, po/Makefile.in.in, sendlib.c, -+ send.c, regex.c, pager.c, mutt.h, init.h, configure.in, -+ acconfig.h, Muttrc.in, Makefile.am: - Makefile.am: Fix the dist -+ target to include all necessary files. - po/fr.po: New French -+ translation. (-> stable!) - Add the new options to Muttrc.in. -+ - regex.c, configure.in: include config.h from regex.c, and handle -+ alloca in a more intelligent way than before. (Currently, -+ we just mis-handle it.) Port this to stable and test it! -+ - po/cs.po: update cs.po. - po/de.po, po/nl.po: updated versions -+ from Roland and Boris. - pager.c: Vikas' grok_ansi fix. - -+ po/Makefile.in.in: keymap_defs is always in po/.. - from Lars -+ Hecking. -+ -+1999-02-12 11:23:17 roessler (roessler) -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po, reldate.h, ChangeLog: post-release -+ commit for 0.95.3. -+ -+ * po/nl.po, reldate.h, ChangeLog: post-release commit for 0.96. -+ -+1999-02-11 22:52:03 roessler (roessler) -+ -+ * imap.c, VERSION: another imap-related fix. -+ -+ * pattern.c: another signal fix from liviu. -+ -+ * imap.c: Remove a superfluous if statement. -+ -+ * imap.c: ups, that one was bad. -+ -+ * imap.c: The HEADER structure doesn't have a mailcap component -+ any more. -+ -+ * imap.c: The HEADER structure doesn't have a mailcap component -+ any more. Noted by Johan van Selst . -+ -+ * signal.c, sendlib.c, pattern.c, pager.c, mutt.h, -+ menu.c, globals.h, curs_main.c, curs_lib.c: -+ patch.mutt-0.95.1i.ld.signals.1-2.gz -+ -+ * po/nl.po: new nl translation. -+ -+ * pattern.c, curs_main.c: pattern.c: Collapse patch from Vikas. -+ -+ * po/nl.po: New nl translation. -+ -+ * pattern.c, curs_main.c: curs_main.c: Check whether the -+ user pressed a number before putting it back onto the stack. -+ (OP_JUMP) pattern.c: Vikas' latest fix. -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po: Updating the po files. -+ -+ * doc/manual.sgml.in, doc/Makefile.in: Install README.SECURITY -+ in the doc directory, document mailcap_sanitize. -+ -+ * reldate.h, prepare, configure.in, VERSION, Makefile.am, -+ $output.in: Preparing for 0.96: $output.in was real fun in the -+ dist target. *argh* -+ -+ * po/uk.po, po/ru.po, po/pl.po, po/nl.po, po/it.po, po/fr.po, -+ po/es.po, po/de.po, po/cs.po, doc/manual.sgml.in, doc/Makefile.in, -+ reldate.h, VERSION, NEWS, Makefile.am, ChangeLog: [stable] -+ post-release commit for 0.95.2. -+ -+ * README.SECURITY: Add a note on how to write mailcap files. -+ -+ * README.SECURITY: branches: 2.1.2; Add a note on how to write -+ mailcaps. -+ -+1999-02-10 23:12:27 roessler (roessler) -+ -+ * browser.c: Ups, this one needed a #ifdef USE_IMAP. -+ -+ * imap.c, browser.c: Some patches Brandon Long posted to -+ comp.mail.mutt. -+ -+ * rfc1524.c, protos.h, lib.c, handler.c, attach.c, rfc1524.c, -+ protos.h, lib.c, handler.c, attach.c: Fix the security fix. -+ -+ * rfc1524.c, mutt.h, lib.c, init.h: [stable] $mailcap_sanitize -+ -+ * rfc1524.c, mutt.h, lib.c, init.h: [unstable] $mailcap_sanitize. -+ -+ * system.c, signal.c, sendlib.c, send.c, protos.h, mutt.h, -+ globals.h, curs_lib.c, compose.c, commands.c, attach.c, TODO: -+ patch.mutt-0.95.1i.ld.signals.1: A major redesign of how child -+ processes are invoked. From Liviu. -+ -+1999-02-09 23:54:03 roessler (roessler) -+ -+ * sort.c, mx.c, mutt.h, mh.c, mbox.c, curs_main.c, ChangeLog, -+ sort.c, mx.c, mutt.h, mh.c, mbox.c, curs_main.c: Vikas' latest -+ collapse fix. -+ -+ * prepare: Small prepare bug noted by vikas. -+ -+ * pgppubring.c, pgpkey.c, pgp.h, main.c, gnupgparse.c, browser.h: -+ browser.h: re-insert the "tagged" component. pgp support: -+ fix handling of PGP 5 subkeys, algorithm 20. -+ -+ * pgppubring.c: [stable] Alg. 16 is encrypt-only, el-gamal. -+ -+ * commands.c: honor hdr_order when decode-piping a message. -+ From Vikas. -+ -+ * po/cs.po: New czech translation. -+ -+ * commands.c: Reorder headers when decode-piping. -+ -+ * po/cs.po, doc/manual.sgml.in, socket.c, mx.c, mutt_socket.h, -+ mutt.h, menu.c, init.h, imap.h, imap.c, functions.h, complete.c, -+ browser.h, browser.c, OPS: Brandon's IMAP clean-up; new czech -+ translation. -+ -+1999-02-04 12:00:10 roessler (roessler) -+ -+ * rfc1524.c, protos.h, pgpinvoke.c, mx.c, lib.c: [unstable] Change -+ the way mutt_quote_filename() worked. It's not too reasonable -+ to allocate memory dynamically whenever we quote a file name. -+ (I guess I should add "vim" to pgpinvoke.c's copyright notice. :-) -+ -+ * mx.c: [unstable] Check for write errors when moving messages -+ to $mbox. -+ -+ * mx.c: Check for write errors when moving messages to $mbox. -+ -+1999-02-03 22:14:18 roessler (roessler) -+ -+ * sendlib.c, recvattach.c, postpone.c, main.c, hash.c, -+ functions.h, compose.c, charset.h, charset.c, OPS: [unstable] -+ Produce some reasonable character set support when postponing -+ messages. -+ -+ Additionally, this patch fixes a nasty pointer leak in -+ load_charset() [noted with electric fence], and a completely -+ mis-lead attempt to use bsearch(). Apparently, nobody ever -+ tested the utf8 decoder for quite some time. -+ -+1999-02-02 21:57:44 roessler (roessler) -+ -+ * pattern.c: merge ~v patch into unstable. -+ -+ * pattern.c: small nit-fix from vikas to the ~v pattern. -+ -+ * pgp.c: Thou shall not use dangling pointers. -+ -+ * attach.c: [unstable] Fix mutt_decode_save_attachment's handling -+ of character set conversions. -+ -+ * sendlib.c, send.c, rfc2047.c, recvattach.c, protos.h, pgp.c, -+ pattern.c, mutt.h, init.h, handler.c, globals.h, functions.h, -+ copy.h, copy.c, compose.c, commands.c, charset.h, charset.c, -+ attach.c, OPS: Merging the external character set patch into -+ unstable. Additionally, this change introduces a M_CHARCONV state -+ flag which gives us some more control about when character set -+ conversions are actually done. Current versions of mutt would -+ happily apply character set conversions when, e.g., saving a -+ text/plain attachment to a file. (We had at least one corrupt -+ russing translation file due to this mis-feature.) -+ -+ Additionally, we clean up some of the character set related code -+ in handler.c. Most of that is now done by the decoder functions -+ in charset.c. -+ -+ * imap.c, imap.c: Brandon's imap_create patch. -+ -+ * pgpkey.c: [unstable] clear the message line before letting -+ people select public keys. -+ -+ * imap.c, copy.c: [unstable] merging Brandon's imap fixes. -+ -+ * copy.c, imap.c: A couple of IMAP fixes from Brandon Long. -+ -+1999-01-30 17:07:30 roessler (roessler) -+ -+ * pgpkey.c: really fix the weak associations problem. it was -+ worse than i thought. -+ -+ * pgpkey.c: Handle expired keys correclty, even when they are -+ the only and exact match when searching for keys by address. -+ -+1999-01-29 11:15:15 roessler (roessler) -+ -+ * init.h: [unstable] Change some default formats. -+ -+ * remailer.c, pgpkey.c, menu.c, addrbook.c: Add generic menu -+ searching. -+ -+ * remailer.h, remailer.c, init.h, globals.h: Use a user-definable -+ format for the mixmaster menu. -+ -+ * pgpkey.c, pgp.h, init.h: [unstable] add $pgp_entry_format. -+ -+1999-01-28 09:08:47 roessler (roessler) -+ -+ * gnupgparse.c: gnupg's trust model is currently unusable. -+ As a work-around, we don't present the user with _any_ trust -+ information if he uses gnupg. -+ -+1999-01-27 19:53:46 roessler (roessler) -+ -+ * doc/manual.sgml.in, pgpkey.c, mutt.h, init.h, gnupgparse.c: -+ Add $pgp_show_unusable. -+ -+1999-01-26 21:24:56 roessler (roessler) -+ -+ * doc/manual.sgml.in: [unstable] document ~v. -+ -+ * doc/manual.sgml.in: [stable] document ~v. -+ -+ * thread.c, pattern.c, mutt.h: [unstable] Add the ~v pattern. -+ From Vikas. -+ -+ * thread.c, pattern.c, mutt.h: [stable] Add the ~v pattern. -+ -+ * doc/manual.sgml.in, ChangeLog: ChangeLog, documentation for -+ implicit_autoview. -+ -+ * doc/manual.sgml.in: Document $implicit_autoview. -+ -+ * compose.c: Fix a segfault when users change attachment content -+ types, and let toggle-unlink honor the $resolv variable. -+ -+ * compose.c: $resolve should be honored when doing toggle-unlink -+ on the compose menu. -+ -+1999-01-25 22:16:46 roessler (roessler) -+ -+ * compose.c: This may fix a core dump under certain circumstances. -+ Can't check this out since I don't get the segfault. -+ -+ * pgpkey.c: Fix a redraw problem when the key menu is invoked. -+ -+ * po/ru.po, po/cs.po, configure.in: Russian and czech -+ translations. -+ -+ * po/cs.po: branches: 1.1.2; file cs.po was initially added on -+ branch mutt-1-0-stable. -+ -+ * po/cs.po, configure.in: Adding a czech translation, and fixing -+ the russian. -+ -+ * po/ru.po: ru.po was badly distorted. -+ -+1999-01-23 17:00:43 roessler (roessler) -+ -+ * prepare: when f is .../Makefile.am, `basename $f .am` -+ is Makefile. So I should just write that. :-) -+ -+ * prepare: Add the default predicate. -+ -+ * from.c: A slightly optimized version of DE's y2k patch. -+ -+ * prepare: Apparently, automake doesn't like our -+ AC_OUTPUT($output) construction... -+ -+ * gnupgparse.c, from.c: DE's patch to work around other software's -+ possible y2k bugs. -+ -+ * from.c: Try to avoid other programs' possible y2k bugs. -+ -+ * enter.c: Fix the attach-multi patch. -+ -+1999-01-22 22:12:10 roessler (roessler) -+ -+ * lib.c: Fix a memory leak, noted by Roland Rosenfeld. -+ -+ * lib.c: Fix a memory leak. Noted by Roland Rosenfeld. -+ -+ * recvattach.c, query.c, protos.h, menu.c, enter.c, curs_lib.c, -+ compose.c, browser.c, addrbook.c: Enable tagging in the file -+ browser. -+ -+ * protos.h, pgppubring.c, pgpkey.c, pgp.h, pgp.c, lib.c, -+ handler.c, gnupgparse.c, compose.c: Heavy hacking on mutt's pgp -+ support. We no longer read the complete key ring into memory. -+ For gpg, performance is heavily improved due to the fact that -+ we are passing a couple of key hints to the key ring parsing -+ back-end. -+ -+1999-01-21 05:19:42 roessler (roessler) -+ -+ * hook.c: Fix _mutt_string_hook. -+ -+1999-01-20 13:52:59 roessler (roessler) -+ -+ * po/pl.po, po/pl.po: New polish translation. -+ -+ * pgppubring.c, pgpkey.c, configure.in: Add heavily improved -+ debugging capabilities to the PGP code. Anyway, the problem I -+ observed wasn't a bug in mutt, but an expired key. *sigh* -+ -+ * rfc1524.c: Don't segfault when MailcapPath is unset. -+ -+ * rfc1524.c: Fix a segmentation fault when no MailcapPath has -+ been defined. -+ -+1999-01-19 23:38:26 roessler (roessler) -+ -+ * protos.h, mutt.h, init.h, hook.c, charset.c, Makefile.am: -+ Add the charset-hook command. -+ -+ * configure.in, charset.c, acconfig.h, Makefile.am, $output.in, -+ INSTALL: Properly handle character set definition file -+ installation. -+ -+ * mx.c: Remove a confusing error message. -+ -+ * mx.c: Remove confusing error message. -+ -+ * keymap.c, keymap.c, curs_lib.c: -+ patch-0.95.1.vikas.macro_function.1 -+ -+ * m4/Makefile.am.in, m4/Makefile.am.in: HP/UX portability patch -+ from Lars Hecking. -+ -+1999-01-18 09:45:29 roessler (roessler) -+ -+ * po/ru.po: New Russian translation from Michael Sobolev -+ . -+ -+ * po/ru.po: New russian translation from Michael Sobolev -+ . -+ -+1999-01-14 13:08:46 roessler (roessler) -+ -+ * compose.c: Mixmaster user interface beautification. -+ -+ * mx.c, curs_lib.c: Fix a couple of segfaults related to using -+ curses when it isn't there. -+ -+ * mx.c: dotlocking plus curses... -+ -+1999-01-13 23:56:39 roessler (roessler) -+ -+ * send.c, mutt.h, mbox.c, handler.c, copy.h, copy.c: -+ patch-0.95.1i.tlr.weed.1, patch-0.95.1i.tlr.dotlock.1 - These -+ have been tested with unstable so far, seem to work fine. -+ -+ * mx.c: Don't use curses when we don't have it. -+ -+ * mx.c: Don't try to do mutt_yesorno if we don't have curses. -+ -+ * remailer.h: Mixmaster has 20 address slots, that makes _19_ -+ remailers. -+ -+ * remailer.c: Fix the "append" function. -+ -+ * sendlib.c: Don't leak message dates when sending via mixmaster. -+ -+ * remailer.c: Add search code to the remailer chain selecting -+ menu. [This is pretty generic - should we add that code to -+ menu.c?] -+ -+ * postpone.c: Fix postponing of PGP messages. -+ -+ * send.c, remailer.c, compose.c: Qualify addresses before passing -+ them to mixmaster. -+ -+ * send.c, remailer.h, protos.h, mutt.h: Clean up dependencies: -+ remailer.h is no longer included by mutt.h, and the mix_* -+ prototypes can once again go to remailer.h. -+ -+ * sendlib.c, remailer.c, remailer.h, send.c, protos.h, postpone.c, -+ mutt.h, lib.c, keymap.h, keymap.c, init.h, headers.c, globals.h, -+ functions.h, configure.in, compose.c, OPS.MIX, acconfig.h, -+ Makefile.am: A first take at adding a mixmaster front-end to mutt. -+ Don't worry, it's optional. ;-) -+ -+1999-01-12 22:01:11 roessler (roessler) -+ -+ * mbox.c: Open folders in read-only mode if mutt can't lock them. -+ -+1999-01-11 18:12:49 roessler (roessler) -+ -+ * send.c, mutt.h, handler.c, copy.h, copy.c: When -+ decode-forwarding messages with message/Rfc822 attachments, -+ mutt should weed the attachments' headers according to the -+ setting of $forward_weed. -+ -+1999-01-10 09:11:36 roessler (roessler) -+ -+ * doc/manual.sgml.in, hdrline.c, doc/manual.sgml.in, hdrline.c: -+ Byrial's %D time format patch. -+ -+1999-01-09 17:53:02 roessler (roessler) -+ -+ * doc/manual.sgml.in, recvattach.c, protos.h, lib.c: Byrial's -+ latest changes to stable. -+ -+ * recvattach.c, protos.h, lib.c: Ask the user whether to overwrite -+ a file or append to it. From Byrial Jensen. -+ -+ * doc/manual.sgml.in: Fix a documentation problem. -+ -+1999-01-08 23:29:05 roessler (roessler) -+ -+ * charset.c: When doing a binary search, we may as well use -+ bsearch (3). -+ -+ * parse.c: Optimized time-zone parsing. -+ -+ * parse.c: Optimize time zone parsing. By Byrial Jensen. -+ -+ * history.c: Don't clear the history when the user issues a -+ "set history=..." command which doesn't change anything. -+ -+ * history.c: Don't clear the history when "set -+ history=..." doesn't change the buffer size. -+ -+ * thread.c, curs_main.c, thread.c, curs_main.c: Threading fix -+ from Daniel Eisenbud. -+ -+1999-01-07 19:01:30 roessler (roessler) -+ -+ * init.c, init.c: Vikas' set_boolean patch. -+ -+ * protos.h, handler.c, attach.c: Updated implicit autoview -+ handling from stable. -+ -+ * protos.h, handler.c, attach.c: Only use "implicit" autoviews -+ (implicit_autoview or MM_NOASK) when mutt is unable to handle -+ a content type internally. This saves us parsing the mailcap -+ files for every attachment we handle. -+ -+ * mx.c, mutt.h, init.h, hdrline.c, commands.c, attach.c: Merge -+ in the mailcap patch from stable. -+ -+ * thread.c, system.c, strcasecmp.c, status.c, sort.h, sort.c, -+ socket.c, snprintf.c, signal.c, sha_locl.h, sha1dgst.c, sha.h, -+ sendlib.c, send.c, score.c, rfc822.h, rfc822.c, rfc2047.h, -+ rfc2047.c, rfc1524.h, rfc1524.c, resize.c, recvattach.c, -+ query.c, protos.h, postpone.c, pop.c, pgppubring.c, pgpkey.c, -+ pgpinvoke.c, pgp.h, pgp.c, pattern.c, parse.h, parse.c, pager.h, -+ pager.c, mx.h, mx.c, mutt_socket.h, mutt_regex.h, mutt_menu.h, -+ mutt_curses.h, mutt.h, mime.h, mh.c, menu.c, mbox.c, mapping.h, -+ main.c, mailbox.h, lib.c, keymap.h, keymap.c, init.h, init.c, -+ imap.h, imap.c, hook.c, history.h, history.c, help.c, headers.c, -+ hdrline.c, hash.h, hash.c, handler.c, gnupgparse.c, globals.h, -+ getdomain.c, functions.h, from.c, flags.c, filter.c, enter.c, -+ edit.c, dotlock.h, dotlock.c, date.c, curs_main.c, curs_lib.c, -+ copy.h, copy.c, compose.c, complete.c, commands.c, color.c, -+ charset.h, charset.c, buffy.h, buffy.c, browser.c, attach.h, -+ attach.c, alias.c, addrbook.c, acconfig.h: Get rid of RCS ids in -+ source files. They are getting in our way when merging changes. -+ -+ * mx.c, mutt.h, init.h, hdrline.c, commands.c, attach.c: Remove -+ the use_mailcap variable. Instead, we introduce implicit_autoview -+ which triggers autoview for every content type it's applicable to. -+ -+ * thread.c, system.c, strcasecmp.c, status.c, sort.h, sort.c, -+ socket.c, snprintf.c, signal.c, sha_locl.h, sha1dgst.c, sha.h, -+ sendlib.c, send.c, score.c, rfc822.h, rfc822.c, rfc2047.h, -+ rfc2047.c, rfc1524.h, rfc1524.c, resize.c, recvattach.c, -+ query.c, protos.h, postpone.c, pop.c, pgppubring.c, pgpkey.c, -+ pgpinvoke.c, pgp.h, pgp.c, pattern.c, parse.h, parse.c, pager.h, -+ pager.c, mx.h, mx.c, mutt_socket.h, mutt_regex.h, mutt_menu.h, -+ mutt_curses.h, mutt.h, mime.h, mh.c, menu.c, mbox.c, mapping.h, -+ main.c, mailbox.h, lib.c, keymap.h, keymap.c, init.h, init.c, -+ imap.h, imap.c, hook.c, history.h, history.c, help.c, headers.c, -+ hdrline.c, hash.h, hash.c, handler.c, gnupgparse.c, globals.h, -+ getdomain.c, functions.h, from.c, flags.c, filter.c, enter.c, -+ edit.c, dotlock.h, dotlock.c, date.c, curs_main.c, curs_lib.c, -+ copy.h, copy.c, compose.c, complete.c, commands.c, color.c, -+ charset.h, charset.c, buffy.h, buffy.c, browser.c, attach.h, -+ attach.c, alias.c, addrbook.c, acconfig.h: Get rid of the rcsid -+ fields. They are getting in the way whenever I merge changes -+ into unstable. -+ -+ * po/nl.po, init.h, configure.in: Merging changes from stable. -+ -+ * configure.in: Don't add regex.c, but regex.o to the LIBOBJS -+ variable when needed. -+ -+ * init.h: Fix default settings for use_mailcap and mime_forward. -+ -+1999-01-06 10:13:32 roessler (roessler) -+ -+ * po/fr.po, po/de.po, sendlib.c, regex.c, protos.h, parse.c, -+ mutt_regex.h, mbox.c, main.c, hdrline.c, from.c, date.c, -+ configure.in, acconfig.h, _regex.h, Makefile.am, INSTALL: -+ [unstable] Merge changes from stable: rx -> regex, Byrial's -+ timezone patch, translation updates. -+ -+ * sendlib.c, protos.h, parse.c, mbox.c, from.c, date.c: Byrial's -+ timezone patch, without the absurd optimizations. -+ -+ * regex.c: branches: 1.1.2; file regex.c was initially added -+ on branch mutt-1-0-stable. -+ -+ * regex.c, mutt_regex.h, main.c, configure.in, acconfig.h: -+ Use gnu regex instead of gnu rx. This library is said to -+ behave better. Additionally, it supports \<...\> patterns. -+ The files _regex.h and regex.c included with this distribution -+ correspond to posix/regex.[ch] from the glibc 2.0.7t source tree. -+ -+ * _regex.h: branches: 1.1.2; file _regex.h was initially added -+ on branch mutt-1-0-stable. -+ -+ * _regex.h, Makefile.am, INSTALL: Use gnu regex instead of -+ gnu rx. This library is said to behave better. Additionally, -+ it supports \<...\> patterns. The files _regex.h and regex.c -+ included with this distribution correspond to posix/regex.[ch] -+ from the glibc 2.0.7t source tree. -+ -+ * po/nl.po, po/fr.po: Various fixes to the NL translation; -+ new French messages. -+ -+1999-01-05 14:35:18 roessler (roessler) -+ -+ * sendlib.c, mutt.h, main.c, configure.in, charset.h, charset.c, -+ Makefile.am: [unstable] Adding experimental new character set -+ conversion code. -+ -+ * po/de.po: Merging from stable. -+ -+ * po/de.po: Fix a typo in de.po. -+ -+ * po/de.po: [unstable] Merging changes from stable. -+ -+ * po/nl.po, hdrline.c, curs_main.c, configure.in: [unstable] -+ merging changes from stable. -+ -+ * hdrline.c: Conditionally display score and number of lines. -+ -+ * po/nl.po: branches: 1.1.2; file nl.po was initially added on -+ branch mutt-1-0-stable. -+ -+ * po/nl.po, po/de.po, configure.in: [stable] Adding the NL -+ translation; correcting some bugs in the DE translation. -+ -+1999-01-04 19:15:10 roessler (roessler) -+ -+ * curs_main.c: [unstable] fix next-unread plus collapsing. -+ -+ * curs_main.c: [stable] Fix next-unread when collapsing threads. -+ -+ * curs_main.c: [unstable] merging changes from stable. -+ -+ * curs_main.c: [stable] fix a bogus type cast. -+ -+ * reldate.h, curs_main.c: [unstable] merging in changes from -+ stable. -+ -+ * curs_main.c: [stable] Don't use the index elements of header -+ structures when new messages arrived on the index. -+ -+ * reldate.h: 0.95.1 should have a proper release date. -+ -+ * send.c, pgp.c, handler.c, configure.in: Make the experimental -+ branch the main trunk. -+ -+ * po/uk.po: branches: 1.12.2; 0.95.1 post-release commit. -+ -+ * po/ru.po: branches: 1.33.2; 0.95.1 post-release commit. -+ -+ * po/pl.po: branches: 1.3.2; 0.95.1 post-release commit. -+ -+ * po/it.po: branches: 1.24.2; 0.95.1 post-release commit. -+ -+ * po/fr.po: branches: 1.7.2; 0.95.1 post-release commit. -+ -+ * po/es.po: branches: 1.15.2; 0.95.1 post-release commit. -+ -+ * po/de.po: branches: 1.48.2; 0.95.1 post-release commit. -+ -+ * configure.in: [unstable] Create suitable version strings. -+ -+ * VERSION: branches: 2.1.2; [stable] Preparing 0.95.1. -+ -+ * ChangeLog: branches: 2.5.2; [stable] Preparing 0.95.1. -+ -+ * send.c: [unstable] commit changes from the stable tree. -+ -+ * send.c: branches: 2.1.2; [stable] When sending a message -+ in batch mode failed, mutt would dump core. Patch from Byrial -+ Jensen. -+ -+ * pgp.c, handler.c: [unstable] Add multiple signature support. -+ -+1999-01-02 17:23:24 roessler (roessler) -+ -+ * sendlib.c: branches: 2.3.4; I shouldn't accept patches on -+ New Year's day. Not even new-year related patches. -+ -+ * ChangeLog: I shouldn't accept patches on New Year's day. -+ Not even new-year related patches. -+ -+ * po/it.po: Fixing a typo. -+ -+ * protos.h: branches: 2.1.4; mutt_parse_date () shouldn't modify -+ its argument. Problem noted by Byrial Jensen. -+ -+ * parse.c: branches: 2.2.4; mutt_parse_date () shouldn't modify -+ its argument. Problem noted by Byrial Jensen. -+ -+ * handler.c: branches: 2.1.2; 2.1.4; mutt_parse_date () -+ shouldn't modify its argument. Problem noted by Byrial Jensen. -+ -+ * lib.c: branches: 2.2.4; Fix safe_symlink to correctly handle -+ relative paths. -+ -+1999-01-01 09:43:15 roessler (roessler) -+ -+ * sendlib.c: New Year's time zone handling patch from Manish -+ Singh . -+ -+1998-12-31 09:45:46 roessler (roessler) -+ -+ * curs_main.c: branches: 2.3.4; The attached patch moves code -+ for sorting the index and restoring the current message from -+ mutt_index_menu() to a new function. It saves code duplication. -+ -+1998-12-30 07:58:40 roessler (roessler) -+ -+ * pgp.c: branches: 2.1.2; 2.1.4; Localize some more messages. -+ From Michael Sobolev. -+ -+ * main.c: branches: 2.1.4; Localize some more messages. -+ From Michael Sobolev. -+ -+1998-12-29 16:29:03 roessler (roessler) -+ -+ * mbox.c: branches: 2.3.4; Use sizeof instead of strlen for -+ some fixed strings. -+ -+ * ChangeLog: Use sizeof instead of strlen for some fixed strings. -+ -+ * mh.c: branches: 2.5.4; Take setting the index_hint out of -+ the main loop of mh_check_mailbox(). -+ -+1998-12-28 14:59:04 roessler (roessler) -+ -+ * attach.c: branches: 2.1.4; Fix a segmentation fault when -+ viewing message/rfc822 attachments from the compose screen. -+ -+1998-12-23 15:57:00 roessler (roessler) -+ -+ * pattern.c: branches: 2.1.4; A slightly modified version of -+ Vikas' pattern_match patch. This changes the semantics of the -+ pattern-something functions so they only apply to _visible_ -+ messages. (With the exception of limit: In this case, the user -+ can add another pattern if he wants to limit further, or he can -+ give an entirely new pattern.) -+ -+1998-12-22 18:07:19 roessler (roessler) -+ -+ * sendlib.c: Fix MIME forwarding. From Vikas. -+ -+1998-12-21 12:38:57 roessler (roessler) -+ -+ * mx.c: branches: 2.3.4; Adjust some hash-related parameters. -+ -+ * mh.c, mbox.c: Adjust some hash-related parameters. -+ -+ * imap.c: branches: 2.2.4; Adjust some hash-related parameters. -+ -+ * charset.c: branches: 2.1.4; Adjust some hash-related -+ parameters. -+ -+ * ChangeLog: *** empty log message *** -+ -+ * mx.c, mh.c, mbox.c: Mail folder synchronization-related fixes: -+ -+ - Another situation under which mutt would lose track of the -+ current message when maildir folders changed has been removed. -+ -+ - While synchronizing mbox-type folders, a write error when -+ constructing the draft version of the new mail folder would -+ leave behind a copy ofthe file containing the draft. This is -+ most annoying if the write error is due to lack of disk space. -+ -+ * po/pl.po: Small \n fixes. -+ -+ * parse.c: mutt_strlen() optimizations from Byrial Jensen. -+ -+ * from.c: branches: 2.1.4; mutt_strlen() optimizations from -+ Byrial Jensen. -+ -+ * lib.c: mutt_strlen() optimizations from Byrial Jensen. -+ -+ * po/pl.po: Add the polish translation. -+ -+ * configure.in: branches: 2.2.2; 2.2.4; Register the polish -+ translation. -+ -+ * doc/manual.sgml.in: branches: 1.18.4; Fixes to the forwarding -+ chapter. From O'Shaughnessy Evans . -+ -+ * m4/README: Here is a small patch to simplify -+ m4/Makefile.am.in. This came out of a suggestion I made to Jim -+ Meyering (maintainer of GNU fileutils, where I snarfed the code -+ from :). (From: Lars Hecking ) -+ -+ * m4/Makefile.am.in: branches: 1.2.4; Here is a small patch to -+ simplify m4/Makefile.am.in. This came out of a suggestion I made -+ to Jim Meyering (maintainer of GNU fileutils, where I snarfed -+ the code from :). (From: Lars Hecking ) -+ -+1998-12-18 10:22:59 roessler (roessler) -+ -+ * mh.c: Catch an error condition when synchronizing mh messages. -+ -+ * po/de.po: Fix a format which had %s instead of %d. -+ -+1998-12-17 18:39:48 roessler (roessler) -+ -+ * ChangeLog: *** empty log message *** -+ -+ * INSTALL: branches: 2.1.4; I've been told that the FreeBSD shell -+ has been fixed meanwhile. Additionally, add the note from Vikas -+ on patching Solaris to get mutt work properly on that system. -+ -+ * mh.c: Fix attachment deletion for maildir/mh folders. This may -+ fix other mh-related problems, too. -+ -+ * curs_lib.c: branches: 2.2.4; Don't even try to clear the -+ status line when not in curses mode. -+ -+1998-12-16 13:23:06 roessler (roessler) -+ -+ * imap.c: Two lines were in reverse order. Noted by Daniel -+ Eisenbud. -+ -+ * thread.c: branches: 2.1.4; Give Daniel Eisenbud a "lock" -+ on this file. -+ -+ * pager.c: branches: 2.2.4; Fix "$resolve" behaviour for OP_TAG -+ and OP_TOGGLE_NEW from the pager. -+ -+ * curs_lib.c: SLang-related fixes to mutt_endwin(). -+ -+ * compose.c: branches: 2.1.4; Permit the user to set the typical -+ MIME parameters used with application/pgp messages. -+ -+ * color.c: branches: 2.1.4; Fix a segfault noted by Stephan Hack. -+ (Fix noted by Vikas.) -+ -+ * configure.in: Make the sendmail check compatible with newer -+ autoconf versions. Noted by Lars Hecking. -+ -+1998-12-13 08:10:13 roessler (roessler) -+ -+ * mx.c, curs_main.c: Don't dump core when closing a NULL context. -+ Fixes the "exit from no-mailbox mode" bug. -+ -+1998-12-12 10:14:43 roessler (roessler) -+ -+ * po/uk.po, po/ru.po, po/it.po, po/fr.po, po/es.po, po/de.po: -+ Post-release commit. -+ -+ * hook.c: branches: 2.1.4; More _PGPPATH and us dist related -+ fixes. -+ -+ * curs_main.c: More _PGPPATH and us dist related fixes. -+ -+ * mutt.h: branches: 2.1.4; Don't define M_PGPHOOK unless _PGPPATH -+ has been defined. -+ -+ * pager.c: Another reap.pl-related fix. -+ -+ * Makefile.am: branches: 2.1.4; The us-dist target was screwed. -+ -+ * thread.c: *** empty log message *** -+ -+ * system.c, strcasecmp.c, status.c: branches: 2.0.4; *** empty -+ log message *** -+ -+ * stamp-h.in: *** empty log message *** -+ -+ * sort.h, sort.c, socket.c, snprintf.c, signal.c, sha_locl.h, -+ sha1dgst.c, sha.h: branches: 2.0.4; *** empty log message *** -+ -+ * sendlib.c: *** empty log message *** -+ -+ * send.c: branches: 2.0.2; *** empty log message *** -+ -+ * score.c, rfc822.h, rfc822.c, rfc2047.h, rfc2047.c, rfc1524.h, -+ rfc1524.c, resize.c, reldate.h, recvattach.c: branches: 2.0.4; -+ *** empty log message *** -+ -+ * reap.pl: *** empty log message *** -+ -+ * query.c: branches: 2.0.4; *** empty log message *** -+ -+ * protos.h, prepare: *** empty log message *** -+ -+ * postpone.c, pop.c, pgppubring.c, pgpkey.c, pgpinvoke.c, pgp.h: -+ branches: 2.0.4; *** empty log message *** -+ -+ * pgp.c, pattern.c: *** empty log message *** -+ -+ * parse.h: branches: 2.0.4; *** empty log message *** -+ -+ * parse.c: *** empty log message *** -+ -+ * pager.h: branches: 2.0.4; *** empty log message *** -+ -+ * pager.c: *** empty log message *** -+ -+ * mx.h: branches: 2.0.4; *** empty log message *** -+ -+ * mx.c: *** empty log message *** -+ -+ * mutt_socket.h, mutt_regex.h, mutt_menu.h, mutt_curses.h: -+ branches: 2.0.4; *** empty log message *** -+ -+ * mutt.h, mkinstalldirs, missing, mime.types: *** empty log -+ message *** -+ -+ * mime.h: branches: 2.0.4; *** empty log message *** -+ -+ * mh.c: *** empty log message *** -+ -+ * menu.c: branches: 2.0.4; *** empty log message *** -+ -+ * mbox.c: *** empty log message *** -+ -+ * mapping.h: branches: 2.0.4; *** empty log message *** -+ -+ * main.c: *** empty log message *** -+ -+ * mailbox.h: branches: 2.0.4; *** empty log message *** -+ -+ * lib.c: *** empty log message *** -+ -+ * keymap.h, keymap.c: branches: 2.0.4; *** empty log message *** -+ -+ * install-sh: branches: 2.0.10; *** empty log message *** -+ -+ * init.h, init.c, imap.h: branches: 2.0.4; *** empty log -+ message *** -+ -+ * imap.c, hook.c: *** empty log message *** -+ -+ * history.h, history.c, help.c, headers.c, hdrline.c, hash.h, -+ hash.c: branches: 2.0.4; *** empty log message *** -+ -+ * handler.c: *** empty log message *** -+ -+ * gnupgparse.c, globals.h, getdomain.c: branches: 2.0.4; *** -+ empty log message *** -+ -+ * gen_defs: branches: 2.0.6; *** empty log message *** -+ -+ * functions.h: branches: 2.0.4; *** empty log message *** -+ -+ * from.c: *** empty log message *** -+ -+ * flags.c, filter.c, enter.c, edit.c, dotlock.h, dotlock.c, -+ date.c: branches: 2.0.4; *** empty log message *** -+ -+ * curs_main.c, curs_lib.c: *** empty log message *** -+ -+ * copy.h, copy.c: branches: 2.0.4; *** empty log message *** -+ -+ * configure.in: *** empty log message *** -+ -+ * config.sub, config.guess: branches: 2.0.6; *** empty log -+ message *** -+ -+ * compose.c: *** empty log message *** -+ -+ * complete.c, commands.c: branches: 2.0.4; *** empty log -+ message *** -+ -+ * color.c: *** empty log message *** -+ -+ * charset.h: branches: 2.0.4; *** empty log message *** -+ -+ * charset.c: *** empty log message *** -+ -+ * buffy.h, buffy.c, browser.c, attach.h: branches: 2.0.4; *** -+ empty log message *** -+ -+ * attach.c: *** empty log message *** -+ -+ * alias.c, addrbook.c, acconfig.h: branches: 2.0.4; *** empty -+ log message *** -+ -+ * VERSION, TODO: *** empty log message *** -+ -+ * README: branches: 2.0.4; *** empty log message *** -+ -+ * OPS.PGP: *** empty log message *** -+ -+ * OPS, NEWS, Muttrc.in: branches: 2.0.4; *** empty log message -+ *** -+ -+ * Makefile.am, INSTALL, GPL, ChangeLog, COPYRIGHT, ABOUT-NLS: -+ *** empty log message *** -+ -+ * po/uk.po, po/ru.po, po/it.po, po/fr.po, po/es.po, po/de.po, -+ reldate.h, VERSION, ChangeLog: Release-commit for 0.95i. -+ -+ * hash.c: Use a better hash function. Contributed by Stefan -+ Langerman to mutt-users. -+ -+1998-12-11 20:48:14 roessler (roessler) -+ -+ * reldate.h, VERSION, ChangeLog: 0.94.999 pre-release commit. -+ -+ * main.c: Bail out with a text-based error message if a -+ non-existing mailbox is given as a -f command line argument. -+ -+ * Makefile.am: The distdir target creates hard links for the -+ source files. This has the consequence that the us-dist hook -+ will demolish files in the main source tree. We have to un-link -+ the various instances of the source code. -+ -+ * INSTALL: Warn about regexp-related problems under Solaris 2.6. -+ -+ * po/uk.po, po/ru.po, po/it.po, po/fr.po, po/es.po, po/de.po: -+ Various last-minute changes and automatic updates. -+ -+ * main.c: Go into no-mailbox mode when the initial folder can't -+ be opened. -+ -+ * mh.c: Undoing the mh_speed patch. -+ -+ * po/it.po, po/fr.po: l10n fixes. -+ -+ * curs_main.c: Start a new reply and postpone it. Then type m -+ (mail), and recall and send the postponed reply. The replied -+ message is _not_ flagged replied. -+ -+ (From Byrial Jensen.) -+ -+ * po/fr.po: Bug-fixed french l10n. -+ -+ * parse.c: Multipart parser fixes from Byrial. Finally. -+ -+ * po/it.po: Small fix. -+ -+1998-12-10 22:48:56 roessler (roessler) -+ -+ * po/fr.po, configure.in: Add the french l10n. -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po, reldate.h: -+ post-release commit 0.94.99. -+ -+ * VERSION, README, ChangeLog: Pre-release commit for 0.94.99. -+ -+ * menu.c: Fix tag-prefix. -+ -+ * compose.c: Redraw fix after the content type was changed on -+ the compose menu. -+ -+1998-12-08 23:09:53 roessler (roessler) -+ -+ * help.c: Help screen resizing nit. From Gero Treuner. -+ -+ * doc/manual.sgml.in: Typo. -+ -+ * sendlib.c: Work around sendmail 8.9.1a invalidating PGP/MIME -+ signatures by re-ordering MIME headers in the way sendmail does. -+ -+ * mh.c: Keep track of file name changes for files wandering -+ around between the subfolders of a maildir. -+ -+ * mh.c: More fixes to the maildir resynchronization code. -+ This should now also smoothly handle the case of messages -+ _vanishing_ from maildir's new/ subdirectory. -+ -+ * init.c: Make the debug file access unbuffered. Important if -+ we are debugging crashes. -+ -+1998-12-07 21:13:44 roessler (roessler) -+ -+ * mx.c, mh.c: Fix a couple of flag-related bugs in the maildir -+ folder update code. -+ -+ * imap.c: Fix a completely ugly comment formatting. -+ -+ * mutt.h: Adjust '#' to the first column. -+ -+ * rfc2047.c: Don't tag us-ascii headers as $Charset or -+ unknown-8bit. -+ -+1998-12-03 23:29:37 roessler (roessler) -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po, reldate.h, -+ VERSION, ChangeLog: release-commit 0.94.18. -+ -+1998-12-02 20:12:35 roessler (roessler) -+ -+ * contrib/Pine.rc, contrib/Mush.rc: Bring the sample rc files -+ better in synch with the actual code. -+ -+ * recvattach.c: Remove a warning which comes from code actually -+ belonging to the send_charset patch. -+ -+ * rfc2047.c: Encode- and decode the "val" field when using mutt -+ with EXACT_ADDRESS enabled. -+ -+ * Makefile.am: Small fixes to the build process. From Lars -+ Hecking. -+ -+ * compose.c: The attached patch fixes yet another redraw related -+ bug. When I call OP_SAVE from the Compose menu and use the -+ file-browser and 'q' out of the file-browser, the screen still -+ shows the browser, but the control is really in the Compose -+ menu. A Ctrl-L verifies this. Basically, a screen redraw -+ is missing. -+ -+ From Vikas. -+ -+ * mutt_menu.h, menu.c, compose.c: From the Compose menu, invoke -+ attach-message. Tag a whole bunch of messages. Say, for example, -+ 100. When you exit the folder, the Compose menu's status line -+ has disappeared. -+ -+ Fix from Vikas. -+ -+ * browser.c: patch-0.94.17.vikas.browser_redraw.1 -+ -+1998-11-23 21:10:12 roessler (roessler) -+ -+ * protos.h, lib.c: Change safe_malloc's size parameter from -+ (unsigned int) to size_t. -+ -+ * send.c, protos.h, pattern.c, alias.c: From Byrial: -+ -+ I don't think that the match-all pattern modifier works as can -+ be expected from a logical point of view. -+ -+ The attached patch will make it work as I expect it to work: -+ -+ - It works on all patterns which explicit or implicit use -+ address lists: ~c, ~C, ~e, ~f, ~l, ~L, ~p, ~P, and ~t. (It -+ didn't work with ~l before). -+ -+ - It works such that a modified pattern always match, unless -+ there is at least one address in at least one of the -+ referenced lists that it doesn't match. -+ -+ * doc/manual.sgml.in, send.c, mutt.h, mh.c, init.h, Muttrc.in: -+ Introduce a new option $reply_self. From Vikas. -+ -+1998-11-20 00:27:03 roessler (roessler) -+ -+ * po/it.po: New it.po from Mario. -+ -+ * doc/mutt.man.in: branches: 1.4.4; Fix a small typo. -+ -+1998-11-19 23:57:03 roessler (roessler) -+ -+ * contrib/Pine.rc: Fix some ancient syntax. -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po, send.c: -+ Hack around problems with multi-valued Reply-To headers. -+ From Roland Rosenfeld. -+ -+ * rfc2047.c: Properly encode '_' characters in words which -+ are qp-encoded. -+ -+ * sendlib.c: Use mutt_is_message_type() in the message -+ transformation code. -+ -+ * po/Makefile.in.in: Fix all Makefiles. make -+ DESTDIR=/path/to/something install should work now. -+ -+ * doc/Makefile.in: branches: 1.15.4; Fix all Makefiles. -+ make DESTDIR=/path/to/something install should work now. -+ -+ * Makefile.am: Fix all Makefiles. make DESTDIR=/path/to/something -+ install should work now. -+ -+1998-11-18 23:09:46 roessler (roessler) -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po, reldate.h, -+ VERSION, ChangeLog: Release-commit for 0.94.17. -+ -+ * sendlib.c, protos.h, pgp.c, parse.c, lib.c, compose.c: This -+ patch simplifies the generation of content type parameters -+ significantly by introducing a funciton mutt_set_parameter(). -+ Additionally, we re-use code from parse.c for parsing user-input -+ content type headers on the compose screen. -+ -+ * compose.c: Remove some uuencode-related debris. -+ -+ * recvattach.c: Remove some code which crept in from the external -+ character set patch. -+ -+ * recvattach.c: Make optional formats work while processing -+ $attach_format. -+ -+ * mh.c: Remove bogus re-sorting code from the maildir check -+ routine. -+ -+ * mutt.h: Include , so SEEK_SET is defined on some -+ systems which don't do so in . -+ -+1998-11-17 13:23:26 roessler (roessler) -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po: Checkpoint commit, -+ containing quite a few fuzzy translations. -+ -+ * po/de.po: Update some messages. -+ -+ * m4/Makefile.am.in, m4/README, m4/gettext.m4, m4/lcmessage.m4, -+ m4/progtest.m4, prepare, configure.in, Makefile.am: Configuration -+ fixes from Lars Hecking, with some more fixes and modifications -+ from myself. With some luck, you don't need a gettext -+ installation any more. -+ -+ * sendlib.c: Fix the base64 encoder. The current code would -+ produce slightly unpredictible output which leads to bad -+ signatures. -+ -+ * postpone.c, pgp.c, parse.c, pager.c: Fix a search coloring -+ related bug. -+ -+1998-11-16 11:44:42 roessler (roessler) -+ -+ * protos.h: Drop ci_attach - it doesn't exist. Noted by Byrial -+ Jensen. -+ -+1998-11-15 09:53:23 roessler (roessler) -+ -+ * parse.c: Stupid typo. -+ -+ * protos.h, parse.c, attach.c: My version of Byrial's parse_part -+ patch. -+ -+ * recvattach.c, protos.h, mutt.h, copy.c, compose.c: I can -+ elaborate a little more on the last paragraph. It is deletion -+ of the top level part direct under a message/rfc822 part which -+ gives problems because the headers of the message/rfc822 part -+ have to be changed in this case. It is hard to tell exactly how -+ many bytes and lines will be removed and added in this case. -+ -+ If we can refrain from deletion of such parts and thus only -+ allow deletion of parts direct under a multipart part, then it is -+ relative easy always to make correct Content-Length: and Lines: -+ headers in the copy. (The correctness of the Lines count is -+ dependent of the correctness of the initial value, though). -+ -+ (From: Byrial Jensen) -+ -+ * doc/manual.sgml.in: Correcting Vikas' E-Mail address in the -+ credits section. -+ -+1998-11-14 08:24:56 roessler (roessler) -+ -+ * doc/manual.sgml.in: Update Byrial's e-mail address. -+ -+ * copy.c: Simplify the new attachment deletion code not to require -+ an extra temporary file. (From: Byrial Jensen ) -+ -+ * help.c, handler.c: Type cast nit from Gero Treuner. -+ -+1998-11-13 18:31:06 roessler (roessler) -+ -+ * imap.c: Currently, Mutt won't use a default folder if just the -+ IMAP server is specified. In fact, if the folder isn't specified, -+ it will core-dump. -+ -+ The attached patch will use INBOX as the IMAP folder name if -+ none is specified, eliminating the core-dump. -+ -+ (From: Aaron Schrab ) -+ -+1998-11-12 21:52:01 roessler (roessler) -+ -+ * mutt.h, copy.c: Byrial's latest attachment deletion patch. -+ -+ * mutt.h, lib.c, handler.c: Introduce a state_printf() function. -+ -+1998-11-11 21:18:08 roessler (roessler) -+ -+ * po/it.po: New it.po from Marco. -+ -+ * snprintf.c: Don't use the mutt_str* functions in this module. -+ -+ * strcasecmp.c: the s/str.*cmp/mutt_str.*cmp/ replacement should -+ not have taken place here. -+ -+1998-11-10 22:21:51 roessler (roessler) -+ -+ * dotlock.c: Don't use mutt_strsomething in the dotlocking code. -+ -+ * send.c: Fix the $metoo option's behaviour. -+ -+ * thread.c, strcasecmp.c, status.c, sort.c, socket.c, -+ snprintf.c, sendlib.c, send.c, score.c, rfc822.c, rfc2047.c, -+ rfc1524.c, recvattach.c, query.c, protos.h, postpone.c, pop.c, -+ pgppubring.c, pgpkey.c, pgpinvoke.c, pgp.c, pattern.c, parse.c, -+ pager.c, mx.c, mh.c, menu.c, mbox.c, main.c, lib.c, keymap.c, -+ init.c, imap.c, hook.c, history.c, help.c, headers.c, hdrline.c, -+ hash.c, handler.c, gnupgparse.c, getdomain.c, from.c, enter.c, -+ edit.c, dotlock.c, curs_lib.c, copy.c, compose.c, complete.c, -+ commands.c, color.c, charset.c, buffy.c, browser.c, attach.c, -+ alias.c, addrbook.c: Introduce or rewrite mutt_{str*cmp,strlen} -+ and use them all over the place. If there are still segmentation -+ faults due to missing NONULLs over, they are gone now. -+ -+ * main.c: Add a "pseudo-credit" to the extended copyright notice. -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po, reldate.h, -+ VERSION, ChangeLog: Releasing 0.94.16. -+ -+ * sendlib.c, mx.h, mx.c, mbox.c, init.c, copy.c, commands.c, -+ buffy.c, attach.c: Experimental support for the so-called -+ "kendra" mail folder format. This seems to be used on OS/2 and -+ is, actually, a slibhtly modified version of the MMDF format. -+ -+ * parse.c: Do some sanity checking when reading attachment. -+ This fix should catch bad attachments. -+ -+ * edit.c: Fix a possible buffer overflow. (This seems to be -+ the one noticed by Pavel Gulchouck .) -+ -+ * compose.c: Wrong fix from Vikas. Undo it. (Noted by Byrial.) -+ -+ * curs_lib.c, compose.c: Fix a multi_choice related bug. -+ From Vikas. -+ -+ * buffy.c: Skip empty mailbox parameters. This fixes a -+ segmentation fault noted by Marco d'Itri. -+ -+1998-11-09 19:28:42 roessler (roessler) -+ -+ * from.c: Catch possible bad memory access. -+ -+ * doc/manual.sgml.in, sendlib.c, protos.h, init.h, globals.h, -+ copy.c, Muttrc.in: Rewrite copy_delete_attach(). -+ -+ * sort.c, score.c, protos.h, curs_main.c, color.c: Fix an -+ efficiency problem with the color index features. -+ -+ * doc/mutt.man.in: Replace @sharedir@ by @sysconfdir@. -+ -+ * doc/manual.sgml.in: Make the default_hook documentation match -+ the code. -+ -+ * main.c, curs_main.c: Avoid duplicate mx_close_mailbox() when -+ OP_QUIT is called. -+ -+ * browser.c: The attached patch fixes a potential problem in -+ folder_format_str() where a fixed buffer might not be null -+ terminated. From Vikas. -+ -+ * init.c: The attached patch fixes a bug in :set variable= -+ where variables of type DT_SORT were not getting expanded (only -+ 4 of them, but a bug nevertheless). From Vikas. -+ -+ * browser.c: patch-0.94.15.vikas.browser_sort.3 -+ -+ * doc/manual.sgml.in: Add a forwarding chapter to the manual. -+ From Gero Treuner. -+ -+ * po/de.po: Revert de.po to the traditional German spelling rules. -+ -+ * po/de.po, pop.c: L10 fixes from Gero Treuner. -+ -+ * parse.c, handler.c: A message/external-body handler. -+ From Byrial Jensen. -+ -+ * protos.h, parse.c: - remove the static declaration from -+ parse_date() in parse.c, - rename it to mutt_parse_date() - -+ fix a minor bug: the timezone information in an expires-header -+ was used to set the timezone of the send time. -+ -+ (From Byrial Jensen .) -+ -+ * Muttrc.in: Fix some spelling errors noted by Boris Wesslowski -+ . -+ -+ * handler.c: Byrial Jensen's alternative_handler patches. -+ This may lead to non-desirable effects with attachment deletion; -+ these effects will go when the new attachment deletion code -+ is implemented. -+ -+ * parse.c: SeokChan LEE says KST has a nine hour -+ offset from GMT. -+ -+ * pager.c, help.c: Fix the display of DEL in the pager. -+ -+ * send.c: Fix a group reply problem. -+ -+1998-10-30 13:00:10 roessler (roessler) -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po: Some recent -+ changes. -+ -+1998-10-29 09:46:45 roessler (roessler) -+ -+ * mbox.c: Mbox robustness patch from Johnny Tevessen -+ . -+ -+ * po/de.po: Fixing a typo. -+ -+ * imap.c: This patch should cause mutt to ask for your IMAP -+ login/password again if its wrong. From Brandon Long. -+ -+1998-10-28 21:48:36 roessler (roessler) -+ -+ * doc/manual.sgml.in, reldate.h, VERSION, NEWS, ChangeLog: -+ 0.94.15 release commit. -+ -+ * po/uk.po, po/ru.po, po/it.po, po/es.po, po/de.po: pre-release -+ commit, take 1. -+ -+ * curs_lib.c: Add an IsPrint check to mutt_message() and -+ mutt_curses_error(). This will prevent _some_ advert effects from -+ l10ns which don't fit together with the terminal's abilities. -+ There are still quite a few raw printw() etc. - we may wish to -+ introduce our own, locale-safe versions of these. -+ -+ * po/POTFILES.in: reldate contais really _no_ i18n-related data. -+ -+ * send.c: Don't try to recall a postponed message when we are -+ given a template. -+ -+ * copy.c: Fix a possible segmentation fault when deleting nested -+ attachments. -+ -+ * doc/manual.sgml.in, send.c, mutt.h, init.h: Add a $forward_weed -+ option which controls header weeding when decode-forwarding -+ messages. -+ -+ * po/ru.po, po/it.po, po/es.po, po/de.po: German translation -+ fixes from Gero plus checkpoint commit. -+ -+ * doc/manual.sgml.in, pager.h, pager.c, mutt_menu.h, keymap.c, -+ help.c, curs_main.c, commands.c, attach.c, OPS: Gero Treuner's -+ help-wrap patch. -+ -+ * po/ru.po, po/it.po, po/es.po, po/de.po: Adding a current -+ spanish translation. -+ -+ * send.c: if reply-to points to the address on the from header, -+ use the from header's value for composing a reply's recipient -+ list, not the reply-to header. -+ -+ * configure.in: add the ukrainian l10n. -+ -+1998-10-27 19:02:45 roessler (roessler) -+ -+ * configure: Configure is generated automatically and should -+ thus _not_ be part of the CVS repository. -+ -+ * configure.in, configure, README, INSTALL: Try to detect Solaris -+ 2.4's broken regcomp(). -+ -+ * send.c: Move some code around. -+ -+ * doc/manual.sgml.in: Some documentation nits. -+ -+ * dotlock.c: include config.h _before_ checking for HAVE_GETOPT. -+ Noted by Scott Perlman . -+ -+ * Muttrc.in: Add a macro for viewing the manual. -+ -+ * pgp.c, configure.in, configure: i18n fixes. -+ -+ * po/ru.po, po/es.po, po/it.po, po/de.po: A couple of i18n -+ fixes, plus a partial spanish translation from Boris Wesslowski -+ . -+ -+ * configure.in, configure: Handle systems which have neither -+ pgp2 nor pgp5, but gpg correctly. -+ -+ * compose.c: - snd_entry() is marked static - You will only get -+ a full redraw of the screen after invoking -+ pgp_send_menu if you selected "sign as". - draw_envelope() -+ and edit_address_list() use the same array of -+ strings for titles/prompts. This saves both string data and -+ code in both functions which have been a lot smaller. -+ -+ * sendlib.c, send.c, protos.h, postpone.c, compose.c: Preserve -+ FCC headers when postponing. From Vikas. -+ -+ * mx.c, mutt.h, imap.c: Prevent mutt from re-reading IMAP folders -+ before quitting. -+ -+1998-10-22 13:53:47 roessler (roessler) -+ -+ * send.c: Undo some superfluous changes. Pointed out by V.A. -+ -+ * send.c, protos.h, postpone.c: - Preserve certain headers' -+ values when recallling a postponed message. TBD: Fcc. -+ -+ - Rename mutt_edit_message() to mutt_prepare_edit_message() -+ since that's what that function actually does. -+ -+ * mx.h, mx.c, lib.c, flags.c: Make _all_ IMAP-related code -+ conditionally defined. From Byrial Jensen. -+ -+1998-10-21 22:46:16 roessler (roessler) -+ -+ * protos.h, pattern.c, hdrline.c: Fix match-all for the ~p, -+ ~P modifiers. -+ -+ * compose.c: Vikas' write_fcc patch. -+ -+ * doc/manual.sgml.in: Documentation nits from Byrial. -+ -+ * curs_lib.c: Also accept numbers as input in mutt_multi_choice(). -+ From Byrial. -+ -+ * prepare: Fix the documentation reference in prepare. -+ -+ * doc/devel-notes.txt: Add a gettext automake macro patch which -+ is needed for proper building of mutt. -+ -+ * prepare, config.h.in, aclocal.m4, README, INSTALL: Remove -+ some automatically generated files from the CVS repository, -+ and add a script which generates them. -+ -+ * Makefile.am: Don't overwrite $(sysconfdir)/Muttrc if present. -+ -+ * po/ru.po, po/it.po, po/de.po, protos.h, curs_lib.c, compose.c, -+ commands.c, browser.c: Byrial Jensen's mutt_multi_choice() -+ patch plus some German translations. -+ -+ * pgpinvoke.c, gnupgparse.c: Make gpg's output look a little -+ bit cleaner. -+ -+ * po/ru.po, po/it.po, po/de.po, reldate.h: Release commit. -+ -+ * VERSION, ChangeLog: Preparing 0.94.14. -+ -+1998-10-20 22:02:58 roessler (roessler) -+ -+ * po/ru.po, po/it.po, po/de.po: Checkpoint commit. -+ -+ * config.h.in, Makefile.am: Include VERSION with the distribution. -+ -+ * configure.in, configure, VERSION, config.h.in: Don't hard-wire -+ the program's version in configure.in, but use the VERSION -+ file instead. Stolen from gnupg. -+ -+ * ChangeLog: Checkpoint commit. -+ -+ * doc/manual.sgml.in, keymap.c, functions.h, NEWS: Another -+ macro-function fix from Vikas. -+ -+ * socket.c, mutt_socket.h: Fix the multiple connection code. -+ From Brandon Long. -+ -+1998-10-19 20:08:10 roessler (roessler) -+ -+ * postpone.c: fix a typo. -+ -+ * Makefile.am: Fix dotlock's installation when DOTLOCK_GROUP -+ is empty. -+ -+ * po/it.po: Ups, this was missing from the repository. -+ -+ * po/ru.po, po/de.po: Adding some new and improved German -+ translations. -+ -+ * init.c: handle domain == "@" properly. -+ -+ * postpone.c: Fix the behaviour when recalling postponed messages: -+ Content types would not be restored. -+ -+1998-10-16 12:09:37 roessler (roessler) -+ -+ * lib.c: Harden mutt_free_header() against NULL pointers. -+ -+ * keymap.c, handler.c: Nits from Vikas. -+ -+ * send.c: Fix a segmentation fault when OPT_RECALL is -+ ask-something. -+ -+ * commands.c: Don't write out bad content-length and lines -+ headers when decode-saving a message. -+ -+1998-10-15 23:09:30 roessler (roessler) -+ -+ * po/ru.po, po/de.po: *** empty log message *** -+ -+ * intl/textdomain.c, intl/localealias.c, intl/loadmsgcat.c, -+ intl/l10nflist.c, intl/intl-compat.c, intl/gettext.c, -+ intl/finddomain.c, intl/explodename.c, intl/dgettext.c, -+ intl/dcgettext.c, intl/cat-compat.c, intl/bindtextdom.c, -+ thread.c, system.c, strcasecmp.c, status.c, sort.c, socket.c, -+ snprintf.c, signal.c, sha1dgst.c, sendlib.c, send.c, score.c, -+ rfc822.c, rfc2047.c, rfc1524.c, resize.c, recvattach.c, query.c, -+ postpone.c, pop.c, pgppubring.c, pgpkey.c, pgpinvoke.c, pgp.c, -+ pattern.c, parse.c, pager.c, mx.c, mh.c, menu.c, mbox.c, -+ main.c, lib.c, keymap.c, init.c, imap.c, hook.c, history.c, -+ help.c, headers.c, hdrline.c, hash.c, handler.c, gnupgparse.c, -+ getdomain.c, from.c, flags.c, filter.c, enter.c, edit.c, -+ dotlock.c, date.c, curs_main.c, curs_lib.c, copy.c, config.h.in, -+ compose.c, complete.c, commands.c, color.c, charset.c, buffy.c, -+ browser.c, attach.c, alias.c, addrbook.c, ChangeLog: Change -+ "static char rcsid[]" to "static const char rcsid[]" to make -+ gcc shut up about this. -+ -+ * po/stamp-cat-id, po/ru.po, po/mutt.pot, po/de.po, -+ po/cat-id-tbl.c, reldate.h, configure.in, configure, config.h.in, -+ Makefile.in, ChangeLog: Random pre-release clean-up. -+ -+ * po/mutt.pot, doc/manual.sgml.in, pattern.c, mutt.h: This -+ patch introduces the ~k pattern for messages containing pgp -+ key material. -+ -+ * doc/manual.sgml.in: Add some missing key definitions. -+ -+ * mutt_curses.h: There seem to be systems which don't know -+ about KEY_ENTER. -+ -+ * po/mutt.pot, po/cat-id-tbl.c: Check-point commit, again. -+ -+ * sendlib.c: Put #ifdefs around a variable which is only used -+ for generating uuencoded messages. -+ -+ * ChangeLog: Update. -+ -+ * po/ru.po, po/mutt.pot, po/cat-id-tbl.c, sendlib.c, keymap.c, -+ compose.c: A slightly modified version of Vikas' help_unbound -+ patch. -+ -+ * po/mutt.pot, sendlib.c, protos.h, postpone.c, parse.h, parse.c, -+ mh.c, mbox.c, main.c, imap.c, headers.c, buffy.c: Fixing a memory -+ hog which was introduced by the edit-message patch. -+ -+1998-10-14 22:58:04 roessler (roessler) -+ -+ * po/ru.po, po/mutt.pot, po/de.po, po/cat-id-tbl.c, compose.c: -+ Warn the user before sending out uuencoded attachments. -+ -+ * handler.c: Fix prefix and utf8 issues in the uudecoder. -+ -+ * sendlib.c, parse.c, mime.h, handler.c, globals.h, config.h.in: -+ Thinking about this once again, ok folks, here comes x-uuencode -+ support. -+ -+ * handler.c: typo. -+ -+ * handler.c: When Charset is utf-8 (not recommended!), don't -+ active utf8 translation in the various handler routines. -+ -+ * Makefile.in, Makefile.am: Add -I$(includedir) to the C -+ preprocessor flags. Per request of Clint Olsen. -+ -+ * po/ru.po, po/de.po, configure.in, configure, config.h.in, -+ Makefile.in, Makefile.am: More build process clean-up. -+ -+ * po/mutt.pot, po/Makefile.in.in, config.h.in, Makefile.in: -+ Removing some instances of gnu-make specific command line -+ parameters. -+ -+ * doc/manual.sgml.in: Document the match-all feature. -+ -+ * po/mutt.pot, main.c, dotlock.c, configure.in, configure, -+ config.h.in, Makefile.in, Makefile.am: Various build fixes. -+ -+ * color.c: Adding some necessary ifdefs to color.c, From -+ Irving_Wolfe@wolfe.net. -+ -+1998-10-13 23:37:05 roessler (roessler) -+ -+ * po/ru.po, po/de.po: Checkpoint commit. This gets boring. -+ -+ * NEWS: Merging Vikas' NEWS file into the distributed one. -+ -+ * po/mutt.pot, config.h.in, Makefile.in, ChangeLog: Preparing -+ 0.94.12. -+ -+ * po/ru.po, po/mutt.pot, po/de.po, po/cat-id-tbl.c, reldate.h, -+ recvattach.c, configure.in, configure, config.h.in, commands.c, -+ README, NEWS, Makefile.in, Makefile.am, INSTALL: random -+ pre-release clean-up. -+ -+ * po/ru.po, po/mutt.pot, po/de.po, po/cat-id-tbl.c, -+ po/POTFILES.in, reap.pl, gen_defs, configure.in, configure, -+ config.h.in, NEWS, Makefile.in, Makefile.am: Introducing a us-dist -+ target to create a USG-friendly version of mutt. Additionally, -+ the NEWS file is prepared for 0.95. -+ -+ * doc/devel-notes.txt: Add a short note on compiler warnings. -+ -+ * po/ru.po, po/de.po, po/POTFILES.in, po/Makefile.in.in, missing, -+ mime.types: More $Id$ strings. -+ -+ * po/mutt.pot, po/cat-id-tbl.c, intl/textdomain.c, -+ intl/localealias.c, intl/loadmsgcat.c, intl/loadinfo.h, -+ intl/libgettext.h, intl/l10nflist.c, intl/intl-compat.c, -+ intl/hash-string.h, intl/gettextP.h, intl/gettext.h, -+ intl/gettext.c, intl/finddomain.c, intl/explodename.c, -+ intl/dgettext.c, intl/dcgettext.c, intl/cat-compat.c, -+ intl/bindtextdom.c, doc/devel-notes.txt, doc/applying-patches.txt: -+ Add RCS $Id$ strings to (hopefully) all source files. -+ -+ * doc/PGP-Notes.txt: branches: 1.6.4; Add RCS $Id$ strings to -+ (hopefully) all source files. -+ -+ * doc/Makefile.in: Add RCS $Id$ strings to (hopefully) all -+ source files. -+ -+ * contrib/sample.muttrc, contrib/sample.mailcap: branches: -+ 1.2.4; Add RCS $Id$ strings to (hopefully) all source files. -+ -+ * contrib/language50.txt, contrib/language.txt, contrib/Pine.rc, -+ contrib/Mush.rc, contrib/Makefile.in, thread.c, system.c, -+ strcasecmp.c, status.c, sort.h, sort.c, socket.c, snprintf.c, -+ signal.c, sha_locl.h, sha1dgst.c, sha.h, sendlib.c, send.c, -+ score.c, rfc822.h, rfc822.c, rfc2047.h, rfc2047.c, rfc1524.h, -+ rfc1524.c, resize.c, reldate.h, recvattach.c, query.c, protos.h, -+ postpone.c, pop.c, pgppubring.c, pgpkey.c, pgpinvoke.c, pgp.h, -+ pgp.c, pattern.c, parse.h, parse.c, pager.h, pager.c, mx.h, mx.c, -+ mutt_socket.h, mutt_regex.h, mutt_menu.h, mutt_curses.h, mutt.h, -+ mime.h, mh.c, menu.c, mbox.c, mapping.h, main.c, mailbox.h, -+ lib.c, keymap.h, keymap.c, init.h, init.c, imap.h, imap.c, -+ hook.c, history.h, history.c, help.c, headers.c, hdrline.c, -+ hash.h, hash.c, handler.c, gnupgparse.c, globals.h, getdomain.c, -+ gen_defs, functions.h, from.c, flags.c, filter.c, enter.c, edit.c, -+ dotlock.h, dotlock.c, date.c, curs_main.c, curs_lib.c, copy.h, -+ copy.c, configure.in, compose.c, complete.c, commands.c, color.c, -+ charset.h, charset.c, buffy.h, buffy.c, browser.c, attach.h, -+ attach.c, alias.c, addrbook.c, acconfig.h, TODO, README, NEWS, -+ Muttrc.in, Makefile.in, Makefile.am, INSTALL, GPL, COPYRIGHT: -+ Add RCS $Id$ strings to (hopefully) all source files. -+ -+ * enter.c: Type Ctrl-V Ctrl-G in any input field. -+ -+ * curs_main.c: Bumping some dprint statements' debug levels. -+ From Vikas. -+ -+ * po/ru.po, po/mutt.pot, po/de.po: Including the new ru.po file -+ from "Andrej N. Gritsenko" ; check-point commit. -+ -+1998-10-12 19:53:49 roessler (roessler) -+ -+ * recvattach.c, query.c, postpone.c, pgpkey.c, curs_main.c, -+ compose.c, browser.c, addrbook.c: The attached patch removes -+ some redundant code related to the macro function stuff. Since -+ each menu calls km_dokey() to get the 'op' number to execute, the -+ 'menu' argument to km_dokey() _is_ the CurrentMenu. Hence, there -+ is no need to explicitly save/restore the CurrentMenu all over -+ the code. The only places it is being captured now is just before -+ mutt_enter_comamnd() is called. This is to help the 'exec' command -+ completion code so that it knows which menu to try and complete -+ the function name from. (From: Vikas Agnihotri ) -+ -+ * doc/manual.sgml.in, doc/manual.sgml, doc/Makefile.in, sendlib.c, -+ main.c, init.c, configure.in, configure, config.h.in, acconfig.h, -+ Makefile.in, Makefile.am: Mutt now correctly uses the sysconfdir -+ as determined by configure. -+ -+ * po/ru.po, po/mutt.pot, po/de.po: Checkpoint commit. -+ -+ * po/ru.po, po/mutt.pot, po/de.po, reldate.h, configure.in, -+ configure, ChangeLog: Check-point commit before 0.94.11 is -+ released. -+ -+1998-10-11 22:11:00 roessler (roessler) -+ -+ * doc/Makefile.in, contrib/Makefile.in: Makefile clean-up as -+ suggested by Marco d'Itri. -+ -+ * doc/dotlock.man.in: branches: 1.3.4; Install dotlock's manual -+ page under the correct name. -+ -+ * doc/Makefile.in: Install dotlock's manual page under the -+ correct name. -+ -+1998-10-08 13:22:16 roessler (roessler) -+ -+ * README: Reference some of the new doc files. -+ -+ * doc/Makefile.in: Some more changes to the installation process. -+ -+ * doc/Makefile.in: Fix the uninstall target; add some magic to -+ build and install the HTML version of the manual if we can. -+ -+ * doc/applying-patches.txt, doc/devel-notes.txt, -+ doc/PGP-Notes.txt, doc/Makefile.in: Some more documentation; -+ install the html version of the manual if it's there. -+ -+ * doc/manual.sgml: The manual was wrong on the default binding -+ for extract-keys. -+ -+1998-10-07 22:19:27 roessler (roessler) -+ -+ * doc/manual.sgml, pop.c, mutt.h, init.h, Muttrc.in: POP3 -+ LAST support. From Jason Lavoie by way of -+ Michael Elkins. -+ -+ * po/mutt.pot, po/cat-id-tbl.c: Clean-up commit. -+ -+ * gnupgparse.c: Redirect stdin and stderr to /dev/null when -+ invoking gpgm for listing key IDs. -+ -+ * socket.c, mutt_socket.h, imap.c: First fix of the IMAP expunge -+ handling. From Brandon Long. -+ -+ * keymap.c, curs_lib.c: Fix macro functions for the pager menu. -+ -+ * keymap.c: The attached patch fixes a minor inconsistency -+ between the display of special key-names in the help screen -+ and their actual usage. The help screen now shows the special -+ keys exactly as you would/could/should use them in the -+ muttrc/command-line. (From: Vikas Agnihotri ) -+ -+ * keymap.c: Fix the error message for unbound keys. From Vikas. -+ -+ * browser.c: Clean up behind an aborted sort-by prompt on the -+ file browser. From Vikas. -+ -+ * hdrline.c: The attached patch fixes a minor bug in -+ $index_format's %B and %b where they didnt respect the given -+ prefix. In addition, the manual says that %B is supposed to fall -+ back to %b if the message is not sent to a known mailing list. The -+ code was not doing that. (From: Vikas Agnihotri , -+ noted on comp.mail.mutt by unny@rz114s0.rz.uni-karlsruhe.de -+ (Vladimir Klebanov)). -+ -+ * doc/PGP-Notes.txt: pgp_language is obsolete. Noted by Heiko -+ Schlichting. -+ -+1998-10-06 15:10:53 roessler (roessler) -+ -+ * keymap.c: Macro function fixes. -+ -+ * curs_lib.c: With slang, ERR != -1. -+ -+ * po/mutt.pot, po/de.po: Message fix. -+ -+ * attach.c: Fix another pipe-related hang in -+ mutt_view_attachment(). -+ -+1998-10-05 21:37:15 roessler (roessler) -+ -+ * configure, aclocal.m4: Another fix to libintl detection. -+ -+ * keymap.c, curs_lib.c: macro_function.2-3, from Vikas. -+ -+ * handler.c: File descriptor leak alert. -+ -+ * handler.c: Avoid a hang due to blocking pipe writes in the -+ auto view code. -+ -+ * keymap.c, curs_main.c, curs_lib.c: Make exec grok >= 1 -+ parameters; fix double ops problem in index_menu(). -+ -+ * po/ru.po, po/mutt.pot, po/de.po, po/cat-id-tbl.c: L10n changes -+ corresponding to the macro-function patch. -+ -+ * flags.c, compose.c: Some fixes to the macro-function patch. -+ -+ * po/ru.po: Adding the Russian Localization. -+ -+ * recvattach.c, query.c, protos.h, postpone.c, pgpkey.c, -+ pager.c, mutt_curses.h, mutt.h, menu.c, keymap.c, init.h, -+ init.c, globals.h, flags.c, enter.c, curs_main.c, curs_lib.c, -+ configure.in, configure, compose.c, commands.c, browser.c, -+ addrbook.c, aclocal.m4: Vikas' macro_function patch. -+ -+1998-10-04 15:02:25 roessler (roessler) -+ -+ * configure.in, configure: Fixing some make-related problems -+ noted by Petri Kaukasoina . -+ -+ * po/mutt.pot, send.c: Fix group-reply's behaviour. -+ -+ * doc/devel-notes.txt, doc/style-guide: Replace style-guide by -+ some more general notes on mutt development. -+ -+ * Makefile.in: Propagate fixes from Makefile.am. -+ -+ * ChangeLog: Preparing 0.94.10. -+ -+ * po/mutt.pot, po/de.po: Noise. -+ -+ * configure.in, configure, Makefile.am: More fixes to the build -+ process. This version was tested to build cleanly under SuSE -+ Linux and IRIX. -+ -+1998-10-03 22:08:09 roessler (roessler) -+ -+ * doc/manual.txt: manual.txt can be rebuilt when making the dist - -+ no need to keep this in the repository. -+ -+ * ChangeLog: Preparing ChangeLog for 0.94.10. -+ -+ * contrib/Makefile.in: Ups. -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c, -+ po/Makefile.in.in, doc/language50.txt, doc/language.txt, -+ contrib/patch.slang-1.2.2.keypad.1, contrib/sample.mailcap, -+ contrib/sample.muttrc, doc/Makefile.in, contrib/Mush.rc, -+ contrib/Pine.rc, contrib/language.txt, contrib/language50.txt, -+ sample.muttrc, sample.mailcap, reap.pl, pop.c, -+ patch.slang-1.2.2.keypad.1, depend.awk, configure.in, configure, -+ Pine.rc, Mush.rc, Makefile.in, Makefile.am, ChangeLog: Source tree -+ and make process changes. make dist and make maintainer-clean -+ should now work as they are supposed to. -+ -+ * help.c: Remove an unprotected gettext() call. -+ -+ * missing: *** empty log message *** -+ -+ * missing: Persuade CVS to get the file modes right. -+ -+ * INSTALL: Adding a note on SparcLinux problems when gcc is -+ called with the -pedantic flag. -+ -+1998-10-02 17:39:47 roessler (roessler) -+ -+ * po/mutt.pot, po/de.po: A small fix to get autoview messages -+ properly colored. -+ -+ * pattern.c, mutt.h, Makefile.in: patch-0.92.8.sec.match_all.1 -+ -+ * po/mutt.pot, configure.in, configure, Makefile.in, Makefile.am: -+ Fixing some build-related problems, and preparing 0.94.9p1. -+ -+ * doc/manual.txt, doc/manual.sgml, hdrline.c: Roland Rosenfeld's -+ first name patch. -+ -+ * mutt.h, compose.c: More () fixes. -+ -+ * mutt.h, edit.c, curs_lib.c, browser.c: With SLang, addstr() -+ is a macro. This means we should put additional braces around -+ _()-style arguments. -+ -+1998-10-01 20:16:56 roessler (roessler) -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c, po/POTFILES.in, -+ doc/Makefile.in: Translate help strings. -+ -+ * postpone.c, pager.c, help.c, compose.c, Makefile.in: Translate -+ help strigns. -+ -+ * intl/VERSION, intl/libintl.h, intl/libintl.glibc, -+ intl/intlh.inst.in, intl/COPYING, intl/BUGS, intl/AUTHORS: *** -+ empty log message *** -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c, po/POTFILES.in, -+ recvattach.c, query.c, pager.c, curs_main.c, compose.c, browser.c, -+ addrbook.c: Translate the various help lines. -+ -+ * mutt.h, lib.c, handler.c: Gero Treuner's reply_quote patch. -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c, po/POTFILES.in: Add -+ l10n for handler.c. -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c, curs_lib.c: Make -+ mutt_yesorno() language sensitive. -+ -+ * po/de.po: Various German-language related fixes. -+ -+ * reldate.h, configure.in, configure, TODO, Makefile.in, -+ ChangeLog: Preparing 0.94.9i. -+ -+ * po/de.po: German l10n, first take. -+ -+ * intl/AUTHORS, intl/BUGS, intl/COPYING: Adding legalese. -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c, main.c: More i18n fixes. -+ -+ * po/mutt.pot, po/de.po, po/cat-id-tbl.c: Adapting the catalog -+ files to 0.94.8. -+ -+ * configure.in, configure, Makefile.in, Makefile.am: Various -+ automake and installation fixes. -+ -+ * po/Makefile.in.in, po/POTFILES.in, po/cat-id-tbl.c, po/de.po, -+ po/mutt.pot, po/stamp-cat-id, intl/ChangeLog, intl/Makefile.in, -+ intl/bindtextdom.c, intl/cat-compat.c, intl/dcgettext.c, -+ intl/dgettext.c, intl/explodename.c, intl/finddomain.c, -+ intl/gettext.c, intl/gettext.h, intl/gettextP.h, -+ intl/hash-string.h, intl/intl-compat.c, intl/intlh.inst.in, -+ intl/l10nflist.c, intl/libgettext.h, intl/libintl.glibc, -+ intl/libintl.h, intl/linux-msg.sed, intl/loadinfo.h, -+ intl/loadmsgcat.c, intl/localealias.c, intl/po2tbl.sed.in, -+ intl/textdomain.c, intl/xopen-msg.sed, doc/Makefile.in, thread.c, -+ stamp-h.in, status.c, sort.c, signal.c, sendlib.c, send.c, -+ score.c, rfc1524.c, recvattach.c, query.c, postpone.c, pop.c, -+ pgppubring.c, pgpkey.c, pgp.c, pattern.c, parse.c, pager.c, mx.c, -+ missing, mutt.h, mh.c, menu.c, mbox.c, main.c, lib.c, keymap.c, -+ init.c, imap.c, hook.c, help.c, headers.c, handler.c, gen_defs, -+ flags.c, edit.c, date.c, curs_main.c, curs_lib.c, copy.c, -+ configure.in, configure, config.h.in, compose.c, commands.c, -+ color.c, buffy.c, browser.c, attach.c, alias.c, aclocal.m4, -+ addrbook.c, acconfig.h, ABOUT-NLS, Makefile.am, Makefile.in: -+ Adding gettext support, based on the patch by Marco d'Itri. -+ -+ * TODO: add a note about the currently-missing mh_sequences -+ support. -+ -+ * send.c: Fix the PgpSignMicalg vanishing when recalling -+ postponed messages. Bug squashed by Bjørn Fischer. -+ -+1998-09-30 13:56:24 roessler (roessler) -+ -+ * doc/manual.txt, doc/manual.sgml: SGML fix. -+ -+ * postpone.c, headers.c: Don't generate a NULL micalg parameter -+ when getting postponed messages. -+ -+ * functions.h: Removing some superfluous key bindings from -+ functions.h. (From: Gero Treuner ) -+ -+ * doc/manual.sgml, init.c: Add some more support for -+ version-dependant configuration files. -+ -+ * copy.c: When forwarding a mail (nomime_forw) and you have -+ forw_quote set, mutt inserts a blank line between header and -+ body of the forwarded message. -+ -+ * compose.c: Tell the user how to attach messages when using -+ the attach-message feature. -+ -+ * doc/manual.sgml, pattern.c, mutt.h: Add ~g and ~G patterns -+ for PGP signed and encrypted messages. -+ -+ * doc/manual.sgml: Documentation for Vikas' latest features. -+ -+1998-09-29 15:40:01 roessler (roessler) -+ -+ * status.c: _Really_ fix an unset or too short StChars varialbe. -+ (From Vikas.) -+ -+ * rfc822.c: Fix a segmentation fault occuring with certain -+ badly-formed RFC822-like addresses. -+ -+ * hdrline.c: Make status characters work again. -+ -+ * doc/manual.txt, doc/manual.sgml: Documenting some more -+ variables. -+ -+ * Muttrc.in: Add newly added variables to the default system -+ muttrc. -+ -+ * status.c: Catch short StChars values. -+ -+ * mutt.h, init.c, hdrline.c: Add caching for a message's flags. -+ -+ * Makefile.in: patch-0.94.7i.rr.charsets_fix.1, from Roland -+ Rosenfeld. -+ -+ * doc/manual.txt, doc/manual.sgml, configure.in, configure: -+ Some nits from Gero Treuner. -+ -+1998-09-28 17:40:47 roessler (roessler) -+ -+ * pager.c, curs_main.c: Vikas' pipe-redraw fix. -+ -+ * doc/manual.txt, doc/manual.sgml, doc/Makefile.in, GPL, main.c, -+ COPYRIGHT, COPYING: A first take at bringing copyright notices -+ and credits into synch with reality. -+ -+ * reldate.h, configure.in, configure, TODO, Makefile.in, -+ ChangeLog: Preparing 0.94.8i. -+ -+1998-09-26 10:13:39 roessler (roessler) -+ -+ * mh.c: Changing the index_hint handling for mh folders once -+ again. -+ -+ * mh.c: Resort the incoming folder from mh_sync_mailbox() also -+ when new mail arrived. -+ -+1998-09-25 06:56:35 roessler (roessler) -+ -+ * pager.c: patch.mutt-0.94.5i.ld.quote_levels.3-4 -+ -+1998-09-24 23:19:50 roessler (roessler) -+ -+ * pager.c: A new quote_levels patch from liviu. -+ -+ * sendlib.c: Rewrite the base64-encoder used for messages. This -+ should be unified with the encoder in rfc2047.c at some point. -+ -+ * pager.c: Undoing Livius quote-levels patch for now. -+ -+ * sendlib.c, mutt.h, charset.h, charset.c: -+ [patch-0.94.7i.gt.charset-send.1.gz] With the new charset support -+ in mutt there are better chances to say whether a mail to send -+ consists of characters of the ASCII set only (the charset should -+ be "us-ascii" then) or of other characters from the given charset -+ (this charset should be given then): ASCII characters have the -+ unicode values from 0 to 127. -+ -+ * init.c: Fix a segmentation fault with mismatched backticks. -+ -+ * init.c: Vikas' merged completion patch, level 3. -+ -+1998-09-23 20:01:06 roessler (roessler) -+ -+ * pager.c, mutt_regex.h, init.h: Liviu Daia's smiley patch. -+ -+ * status.c, sendlib.c, recvattach.c, protos.h, pager.h, pager.c, -+ mutt.h, main.c, init.h, curs_main.c, curs_lib.c, compose.c, -+ commands.c: Disable recursive invocations of the attach-message -+ function. -+ -+ * mh.c: Really fix the index hints. -+ -+ * mh.c: Correct the index_hint handling in mh_check_mailbox(). -+ -+ * sendlib.c: RFC2047-encode the mail-followup-to header. -+ -+ * TODO: Remove the maildir/mh resynch entry. -+ -+ * pager.c: There is a long-standing problem in Mutt, related to -+ coloring the various levels of quoting: if the attributions are -+ missing, like this: -+ >>> blah blah from A >> blah blah from B > blah blah -+ from C -+ -+ then the "quoted" color object is associated with ">>>", "quoted1" -+ with ">>" and "quoted2" with ">" --- which is not what most people -+ expect. The reason is Mutt doesn't count the quote characters -+ (since there is no way to distinguish between a single quote ">> -+ " and a ">" followed by a "> "), and it allocates colors as it -+ finds new types of quote prefixes. The attached patch fixes this -+ problem still without counting the quote characters. -+ -+1998-09-22 22:54:52 roessler (roessler) -+ -+ * mx.h, mx.c, mutt.h, mh.c, mbox.c, buffy.c: A first take at -+ corrected mh/maildir support. -+ -+ * mx.c, mh.c: Some fixes and code clean-ups. -+ -+ * mutt.h, mh.c, init.h: Introduce the $mh_purge option. -+ -+ * sendlib.c: Produce "undisclosed-recipients:;" instead of -+ ""undisclosed-recipients:;":;" when the user gives no To-Header. -+ -+ * mx.c: When generating new messages in MH folders, the initial -+ number should be "1", not "2". Fix from Gero Treuner. -+ -+ * init.c: patch-0.94.7i.vikas.jmy.misc_complete.2 -+ -+1998-09-21 12:49:50 roessler (roessler) -+ -+ * sendlib.c: Avoid a dangling pointer in mutt_message_to_7bit(). -+ -+1998-09-20 12:05:39 roessler (roessler) -+ -+ * pager.c: Byrial Jensen's bold-underline patch. -+ -+1998-09-18 05:45:56 roessler (roessler) -+ -+ * reldate.h, configure.in, configure, ChangeLog: Preparing -+ 0.94.7i. -+ -+ * protos.h, init.c, enter.c: Applying the third generation of -+ command completion patches. -+ -+1998-09-16 20:08:25 roessler (roessler) -+ -+ * curs_lib.c: Attached is a minor fix to mutt_getch in curs_lib.c -+ - as of 0.93.2i, if +'metakey' and 'timeout' were both set, -+ mutt_getch was returning an ESC rather than -1, which resulted -+ in 'key not bound' messages every 'timeout' seconds. (From: -+ Tim Walberg ) -+ -+ * copy.c: [patch-0.94.6i.oe.dprint2.1] Fix a segmentation fault -+ when running in -d2 mode. -+ -+ * keymap.c: Use for function keys as well as for other -+ special keys. Additionally, this patch makes it possible to -+ use all special keys inside a key _sequence_. -+ -+ * sendlib.c, mutt.h, curs_main.c, compose.c: -+ Introduce the OPTUSEHEADERDATE pseudo-option to control -+ mutt_write_rfc822_header()'s behaviour for the purposes of the -+ edit_message feature. -+ -+ * init.c: When parsing aliases, don't consider ';' a token -+ delimiter. -+ -+1998-09-15 21:41:51 roessler (roessler) -+ -+ * init.c: Undoing Vikas' complete patch and applying -+ patch-0.94.6i.jmy.cycle_complete.1 instead. -+ -+ * handler.c: _Really_ fix CRLF handling. -+ -+ * charset.c: Fix the crlf handling. -+ -+ * pgppubring.c: UTF8-decode PGP user ID packets. -+ -+ * rfc2047.c, mutt.h, lib.c, handler.c, charset.h, charset.c: -+ Adding basic UTF-8 support. -+ -+ * copy.c: When using mutt_copy_header with CH_TXTPLAIN, generate -+ a content-type _with_ a character set parameter. -+ -+ * Makefile.in: Correcting a typo in the clean target. -+ -+ * handler.c, charset.h, charset.c: Add charset alias support -+ and fix various errors in the character set code. -+ -+ * charset.c: Fix mutt_display_char to map '\0' to itself -+ regardless of the translation table we use. -+ -+ * gen-charset.c, configure.in, configure, charset.h, charset.c, -+ Makefile.in: Generate the character set tables from i18n files. -+ -+ * imap.c: Finally fix imap_quote_string(). -+ -+ * compose.c: [patch-0.94.6i.gt.arrow.1] Add M_ARROWCURSOR on -+ the compose menu. -+ -+1998-09-14 21:33:34 roessler (roessler) -+ -+ * imap.c: Fix IMAP quoting. -+ -+ * Muttrc.in: Speling corection for Muttrc.in. -+ -+ * init.c: [patch-0.94.6.vikas.complete.1] Fix a completion-related -+ buffer overflow. -+ -+1998-09-13 15:29:54 roessler (roessler) -+ -+ * reldate.h, configure.in, configure, ChangeLog: Preparing -+ 0.94.6i. -+ -+ * sendlib.c, rfc2047.c, recvattach.c, hash.h, gen-charset.c, -+ handler.c, configure.in, configure, commands.c, charset.h, -+ charset.c, Makefile.in: This patch adds on-demand loading of -+ character set tables, changes the default location of $SHAREDIR, -+ and fixes some compilation problems occuring on machines without -+ PGP installed. -+ -+1998-09-12 19:58:56 roessler (roessler) -+ -+ * sendlib.c: Fixing a silly typo in the edit-message code. -+ -+ * rfc2047.c, charset.c, charset.h, handler.c, Makefile.in: -+ [patch-0.93.2i.ru.mmultiple_charsets.gz] This patch adds support -+ for international character sets. Currently, mutt knows about -+ the following character sets and is able to convert between them: -+ -+ iso-8859-1, ..., iso-8859-9, koi8-r, windows-1251, x-cp866. -+ -+ (From: Ruslan Ermilov ) -+ -+ * recvattach.c, protos.h, pattern.c, mutt.h, init.c, history.h, -+ enter.c, commands.c: When entering a 'set' command on the -+ command-line, pressing TAB after string_var= will insert the -+ current value of that variable. Note that this works only for -+ variables of type 'string'. -+ -+ Also fixes the following buglets in command-completion: -+ -+ 1. doesnt work if you started the command-line with whitespace -+ -+ 2. Seems to think that 'Set', 'ReSeT', etc are valid commands -+ (since it checks for 'strcasecmp' instead of 'strcmp' when -+ completing the variable names Also fixes the following buglets -+ in command-completion: -+ -+ (From: Vikas Agnihotri ) -+ -+ * enter.c: Use the proper history class when entering mutt -+ commands. -+ -+ * imap.c: [patch-0.94.5i.jmy.imap_quote.1] -+ -+ * sendlib.c, send.c, protos.h, postpone.c, parse.c, mutt.h, -+ lib.c, functions.h, curs_main.c, compose.c, OPS: Adding the -+ edit-message feature. -+ -+ * hdrline.c: [patch-0.94.5.vikas.collapse_format.2] - introduce -+ %M for the number of messages which is hidden in a thread. -+ -+1998-09-08 19:32:57 roessler (roessler) -+ -+ * TODO: Bogus bug. Actually, by setting use_mailcap=no, it _is_ -+ possible to view the header of a single-part message with a -+ non-autoview body type. -+ -+ * recvattach.c: This patch makes the view attachment menu show -+ all message/rfc822 parts as a new level, not only the multipart -+ messages. This makes it possible to display a message/rfc822 part -+ which includes only a image/jpeg part or something else which cant -+ be viewed in the pager. (From: Jimmy Mäkelä ) -+ -+ * recvattach.c, pgp.c, copy.c: Change the interface of -+ pgp_decrypt_mime() to enable this function to do some sanity -+ checks. -+ -+1998-09-07 20:47:25 roessler (roessler) -+ -+ * recvattach.c: Don't descend into multipart/encrypted on the -+ recvattach menu. -+ -+ * sendlib.c, recvattach.c, pgp.h, pgp.c, lib.c, handler.c, -+ commands.c: [patch-0.94.5i.tlr.pgp_fixes.1] This patch fixes -+ various pgp-related issues. In particular, mutt won't segfault -+ when trying to decrypt-save messages from the index, and the -+ presence of a PGP-encrypted body part on the attachment menu -+ will no longer confuse the MIME parser. -+ -+ * curs_lib.c: Clear the "Exit Mutt" prompt. -+ -+ * doc/manual.txt, doc/manual.sgml: SGML typo. -+ -+ * rfc822.c: Some testing. -+ -+ * enter.c: Yet another fix to the alias and query completion -+ stuff: Skip leading white space when constructing the addresses. -+ -+ * enter.c: Don't use as an address delimiter when using -+ query-complete and alias-complete. -+ -+ * rfc1524.c: Quote MIME parameters when doing %{MIME-parameter} -+ substitution. -+ -+ * sendlib.c, recvattach.c, protos.h, pgp.h, pgp.c, pager.c, -+ mutt.h, init.h, handler.c, functions.h, curs_main.c, copy.h, -+ copy.c, commands.c, OPS.PGP: Introducing decrypt-save, -+ decrypt-copy, and $forw{ard,}-decrypt. Based on work by Emil -+ Laurentiu. -+ -+ * mbox.c: [patch-0.94.4i.matthewf.writingmessages-fix.1] Fix -+ the display when synchronizing mbox mail folders. -+ -+ * query.c, protos.h, pattern.c, lib.c, curs_lib.c: Fix simple -+ patterns. -+ -+ * protos.h, mx.c, browser.c: Put the S_ISLNK definition into -+ protos.h. -+ -+ * pgp.c: Fixing convert_to_7bit(). From Liviu Daia. -+ -+1998-09-06 11:35:34 roessler (roessler) -+ -+ * lib.c: Fixing the quoting of shell specials in -+ mutt_expand_fmt(). -+ -+ * query.c: Change snprintf to mutt_expand_fmt when expanding -+ the query command. -+ -+ * protos.h, lib.c, attach.c, TODO: -+ [patch-0.94.5i.tlr.safe_symlink.1] Introduce safe_symlink() -+ for /tmp-safe symlinking in the nametemplate code. -+ -+ * reldate.h, configure.in, configure, TODO, ChangeLog: Preparing -+ 0.94.5i. -+ -+1998-09-04 15:53:27 roessler (roessler) -+ -+ * sendlib.c: Catch MIME parameters with p->value == NULL. -+ -+ * sendlib.c: Fixing a memory leak in mutt_prepare_envelope(). -+ -+1998-09-01 06:54:53 roessler (roessler) -+ -+ * imap.c: IMAP fixes from Nathan Neulinger. -+ (<19980831170941.A7327@umr.edu> on mutt-dev.) -+ -+1998-08-31 16:46:29 roessler (roessler) -+ -+ * send.c: Fix a small problem with Liviu's attach_fcc patch. -+ -+ * compose.c: Updating to patch-0.94.4.vikas.attach_message.3. -+ -+ * thread.c, protos.h, mutt.h, init.h, hdrline.c, curs_main.c: -+ Updating to patch-0.94.4.vikas.collapse.3. -+ -+1998-08-29 08:27:02 roessler (roessler) -+ -+ * doc/manual.txt, doc/manual.sgml: Correct an editor key binding -+ example. -+ -+1998-08-28 19:09:24 roessler (roessler) -+ -+ * send.c, pgp.h, pgp.c: Cleaning up the fcc_attach hack. -+ From Liviu. -+ -+ * functions.h, browser.c, OPS: -+ [patch-0.94.4i.tlr.display_filename.1] Introduce a new function -+ "display-filename" which displays the currently selected file's -+ name on the message line. -+ -+ * attach.c: [patch-0.94.4i.tlr.get_attachment.1-2] Get the -+ attachment time stamping business right. -+ -+ * protos.h, functions.h, compose.c, attach.c, OPS: -+ [patch-0.94.4i.tlr.get_attachment.1] Create a new "get-attachment" -+ function on the compose menu which will copy an attachment to -+ a temporary file. -+ -+ * compose.c: [patch-0.94.4.vikas.attach_message.1] Cleaning up -+ some of the attach-message code. -+ -+ * thread.c: removing superfluous include statements. -+ -+1998-08-27 23:51:58 roessler (roessler) -+ -+ * curs_main.c: code cosmetics. -+ -+ * thread.c, sort.c, protos.h, pattern.c, mx.c, mutt.h, -+ mbox.c, init.h, hdrline.c, functions.h, curs_main.c, OPS: -+ [patch-0.94.4.vikas.collapse.2] Vikas' collapse-thread patch. -+ -+ * recvattach.c, postpone.c, mutt.h, lib.c, curs_main.c, browser.c, -+ addrbook.c: [patch-0.94.4i.gt.arrowcursor.1] Padding to the end of -+ line/right jusitifying does not work in menus when $arrow_cursor -+ is set, because the extra space needed for the arrow is not taken -+ into account. (From Gero Treuner ) -+ -+ * testmsg, rfc1524.c: [patch-0.94.4i.tlr.shell_quote.1-2] Fix -+ a brain-dead segmentation fault when freeing non-allocated memory. -+ -+ * doc/mutt.sgml: Mh. This seems to have shown up again while -+ cleaning up the CVS branches. -+ -+ * sendlib.c, send.c, protos.h, pgp.h, pgp.c: Make $fcc_attach work -+ correctly when sending PGP-encrypted messages. Hack by Liviu. -+ -+ * doc/manual.txt, doc/manual.sgml: Document attach_format. (From: -+ Gero Treuner ) -+ -+ * rfc1524.c, protos.h, pgpinvoke.c, mx.c, lib.c, curs_lib.c: -+ [patch-0.94.4i.tlr.shell_quote.1] Try to quote file name arguments -+ and the like for shell commands. -+ -+ * pgpkey.c: Minor nit: if you enter the wrong key ID at Mutt's -+ prompt, Mutt should erase the old value --- otherwise people -+ might think it has just hung there. (From Liviu Daia.) -+ -+1998-08-26 21:12:23 roessler (roessler) -+ -+ * rfc822.c: Another possible memory leak in rfc822_parse_adrlist. -+ The problem and the patch are pretty much the same as with the -+ last fix applied to this file - it's just ',' instaed of ';' -+ this time. -+ -+ * rfc822.c, TODO: [patch-0.94.4i.tlr.rfc822_leak.1] Fixing a -+ memory leak in the rfc822_parse_adrlist(). -+ -+ Some explanations seem to be in order here. Let's look at -+ the code: -+ -+ 386 else if (*s == ';') 387 { 388 if -+ (phraselen) 389 { 390 phrase[phraselen] = 0; -+ 391 add_addrspec (&top, &last, phrase, comment, -+ &commentlen, sizeof (comment) - 1); 392 } 393 -+ else if (commentlen && !last->personal) 394 { 395 -+ comment[commentlen] = 0; 396 last->personal = -+ safe_strdup (comment); 397 } 398 #ifdef EXACT_ADDRESS -+ 399 if (last && !last->val) -+ -+ Line 399 contains the change; previously, it looked like this: -+ -+ 399' if (last) -+ -+ 400 last->val = mutt_substrdup (begin, s); 401 #endif -+ 402 403 /* add group terminator */ 404 cur = -+ rfc822_new_address (); 405 if (last) 406 { 407 -+ last->next = cur; 408 last = cur; 409 } 410 411 -+ phraselen = 0; 412 commentlen = 0; 413 s++; -+ 414 begin = s; 415 SKIPWS (begin); 416 } -+ -+ OK, what happens? There are essentially two situations here: -+ -+ -> We have already parsed a complete address specification and -+ know about this fact, but there was no new address information. -+ This is the case if we are parsing through addresses like -+ -+ undisclosed-recipients:; -+ -+ or -+ -+ recipients: a, b, c,; -+ -+ (Note the extra ',' before the ';'!) -+ -+ In this case, some of the other code in rfc822.c has already -+ filled in last->val, and we really shouldn't overwrite that -+ with a NULL pointer. -+ -+ -> The ';' finishes an address spec, like in -+ -+ recipients: a; -+ -+ In this case, last is either set by add_addrspec(), or it -+ has already been set by some of the previous code (comment -+ handling, ...). Anyway, last->val is still NULL, so it is -+ correct to write the complete addr spec to last->val. -+ -+ * imap.c: Error message cosmetics. -+ -+1998-08-25 22:34:58 roessler (roessler) -+ -+ * doc/mutt.man.in, doc/mutt.man, doc/manual.txt, doc/manual.sgml, -+ doc/dotlock.man.in, doc/PGP-Notes.txt, doc/Makefile.in, -+ thread.c, status.c, sort.h, socket.c, snprintf.c, sendlib.c, -+ send.c, sample.muttrc, rfc822.c, rfc2047.c, rfc1524.h, rfc1524.c, -+ reldate.h, recvattach.c, reap.pl, query.c, protos.h, postpone.c, -+ pop.c, pgppubring.c, pgp.c, pattern.c, patch.slang-1.2.2.keypad.1, -+ parse.c, pager.h, pager.c, mx.h, mx.c, mutt_socket.h, mutt_menu.h, -+ mutt.h, mime.h, mh.c, menu.c, mbox.c, main.c, mailbox.h, lib.c, -+ keymap.h, keymap.c, init.h, init.c, imap.h, imap.c, hook.c, -+ history.h, history.c, help.c, headers.c, hdrline.c, hash.c, -+ handler.c, globals.h, functions.h, from.c, enter.c, edit.c, -+ dotlock.h, dotlock.c, date.c, curs_main.c, curs_lib.c, copy.c, -+ configure.in, configure, config.sub, config.h.in, config.guess, -+ compose.c, commands.c, color.c, buffy.c, browser.c, bind.c, -+ attach.h, attach.c, alias.c, addrbook.c, acconfig.h, TODO, README, -+ OPS, NEWS, Muttrc.in, Makefile.in, INSTALL, Changes, ChangeLog: -+ CVS branch clean-up. -+ -+ * rfc1524.c, attach.c, TODO: [patch-0.94.4i.tlr.nametemplate.1] -+ Fix nametemplate support: We should not move the user's files -+ around just to make them match mailcap's idea of their file name. -+ This patch uses symbolic links instead. -+ -+ * curs_main.c: [patch-0.94.4i.tlr.synch_fault.1] Start up two -+ mutts. Delete the last message in both of them. Synchronize the -+ mailbox in both of them. Segmentation fault. -+ -+ * TODO: adding a few notes. -+ -+ * commands.c: If you issue "decode-save" on an encrypted message -+ without reading it first, Mutt won't prompt you for a passphrase, -+ and it will happily write an empty message, deleting the original. -+ (From an unnamed colleague of Liviu Daia.) -+ -+ * imap.c: [patch-0.94.4i.tlr.imap_newline.2] Use cr nl instead -+ of single nl when uploading a message to an imap server. -+ -+ * sendlib.c, protos.h, postpone.c, compose.c: -+ [patch-0.94.4i.tlr.encoding.1] Fix content-transfer-encoding -+ updates when renaming files from the compose menu and when -+ recalling postponed messages. -+ -+ * imap.c: s/free/FREE/ -+ -+1998-08-24 19:40:35 roessler (roessler) -+ -+ * TODO, BUGS: Compile BUGS and TODO into a comprehensive issue -+ list. -+ -+ * BUGS: Clean up the bug list. -+ -+ * reldate.h, configure.in, configure, ChangeLog: 0.94.4i. -+ -+ * doc/manual.txt, doc/manual.sgml: Documenting $hidden_host. -+ -+ * thread.c, curs_main.c: Fix "previous-subthread" -+ in reverse-threads mode, allow next-(sub)thread and -+ previous-(sub)thread to work in limited mode. (From: Liviu Daia) -+ -+1998-08-23 10:05:41 roessler (roessler) -+ -+ * sendlib.c, send.c, protos.h, mutt.h, main.c, init.h, init.c, -+ configure.in, configure, config.h.in, alias.c, acconfig.h, -+ INSTALL: [patch-0.94.3i.tlr.hidden_host.1] Replace the -+ --enable-hidden-host configure switch by a configuration variable -+ $hidden_host which can be changed at run-time. This variable -+ will _not_ affect the generation of message-IDs since we'll get -+ into uniqueness problems if we just use the domain here. -+ -+ Needs to be documented. -+ -+ * doc/manual.txt: Committing the latest manual changes. -+ -+ * socket.c, imap.c: [patch-0.94.3.bl.imap_buffy.1-2] Fixing the -+ buffered read stuff. -+ -+ * mutt_socket.h: branches: 1.1.2; file mutt_socket.h was -+ initially added on branch mutt-0-94. -+ -+ * mutt_socket.h: Ups, this one was missing from Brandon's -+ IMAP patch. -+ -+1998-08-22 14:24:18 roessler (roessler) -+ -+ * help.c: [patch-0.94.3i.gt.beautify_help.1.gz] General help -+ beautification. From Gero Treuner. -+ -+ * doc/manual.txt, doc/manual.sgml, keymap.h, keymap.c, help.c, -+ Muttrc.in: [patch-0.94.3i.gt.description.1] Introduce macro -+ descriptions. -+ -+ * doc/manual.sgml, init.h, init.c, browser.c: Add a negation -+ operator "!" to $mask's syntax (as in the *-hooks). From Liviu. -+ -+ * recvattach.c: Make Vikas' attac_split and Brandon's other_type -+ patches fit together. -+ -+ * recvattach.c, mutt.h, init.h, globals.h, compose.c: -+ [patch-0.94.3.vikas.attach_split.3] Re-introduce attach_split. -+ -+ * socket.c: branches: 1.1.2; file socket.c was initially added -+ on branch mutt-0-94. -+ -+ * socket.c, mx.c, mutt.h, mailbox.h, imap.h, imap.c, -+ curs_lib.c, configure.in, configure, buffy.c, browser.c, BUGS: -+ [patch-0.94.3.bl.imap_buffy.1] Adding Brandon's IMAP buffy -+ support. -+ -+1998-08-21 08:17:09 roessler (roessler) -+ -+ * browser.c: Enter the file browser, type a mask which doesn't -+ match any file in the current directory, clean the mask. -+ Segfault. Fix from Liviu Daia. -+ -+1998-08-20 22:32:46 roessler (roessler) -+ -+ * sendlib.c, recvattach.c, parse.c, mutt.h, mime.h, lib.c, -+ handler.c, globals.h, compose.c, commands.c, attach.c, BUGS: -+ [patch-0.94.3.bl.other_types.1] This patch adds support for the -+ model MIME type. Additionally, along the lines of "strict in -+ what you generate, accepting in what you receive", this patch -+ will keep the name of major mime types it doesn't recognize -+ (instead of using x-unknown). -+ -+ * compose.c, BUGS: [patch-0.94.3i.jmy.attachmessage-fix.1] -+ This patch fixes a bug in the allocation of space for new -+ pointers to the attachments, it would make mutt seg-fault when -+ attaching 5 or more messages at the same time. (From: Jimmy -+ Mäkelä ) -+ -+ * handler.c: [SECURITY] mutt_sanitize_filename() should be called -+ when creating temporary files for autoview. (From: Liviu Daia.) -+ -+ * sendlib.c, send.c, attach.c: Try this: set $mime_forward, -+ forward a PGP-encrypted message, then in the "compose" menu try -+ to view the forwarded message. If you didn't enter a passphrase -+ before, Mutt won't ask for it either. (From: Liviu Daia) -+ -+ * sendlib.c, attach.c: When you forward a message with -+ $mime_forward set, or when you attach a message with the -+ "attach-message" command from the "compose" menu, there is a -+ memory leak. The real reason for this leak is that multipart -+ attachments are not supported in the "compose" menu, so you -+ need to go through quite a few contortions in order to handle -+ message/rfc822 attachments. Consequently, the patch below is -+ just an ugly hack. (From: Liviu Daia) -+ -+1998-08-16 06:22:51 roessler (roessler) -+ -+ * rfc822.c: Bringing 128-byte strings to "STRING". -+ -+ * sendlib.c: Use add_option, not add_arg, for strings such as -+ "--". -+ -+ * sendlib.c: Pass an "--" argument to sendmail before the -+ address arguments, so addresses with a leading dash don't lead -+ to problems. (From Liviu.) -+ -+ * sendlib.c, rfc822.c, rfc1524.c, parse.c, mx.c, main.c, lib.c, -+ keymap.c, hash.c, handler.c, edit.c, curs_lib.c, alias.c: -+ Replacing a bunch of free() and malloc() calls by safe_free() -+ and safe_malloc(). (From Liviu.) -+ -+1998-08-15 18:27:45 roessler (roessler) -+ -+ * imap.c: read() can't read buffers larger than SSIZE_MAX. -+ -+ * hook.c: [patch-0.94.3i.tlr.empty_hook.1] Ignore empty hooks -+ instead of segfaulting. -+ -+ * protos.h, init.c: [patch-0.94.3i.tlr.history.1] Adding history -+ class support. -+ -+ * history.h: branches: 1.1.2; file history.h was initially -+ added on branch mutt-0-94. -+ -+ * history.h: [patch-0.94.3i.tlr.history.1] Adding history class -+ support. -+ -+ * history.c: branches: 1.1.2; file history.c was initially -+ added on branch mutt-0-94. -+ -+ * history.c, enter.c, TODO, Makefile.in: -+ [patch-0.94.3i.tlr.history.1] Adding history class support. -+ -+ * sendlib.c: [patch-0.94.3i.tlr.attach_msg_fmt.1-2] When -+ generating a message/rfc822 type attachment, parse its header -+ so that the attachment format routines can properly display the -+ default description. -+ -+ * init.h: Change attach_format's default to limit the attachment -+ description's length. -+ -+1998-08-13 22:09:16 roessler (roessler) -+ -+ * pgppubring.c: Fixing another memory leak in the pubring parser. -+ -+ * recvattach.c, BUGS: [patch-0.94.3i.tlr.attach_msg_fmt.1] -+ When parsing the "%d" format option in the attachment format, -+ use the message format as a fall-back if no explicit description -+ is provided. This fixes the following bug: -+ -+ set mime_forward. Forward any mesage. The compose menu will -+ show the description as "Forwarded message from ...." which -+ is fine. Pressing 'd' to edit the description brings up the -+ above string for editing. -+ -+ Now hit Enter on the message/rfc822 attachment to view it. Quit -+ out of the pager. -+ -+ The description field has now changed to the Subject: of the -+ forwarded message. Pressing 'd' still brings up the 'Forwarded -+ message from....' string. -+ -+ (Noted by Vikas.) -+ -+ * doc/manual.txt, doc/manual.sgml, sendlib.c, mutt.h, init.h: -+ [patch-0.94.3i.tlr.write_bcc.1] This patch adds an option -+ $write_bcc which controls whether the Bcc header is written -+ out or not. This can be used to work around broken MTA's (Exim -+ seems to leave Bcc headers in). -+ -+ The problem was noted independently by Peter Radcliffe -+ and by Dave Holland -+ (Debian Bug #25687). -+ -+ * pgppubring.c: [patch-0.94.3i.tlr.pubring_leak.1] Fixing a -+ memory leak. Bug noted by Liviu Daia. -+ -+ * reldate.h: 0.94.3i. -+ -+ * configure.in, configure, ChangeLog: Preparing 0.94.3i. -+ -+ * compose.c: indentation cosmetics. -+ -+ * compose.c: Update menu->data when OP_COMPOSE_EDIT_HDRS is -+ called. From Vikas. -+ -+ * compose.c: Update the encoding after using ispell from the -+ compose menu. From Vikas. -+ -+ * sendlib.c, send.c, protos.h, pgppubring.c, pattern.c, lib.c, -+ curs_main.c, compose.c, attach.c: Various nits from Liviu. -+ -+ * rfc822.c: Fixing a buffer overflow in rfc822_cat(). tmplen -+ could underflow. -+ -+ * rfc822.c: Fixing a buffer overflow in rfc822_cat(). A size_t -+ variable could underflow, thus making bounds checking value-less. -+ -+1998-08-12 11:50:59 roessler (roessler) -+ -+ * init.c: Yet another memory leak fix from Liviu. -+ -+ * rfc2047.c: Fixing a stupid buffer overflow plus some flawed -+ logic. -+ -+ * functions.h, compose.c, OPS: Adding an update-encoding -+ function to the compose menu. This is useful if the user has -+ externally modified an attachment and _wants_ to adjust the -+ encoding afterwards. Also, this patch fixes some redraw-related -+ problems in the compose menu. -+ -+ * sendlib.c, mutt.h, compose.c, BUGS: When changing or deleting -+ attachments, the compose menu now notices this and complains or -+ asks accordingly. Partially from Vikas. -+ -+1998-08-11 08:14:38 roessler (roessler) -+ -+ * BUGS: Yet another outstanding bug. -+ -+ * doc/manual.txt: This now contains the latest changes to -+ manual.sgml. -+ -+ * sendlib.c, rfc2047.c, rfc1524.c, pgppubring.c, pager.c, -+ hdrline.c: Fixing various nits noted by Liviu and his colleagues. -+ -+1998-08-10 15:30:02 roessler (roessler) -+ -+ * sendlib.c: This patches makes the message-id persistant when -+ postponing messages. (From: Janos Farkas) -+ -+ * doc/manual.sgml, sample.muttrc, lib.c, init.h: This patch -+ introduces "unhdr_order" to reset the hdr_order command's effect. -+ (From: Janos Farkas) -+ -+ * color.c: Drop the free_rx parameter from -+ muitt_free_color_line(), as it's always 1. -+ -+ * color.c: Adding mutt_free_color_line() and replacing varous -+ "manual" free()s of color lines by calls to this function. -+ -+ * bind.c: Removing bind.c. Pointed out by Gero Treuner -+ . -+ -+1998-08-09 18:43:45 roessler (roessler) -+ -+ * color.c: With SLang, init_pair is (void), so we must not check -+ its return value. -+ -+ * color.c: Restructuring color.c. This patch fixes the "default" -+ problem from 0.94.2i and makes the code more comprehensible than -+ that version and more consie than 0.94.1i. -+ -+1998-08-08 21:40:12 roessler (roessler) -+ -+ * rfc2047.c: Fixing the "=?" detection in rfc2047_encode_string(). -+ Bug noted by David Jeske . -+ -+ * compose.c: If you press t to add a recipient in the compose -+ menu, then press tab, q, and aborts with ctrl-g, mutt won't -+ redraw the menu. Noted by Jimmy Mäkelä . -+ -+ * alias.c: Entering an un-parsable address when creating an alias -+ would make mutt segfault. Noted by brian moore . -+ -+ * browser.c: If you press tab in the file-browser to see the -+ inboxes and the current row is greater than the inbox-screens -+ max-rows then the screen gets garbled. (From: Jimmy Mäkelä -+ ) -+ -+ * doc/manual.txt, doc/manual.sgml: I made the manual more up -+ to date: -+ -+ * new version * new mailing list and home page addresses * -+ made the terminology a bit more consistent regarding -+ 'pattern' and 'regular expression' * added a note about -+ expanding UNIX environments * added a note about <, >, in range -+ patterns like ~m * added a note about the urlview program * -+ changed tables to not use tabs, because it doesn't work -+ right in my favourite web browsers lynx and netscape -+ -+ (From: Gero Treuner ) -+ -+ * pattern.c: This patch makes pattern ranges more logical. Before -+ '~m <5' would show message 1-5, with this patch it shows 1-4. -+ Inclusive ranges is still avaible if you use '~m -5'. (From: -+ Jimmy Mäkelä ) -+ -+ * init.c: Various improvements to the mutt_command_complete -+ function. From Stephen Hack . -+ -+ * browser.c: If you specify 'mailboxes ""' mutt will -+ seg-fault. (From: Jimmy Mäkelä ) -+ -+ * color.c: Fixing a memory leak. Thanks, Liviu. -+ -+ * commands.c: When printing a message, headers are now sorted -+ according to hdr_order. From Liviu. -+ -+ * browser.c: Fixing an off-by-one buffer overflow in browser.c. -+ Noted by Liviu. -+ -+ * lib.c, attach.c: This patch adds some more "safe" -+ characters to mutt_sanitize_filename and fixes its usage in -+ mutt_view_attachment(). (From: Liviu Daia ) -+ -+ * status.c, sort.h, sendlib.c, send.c, query.c, protos.h, -+ postpone.c, pager.h, pager.c, mutt_menu.h, menu.c, main.c, -+ init.c, headers.c, functions.h, curs_main.c, curs_lib.c, -+ compose.c, commands.c, browser.c, addrbook.c, OPS: Adding the -+ attach message patch. From Vikas Agnihotri . -+ -+ * Makefile.in: There is no "compile" rule for dotlock in the -+ Makefile. (From: Dan Nelson ) -+ -+ * imap.c: Thispatch to imap.c allows the user to specify -+ a port number in the folder name in the general form -+ {hostname:portnum}foldername. (From: Andy Sloane -+ ) -+ -+ * imap.c: imap_close_connection() was being called even though -+ the client was using mulitple mailboxes over the same connection. -+ (From: Brandon Long ) -+ -+1998-07-31 08:23:54 roessler (roessler) -+ -+ * reldate.h, configure.in, configure, ChangeLog: Preparing -+ 0.94.2i. -+ -+ * rfc1524.c: Changing an sprintf to an snprintf (which it was -+ meant to be.) -+ -+ * protos.h: mutt_sanitize_filename takes char *, not const char *. -+ -+ * protos.h, lib.c, attach.c: Introducing mutt_sanitize_filename(). -+ The code is similar to patch-0.91.1i.tlr.rfc1524_sanitize.1 and -+ to Peter Holzer's patch against 0.91. -+ -+ * rfc1524.h, rfc1524.c, postpone.c, attach.c: Avoid possible -+ buffer overflows in mutt_adv_mktemp(). -+ -+ * sendlib.c: Interpret sysexits-style exit values from sendmail. -+ -+ * configure.in, configure, config.h.in, acconfig.h: Check for -+ sysexits.h. -+ -+1998-07-30 09:30:38 roessler (roessler) -+ -+ * edit.c: When reading in files, be_snarf_file() wouldn't -+ recognize '~' as the user's home directory. -+ -+1998-07-29 10:54:09 roessler (roessler) -+ -+ * README, Changes: Finalizing 0.93.2i. -+ -+ * configure.in, configure: Bumping to 0.93.2(i). -+ -+ * parse.c: Fixing a buffer overflow in parse.c. Noted by Paul -+ Boehm . -+ -+ * parse.c: Fixing a buffer overflow in parse.c which presented -+ a serious security thread. Noted by Paul Boehm . -+ -+1998-07-28 08:21:49 roessler (roessler) -+ -+ * patch.slang-1.2.2.keypad.1: branches: 1.1.2; file -+ patch.slang-1.2.2.keypad.1 was initially added on branch -+ mutt-0-94. -+ -+ * patch.slang-1.2.2.keypad.1, INSTALL: Adding a patch for a -+ SLang bug. -+ -+ * mx.c: Doing 'mutt -f NoSuchFile' just flickers the screen and -+ silently exits. Earlier (0.92.14 at least), it used to spit out -+ the error 'NoSuchFile: no such file or directory (errno = 2)'. -+ (Noted and tracked down by Vikas Agnihotri ) -+ -+ * color.c: The index cache should be updated even without color -+ support. -+ -+1998-07-27 13:39:39 roessler (roessler) -+ -+ * BUGS: Adding a notice about some more nits. -+ -+ * main.c: Change the error reporting mail address from -+ to . -+ -+ * protos.h, init.h, color.c: This patch fixes index "color" -+ patterns when using a non-color capable curses library. -+ While working on color support, I've thrown together the -+ mutt_parse_color() and mutt_parse_mono() functions as they are -+ sharing most of their code. Additionally, a new directive -+ called "unmono" is introduced. The implementation consists -+ in adding a flag and very few lines of code (plus ifdefs) -+ to mutt_parse_uncolor(). -+ -+ * snprintf.c, rfc1524.h, rfc1524.c, date.c: Fixing some -+ minor nits: missing #includes in date.c and snprintf.c, and -+ a not-so-nice declaration of rfc1524_new_entry(). Noted by -+ Digital cc and gcc. -+ -+1998-07-24 08:12:46 roessler (roessler) -+ -+ * copy.c, attach.c: Fiddling around with message/rfc822 -+ attachments once again. -+ -+1998-07-23 20:57:50 roessler (roessler) -+ -+ * status.c, sendlib.c, send.c, rfc2047.c, pop.c, pager.c, -+ mx.c, mh.c, mbox.c, lib.c, init.c, imap.c, edit.c, curs_lib.c, -+ compose.c, commands.c, color.c, browser.c, attach.c, alias.c: -+ Guard lots of global (char *) variable deferences against NULL -+ pointers. -+ -+ * copy.c, attach.c: Yet another patch about saving message/rfc822 -+ attachments. -+ -+ * main.c, send.c: Fixing potential NULL pointer deferences. -+ -+1998-07-22 22:47:57 roessler (roessler) -+ -+ * recvattach.c: Another fix from Liviu. -+ -+ * recvattach.c, from.c, attach.c: Another patch from liviu to -+ fix the message/rfc822 behaviour. -+ -+ * recvattach.c, mx.c, attach.c: This patch fixes the saving -+ of message/rfc822 attachments to mail folders. Additionally, -+ it fixes an outstanding bug with From_ lines being written to -+ MH folders. -+ -+ (From: Liviu Daia ) -+ -+ * menu.c, functions.h, browser.c, OPS: 1. When I hit 'c' (change -+ dir) in browser, it gives me the directory, but without -+ the final '/', so I have to add '/' to add a subdirectory -+ name. This patch fixes it. -+ -+ 2. check-new now will recheck mailbox folders for new mail. -+ -+ 3. added a function toggle-mailboxes which toggles in browser -+ between mailboxes view and directory view. (bound to TAB -+ by default). -+ -+ (From: "Michael S. Tsirkin" ) -+ -+ * reldate.h, configure.in, configure, ChangeLog: preparing -+ 0.94.1i. -+ -+ * send.c: Correcting an error message in send.c. (From Byrial -+ Jensen.) -+ -+ * send.c: Correct an error message in send.c. (From Byrial -+ Jensen ) -+ -+ * sendlib.c, recvattach.c, protos.h, postpone.c, pager.c, mx.c, -+ mutt.h, lib.c, keymap.c, handler.c, compose.c, commands.c, -+ attach.h, attach.c: These changes fix some of the bugs which -+ were recently reported to mutt-dev. To be more specific, -+ message-type attachments are saved to mail folders from the -+ receive attachment menu, some of the sending code has been -+ made more robust against disappearing attachments, and "tag" -+ is rebound to "T" on the compose menu. -+ -+ (Some part of this patch comes from Vikas Agnihotri -+ .) -+ -+ * send.c: Avoid a potential segmentation fault when trying to -+ postpone, but Postponed equals NULL. -+ -+ * BUGS: branches: 1.1.2; file BUGS was initially added on -+ branch mutt-0-94. -+ -+ * BUGS: This file is intended to contain known bugs which still -+ have to be fixed. -+ -+ * doc/manual.txt: Committing the changes previously made to -+ manual.sgml. -+ -+ * imap.c: Include Message-ID and Reply-To headers when fetching -+ a message's headers from an IMAP server. (From: Andy Sloane -+ ) -+ -+1998-07-21 07:54:03 roessler (roessler) -+ -+ * recvattach.c: The old behaviour of the %d (for description) -+ specifier is recreated by this patch. (From: Byrial Jensen -+ ) -+ -+ * protos.h, lib.c, attach.c: You should never _ever_ do something -+ like this: -+ -+ [process A] ---[piped write until EOF]---> [process B] -+ [process A] <---[piped read until EOF]--- [process B] -+ -+ Basically, what happens is something like this: A feeds data -+ to B; B processes the data, and feeds it to the pipe until the -+ pipe buffer is full; at this point, A writes to its pipe until -+ its buffer is full too, and if it still has more data to write, -+ that's it, it never gets to the read part to flush B's buffer --- -+ both processes are blocked on write. -+ -+ This patch fixes such a situation in the compose menu. -+ -+ (From: Liviu Daia ) -+ -+1998-07-20 21:01:05 roessler (roessler) -+ -+ * reap.pl: Perl lies in /usr/bin on my machines. -+ -+ * pop.c: It seems that if you don't enter any password at all when -+ prompted for the POP password, Mutt will die with a segmentation -+ fault also. (Bug reported by Steve Mayer -+ through the Debian bug tracking system.) -+ -+ * pop.c: Just an update on this bug. It seems that if you don't -+ enter any password at all when prompted for the POP password, -+ Mutt will die with a segmentation fault also. (Bug reported by -+ Steve Mayer via the Debian bug tracking system, -+ fix from Thomas Roessler.) -+ -+ * postpone.c: When you send a message which have been postponed -+ before sending, then all its attachments (if there are more -+ than one) will have a content-disposition header which -+ includes a filename, even if there isn't a real filename -+ but only random choosen temporary one. (From: Byrial Jensen -+ ) -+ -+1998-07-18 09:18:31 roessler (roessler) -+ -+ * recvattach.c: "Set mime_forward, and forward a message --- -+ Mutt will segfault." The obvious fix for this is to check -+ for aptr->content->hdr in mutt_attach_fmt() before invoking -+ _mutt_make_string(). Anyway, I suspect that the real fix may -+ involve something like parsing the rfc822 attachment in question. -+ -+ * sendlib.c: Postponing messages behaves funny when the $postponed -+ folder is in Maildir format; I traced this down to the fact that -+ postponed messages are saved in "cur" while mutt_num_postponed() -+ is looking at "new". (From: Liviu Daia ) -+ -+1998-07-17 08:37:02 roessler (roessler) -+ -+ * compose.c: Removing the old snd_entry() code. -+ -+ * doc/manual.sgml, protos.h, pgp.c, mutt.h, init.h, hook.c: -+ When sending encrypted messages, it may arrive that Mutt can't -+ determine the PGP key of the recipient (presumably because -+ her address has changed, but she hasn't updated her PGP key -+ yet). In this situation it's convenient to be able to associate -+ a keyID with an address automatically. The attached patch is -+ an attempt to implement this idea using a "pgp-hook". (From: -+ Liviu Daia ). -+ -+ * recvattach.c: Removing the old attach_entry() code. -+ -+ * recvattach.c, protos.h, mutt.h, init.h, globals.h, compose.c: -+ This patch adds a string variable $attach_format which controls -+ the look of the compose and attach menus. Unfortunately, -+ I was not able to make things so that it would look exactly -+ the same as the hardcoded versions, so the default format is a -+ bit different, but I think it is quite usable. (From Michael -+ Elkins ). -+ -+ * functions.h, browser.c, OPS: This patch allows you to view -+ files from the browser window, useful if you are searching for -+ a file to attach to your message. It uses the standard mailcap -+ stuff (and the lookup mime types) to use the correct "viewer" -+ for the file. (From Brandon Long ) -+ -+ * doc/dotlock.man.in, doc/Makefile.in, configure.in, configure, -+ Makefile.in: Dotlock-related changes: We call it mutt.dotlock to -+ avoid conflicts with certain NFS versions' dotlocking utilities -+ (pointed out by Liviu Daia). Additionally, we need to compile it -+ as an external utility on systems which don't have an fchdir(2) -+ system call. -+ -+1998-07-16 16:39:53 roessler (roessler) -+ -+ * mx.c: Fixing a small typographic error. -+ -+ * mx.c, mx.c: Mutt doesn't retry locking if it doesn't succeed -+ at once. The code in mx_lock_file is supposed to retry but -+ it doesn't work because of a mistake in operator precedence. -+ (From: Petri Kaukasoina ) -+ -+ * dotlock.c: The dotlock.c file tries to include -+ if _POSIX_PATH_MAX isn't defined but it doesn't include -+ , where this symbol should be defined. (From -+ Marc.Baudoin@solsoft.com) -+ -+ * send.c: When several messages are tagged and the user -+ applies reply, group-reply, or list-reply to these messages, -+ the reply's references and in-reply-to headers are constructed -+ from the tagged message which comes last in the current index. -+ This patch constructs the references header from _all_ messages' -+ message-id and references headers. (tlr) -+ -+ * reldate.h, configure.in, configure, Changes, ChangeLog: -+ Preparing mutt 0.94. -+ -+ * imap.c: "My two remaining issues are the speed at which it -+ downloads the headers, and support of PREAUTH. I'm enclosing -+ a patch (to stock mutt-0.92.13i) which addresses these -+ issues." (From Brian Marcotte ) -+ -+ * color.c: This patch fixes two problems reported on mutt-users. -+ -+ (1) the error message about "default colors not supported" when -+ not using a color xterm should not be printed. The existing -+ code did not check the value of has_colors() in conjunction -+ with use_default_colors() -+ -+ (2) mutt would crash when sending mail in batch mode because -+ use_default_colors() could be used without doing an initscr() -+ -+ (From Michael Elkins.) -+ -+ * color.c: This patch fixes two problems reported on mutt-users. -+ -+ (1) the error message about "default colors not supported" when -+ not using a color xterm should not be printed. The existing -+ code did not check the value of has_colors() in conjunction -+ with use_default_colors() -+ -+ (2) mutt would crash when sending mail in batch mode because -+ use_default_colors() could be used without doing an initscr() -+ -+ (From Michael Elkins.) -+ -+1998-07-15 17:15:46 roessler (roessler) -+ -+ * mx.h, mx.c, main.c, dotlock.h, dotlock.c, configure.in, -+ configure, Makefile.in: Finalizing the external dotlock support: -+ If group mail privileges are needed, the dotlock is compiled as a -+ separate program. If there is no need for privileges, it remains -+ a module which is compiled into mutt. Also, there is no more need -+ for the SLang buffer overflow work-around in main(). We drop it, -+ but let mutt bail out instead if it's installed setgid something. -+ -+ * doc/dotlock.man.in, dotlock.c: Fix the race condition in -+ dotlock.c. -+ -+ * doc/mutt.man.in: branches: 1.1.2; file mutt.man.in was -+ initially added on branch mutt-0-94. -+ -+ * doc/mutt.man.in, doc/mutt.man: Putting the manual page under -+ autoconf control. -+ -+ * doc/dotlock.man.in: branches: 1.1.2; file dotlock.man.in was -+ initially added on branch mutt-0-94. -+ -+ * doc/dotlock.man.in, doc/Makefile.in, protos.h, mx.c, mbox.c, -+ main.c, globals.h: Adding external dotlocking. For bugs, see -+ the manual page and the comments in dotlock.c. -+ -+ * dotlock.h: branches: 1.1.2; file dotlock.h was initially -+ added on branch mutt-0-94. -+ -+ * dotlock.h: Adding external dotlocking. For bugs, see the -+ manual page and the comments in dotlock.c. -+ -+ * dotlock.c: branches: 1.1.2; file dotlock.c was initially -+ added on branch mutt-0-94. -+ -+ * dotlock.c, configure.in, configure, Makefile.in: Adding -+ external dotlocking. For bugs, see the manual page and the -+ comments in dotlock.c. -+ -+ * doc/mutt.man: More roff fixes. -+ -+ * doc/mutt.man: More groff fixes. -+ -+1998-07-14 16:01:07 roessler (roessler) -+ -+ * reldate.h: branches: 1.3.2.4.2; Preparing mutt 0.93.1i. -+ -+ * configure.in, configure: branches: 1.7.2.5.2; Preparing -+ mutt 0.93.1i. -+ -+ * Changes: branches: 1.5.2.5.2; Preparing mutt 0.93.1i. -+ -+ * ChangeLog: branches: 1.4.2.5.2; Preparing mutt 0.93.1i. -+ -+ * rfc2047.c: branches: 1.1.1.1.2.2.2; More unsigned fixes. -+ -+ * mime.h: branches: 1.1.1.1.2.1.2; More unsigned fixes. -+ -+ * handler.c: branches: 1.1.1.1.2.5.2; More unsigned fixes. -+ -+ * pattern.c: branches: 1.3.2.3.2; Changing (int) casts in is* -+ arguments to (unsigned char). -+ -+ * parse.c: branches: 1.1.1.1.2.3.2; Changing (int) casts in is* -+ arguments to (unsigned char). -+ -+ * rfc2047.c: Removing a superfluous (unsigned char) cast in an -+ IsPrint argument. -+ -+1998-07-13 10:50:39 roessler (roessler) -+ -+ * doc/mutt.sgml: Since manual page generation seems to be broken -+ in the SGML-tools package, we remove the SGML version of mutt.man -+ and make the troff source the master copy. Suggested by Roland -+ Rosenfeld who also provided the corrected -+ mutt.man file. -+ -+ * doc/mutt.man: branches: 1.1.1.1.2.2.2; Since manual page -+ generation seems to be broken in the SGML-tools package, we -+ remove the SGML version of mutt.man and make the troff source the -+ master copy. Suggested by Roland Rosenfeld -+ who also provided the corrected mutt.man file. -+ -+ * doc/Makefile.in: branches: 1.2.2.2.2; Since manual page -+ generation seems to be broken in the SGML-tools package, we -+ remove the SGML version of mutt.man and make the troff source the -+ master copy. Suggested by Roland Rosenfeld -+ who also provided the corrected mutt.man file. -+ -+1998-07-12 13:15:31 roessler (roessler) -+ -+ * protos.h: branches: 1.5.2.1.2; Replace calloc by safe_calloc -+ in new_pattern. -+ -+1998-07-11 05:10:29 roessler (roessler) -+ -+ * doc/manual.txt: branches: 1.2.2.4.2; Key bindings -+ documentation. -+ -+ * doc/manual.sgml: branches: 1.2.2.5.2; Key bindings -+ documentation. -+ -+1998-07-10 17:58:26 roessler (roessler) -+ -+ * NEWS: s/fwd_decode/forward_decode/ (Noted by Lars Hecking) -+ -+ * pop.c: branches: 1.1.1.1.2.1.2; tmp[] wasn't initialized when -+ asking for the POP password. -+ -+ * buffy.c: branches: 1.1.1.1.2.1.2; On SunOS 4.1, one must -+ include unistd.h in order to declare SEEK_END. (Fabrice Noilhan) -+ -+ * mutt.h: branches: 1.2.2.1.2; include if limits.h -+ doesn't defile _POSIX_PATH_MAX. -+ -+ * Changes, ChangeLog: *** empty log message *** -+ -+ * doc/PGP-Notes.txt: Adding a notice about core dumps. -+ -+ * reldate.h, README: Preparing 0.93i. -+ -+ * INSTALL: branches: 1.1.1.1.2.2.2; Preparing 0.93i. -+ -+ * handler.c: Fix text/enriched decoding: if there's a tag -+ mismatch in the last paragraph in the attachment, the whole -+ paragraph wouldn't be displayed. -+ -+1998-07-09 19:51:36 roessler (roessler) -+ -+ * configure.in, configure: Use CC -Ae -D_HPUX_SOURCE on HP/UX. -+ -+ * config.sub: branches: 1.1.2; file config.sub was initially -+ added on branch mutt-0-93. -+ -+ * config.sub: Use CC -Ae -D_HPUX_SOURCE on HP/UX. -+ -+ * config.guess: branches: 1.1.2; file config.guess was initially -+ added on branch mutt-0-93. -+ -+ * config.guess, INSTALL: Use CC -Ae -D_HPUX_SOURCE on HP/UX. -+ -+1998-07-08 21:59:43 roessler (roessler) -+ -+ * snprintf.c: branches: 1.1.1.1.2.2.2; Changing (int) casts in -+ is* arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * pattern.c, parse.c: Changing (int) casts in is* arguments to -+ (unsigned char) casts to avoid mis-casting of signed chars. -+ (From Michael Elkins.) -+ -+ * mx.c: branches: 1.5.2.3.2; Changing (int) casts in is* -+ arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * mh.c, lib.c: branches: 1.2.2.2.2; Changing (int) casts in -+ is* arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * keymap.c: branches: 1.1.1.1.2.2.2; Changing (int) casts in -+ is* arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * init.c: branches: 1.3.2.2.2; Changing (int) casts in is* -+ arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * from.c: branches: 1.1.1.1.2.2.2; Changing (int) casts in -+ is* arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * edit.c: branches: 1.2.2.2.2; Changing (int) casts in is* -+ arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+ * curs_main.c: branches: 1.4.2.3.2; Changing (int) casts in -+ is* arguments to (unsigned char) casts to avoid mis-casting of -+ signed chars. (From Michael Elkins.) -+ -+1998-07-07 09:22:40 roessler (roessler) -+ -+ * rfc822.c: branches: 1.1.1.1.2.2.2; Change one int to size_t -+ in rfc822.c. -+ -+ * rfc822.c: Fix the parsing of route addresses a la RFC 822. -+ Patch from Michael Elkins. -+ -+ * snprintf.c: Cast the arguments of the is* functions to int. -+ Patch from Michael Elkins. -+ -+ * sendlib.c: branches: 1.3.2.1.2; Cast the arguments of the is* -+ functions to int. Patch from Michael Elkins. -+ -+ * pattern.c, parse.c, mx.c, mh.c, lib.c, keymap.c, init.c, -+ from.c, edit.c, curs_main.c: Cast the arguments of the is* -+ functions to int. Patch from Michael Elkins. -+ -+1998-07-02 21:15:18 roessler (roessler) -+ -+ * hdrline.c: branches: 1.4.2.3.2; Using the correct version of -+ O'Shaughnessy Evans' %O patch. -+ -+ * configure.in, configure, Changes, ChangeLog: Preparig 0.92.14i -+ -+ * doc/manual.txt, doc/manual.sgml: s/∖/\/ -+ -+ * hdrline.c: Adding the %O expansion. -+ -+ * doc/manual.sgml: Applying the various manual_nits patches. -+ -+1998-07-01 17:01:50 roessler (roessler) -+ -+ * curs_main.c: Fixing a reverse-threading problem. -+ -+ * imap.c: branches: 1.3.2.1.2; Fixing an imap-related -+ segmentation fault. -+ -+1998-06-30 06:38:02 roessler (roessler) -+ -+ * reldate.h, Changes, ChangeLog: These are the last tiny bits -+ of preparing 0.92.13i. -+ -+ * configure.in, configure: Updating some of the documentation -+ for 0.93. -+ -+ * TODO: branches: 1.1.1.1.2.1.2; Updating some of the -+ documentation for 0.93. -+ -+ * README, NEWS: Updating some of the documentation for 0.93. -+ -+ * doc/NEWS: *** empty log message *** -+ -+ * doc/NEWS: branches: 1.1.2; file NEWS was initially added on -+ branch mutt-0-93. -+ -+ * doc/NEWS: *** empty log message *** -+ -+ * doc/manual.txt: Incorporate the recent changes to manual.sgml. -+ -+ * main.c: branches: 1.6.2.1.2; Work around a buffer overflow -+ in SLang. (This is the same bug which is fixed by 0.91.2i.) -+ -+1998-06-26 10:31:28 roessler (roessler) -+ -+ * doc/manual.sgml: Removing $empty_to. -+ -+ * send.c, init.h: branches: 1.3.2.1.2; Removing $empty_to. -+ -+ * globals.h: branches: 1.2.2.1.2; Removing $empty_to. -+ -+ * Muttrc.in: branches: 1.1.2.1.2; Removing $empty_to. -+ -+1998-06-25 22:31:46 roessler (roessler) -+ -+ * hdrline.c: Moved a break statement where it belongs. -+ -+ * mx.c: Fix an imap-related typo. -+ -+ * handler.c: Don't generate non-terminated last lines when -+ quoting 8bit-"encoded" text-plain body parts. -+ -+ * Makefile.in: branches: 1.4.2.1.2; Don't use GNU make specific -+ features. -+ -+1998-06-21 07:13:03 roessler (roessler) -+ -+ * doc/mutt.man, doc/Makefile.in, reldate.h, configure.in, -+ configure, Changes, ChangeLog: Bumping the release to 0.92.12i. -+ -+1998-06-20 06:12:38 roessler (roessler) -+ -+ * doc/manual.txt: *** empty log message *** -+ -+ * handler.c: Fixing the quoted-printable decoder. -+ -+ * handler.c: Make mutt handle messages containing null bytes. -+ -+ * copy.c: branches: 1.2.2.1.2; Make mutt handle messages -+ containing null bytes. -+ -+ * doc/manual.sgml: documenting alias-path -+ -+1998-06-19 12:52:16 roessler (roessler) -+ -+ * sendlib.c, send.c: branches: 1.3.2; Removing the Attach-Menu -+ feature for the next release version. -+ -+ * protos.h: branches: 1.5.2; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * postpone.c: branches: 1.3.4; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * pattern.c: branches: 1.3.2; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * menu.c: branches: 1.3.4; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * main.c: branches: 1.6.2; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * headers.c, functions.h: branches: 1.3.4; Removing the -+ Attach-Menu feature for the next release version. -+ -+ * curs_main.c: branches: 1.4.2; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * compose.c: branches: 1.5.4; Removing the Attach-Menu feature -+ for the next release version. -+ -+ * OPS: branches: 1.3.4; Removing the Attach-Menu feature for -+ the next release version. -+ -+1998-06-18 20:37:59 roessler (roessler) -+ -+ * protos.h: Bradon long's alias_path patch, for the sake of -+ Elm compatibility. -+ -+ * lib.c: branches: 1.2.2; Bradon long's alias_path patch, -+ for the sake of Elm compatibility. -+ -+ * alias.c: branches: 1.2.4; Bradon long's alias_path patch, -+ for the sake of Elm compatibility. -+ -+1998-06-16 20:59:20 roessler (roessler) -+ -+ * mx.c: branches: 1.5.2; Avoid pointless error messages from -+ mx_get_magic() when called from an mx_open_mailbox_append() -+ on a non-existing mailbox. -+ -+ * doc/manual.txt, doc/Makefile.in: branches: 1.2.2; Have "make -+ install" install manual.txt as well. -+ -+ * configure.in, configure: branches: 1.7.2; Have "make install" -+ install manual.txt as well. -+ -+ * Makefile.in: branches: 1.4.2; Have "make install" install -+ manual.txt as well. -+ -+ * doc/Makefile.in, doc/makefile: Putting Makefile under autoconf -+ control. -+ -+ * main.c: Switch the error reporting address from mutt-users -+ to mutt-dev. -+ -+ * reldate.h: branches: 1.3.2; Bump the version to 0.92.11i. -+ -+ * configure.in, configure: Bump the version to 0.92.11i. -+ -+ * Changes: branches: 1.5.2; Bump the version to 0.92.11i. -+ -+ * ChangeLog: branches: 1.4.2; Bump the version to 0.92.11i. -+ -+ * imap.h: branches: 1.1.4; Check in a proper version of imap.h. -+ -+ * color.c: branches: 1.2.2; 1.2.4; Fix the "unknown color" -+ bug reported by Vikas. -+ -+ * mx.c: Remove a spurious #include "imap.h" from mx.c. -+ -+ * doc/style-guide: Add a note about the global Muttrc to -+ style-guide. -+ -+ * configure.in: The global Muttrc contains a list of default -+ settings which can be used as a starting-point for the user's -+ own configuration. -+ -+ * Muttrc.in: branches: 1.1.2; The global Muttrc contains a list -+ of default settings which can be used as a starting-point for -+ the user's own configuration. -+ -+ * configure, Muttrc, Makefile.in: The global Muttrc contains a -+ list of default settings which can be used as a starting-point -+ for the user's own configuration. -+ -+ * pgppubring.c: branches: 1.4.4; Removing some duplicate code -+ from gnupgparse.c and pgppubring.c. -+ -+ * pgp.h, gnupgparse.c: Removing some duplicate code from -+ gnupgparse.c and pgppubring.c. -+ -+ * pgpinvoke.c, gnupgparse.c: Include part of Werner Koch's latest -+ GPG patches. -+ -+ * Changes: *** empty log message *** -+ -+ * configure.in, configure, Changes, ChangeLog: Preparing 0.92.10i. -+ -+ * doc/PGP-Notes.txt: branches: 1.2.2; Including Roland's new -+ procmail recipe. -+ -+ * protos.h, pattern.c, menu.c, curs_main.c, compose.c: Including -+ Vikas' search code for the "attach message" menu. -+ -+ * addrbook.c: branches: 1.3.4; Including Vikas' search code -+ for the "attach message" menu. -+ -+1998-06-15 15:19:49 roessler (roessler) -+ -+ * mx.c, main.c: Brandon's IMAP patch. -+ -+ * mailbox.h: branches: 1.2.4; Brandon's IMAP patch. -+ -+ * imap.c: branches: 1.3.2; Brandon's IMAP patch. -+ -+ * commands.c: branches: 1.3.4; Brandon's IMAP patch. -+ -+1998-06-08 20:05:54 roessler (roessler) -+ -+ * recvattach.c: branches: 1.3.4; GPG support, first take. -+ -+ * pgppubring.c, pgpkey.c, pgpinvoke.c, pgp.h: GPG support, -+ first take. -+ -+ * pgp.c: branches: 1.2.4; GPG support, first take. -+ -+ * main.c: GPG support, first take. -+ -+ * init.h: branches: 1.3.2; GPG support, first take. -+ -+ * gnupgparse.c: GPG support, first take. -+ -+ * init.c: branches: 1.3.2; GPG support, first take. -+ -+ * configure.in, configure: GPG support, first take. -+ -+ * config.h.in: branches: 1.3.4; GPG support, first take. -+ -+ * compose.c: GPG support, first take. -+ -+ * acconfig.h: branches: 1.3.4; GPG support, first take. -+ -+ * Makefile.in: GPG support, first take. -+ -+ * hdrline.c: branches: 1.4.2; Fixing the %a format. -+ -+ * hdrline.c: Fixing a segmentation fault in the hdr_line code. -+ -+ * doc/pgp-Notes.txt, doc/PGP-Notes.txt: Mutt 0.92.9i. -+ -+ * doc/manual.sgml: branches: 1.2.2; Mutt 0.92.9i. -+ -+ * sendlib.c, send.c, reldate.h, recvattach.c: Mutt 0.92.9i. -+ -+ * query.c: branches: 1.2.4; Mutt 0.92.9i. -+ -+ * protos.h, postpone.c, pgppubring.c, pgpkey.c: Mutt 0.92.9i. -+ -+ * pager.c: branches: 1.2.4; Mutt 0.92.9i. -+ -+ * mx.c: Mutt 0.92.9i. -+ -+ * mutt.h, mh.c: branches: 1.2.2; Mutt 0.92.9i. -+ -+ * main.c, init.h, init.c, imap.c: Mutt 0.92.9i. -+ -+ * hook.c: branches: 1.2.4; Mutt 0.92.9i. -+ -+ * headers.c, hdrline.c: Mutt 0.92.9i. -+ -+ * globals.h: branches: 1.2.2; Mutt 0.92.9i. -+ -+ * functions.h, flags.c: Mutt 0.92.9i. -+ -+ * enter.c: branches: 1.2.4; Mutt 0.92.9i. -+ -+ * edit.c: branches: 1.2.2; Mutt 0.92.9i. -+ -+ * curs_main.c: Mutt 0.92.9i. -+ -+ * copy.c: branches: 1.2.2; Mutt 0.92.9i. -+ -+ * configure.in, configure, config.h.in, compose.c, commands.c: -+ Mutt 0.92.9i. -+ -+ * attach.c: branches: 1.2.4; Mutt 0.92.9i. -+ -+ * addrbook.c, acconfig.h: Mutt 0.92.9i. -+ -+ * README: branches: 1.2.2; Mutt 0.92.9i. -+ -+ * OPS, Changes, ChangeLog: Mutt 0.92.9i. -+ -+ * doc/language50.txt: branches: 1.1.1; Initial revision -+ -+ * doc/language50.txt: * doc/language.txt: branches: 1.1.1; -+ Initial revision -+ -+ * doc/language.txt: * doc/makefile: branches: 1.1.1; Initial -+ revision -+ -+ * doc/makefile: * doc/manual.txt: branches: 1.1.1; Initial -+ revision -+ -+ * doc/manual.txt: * doc/mutt.man: branches: 1.1.1; Initial -+ revision -+ -+ * doc/mutt.man: branches: 1.1.1.1.2; -+ -+ * doc/mutt.sgml: branches: 1.1.1; Initial revision -+ -+ * doc/mutt.sgml: branches: 1.1.1.1.2; -+ -+ * doc/pgp-Notes.txt: branches: 1.1.1; Initial revision -+ -+ * doc/pgp-Notes.txt: * doc/style-guide: branches: 1.1.1; -+ Initial revision -+ -+ * doc/style-guide: * COPYING: branches: 1.1.1; Initial revision -+ -+ * COPYING: * COPYRIGHT: branches: 1.1.1; Initial revision -+ -+ * COPYRIGHT: * ChangeLog: branches: 1.1.1; Initial revision -+ -+ * ChangeLog: * Changes: branches: 1.1.1; Initial revision -+ -+ * Changes: * INSTALL: branches: 1.1.1; Initial revision -+ -+ * INSTALL: branches: 1.1.1.1.2; -+ -+ * Makefile.in: branches: 1.1.1; Initial revision -+ -+ * Makefile.in: * Mush.rc: branches: 1.1.1; Initial revision -+ -+ * Mush.rc: * Muttrc: branches: 1.1.1; Initial revision -+ -+ * Muttrc: * NEWS: branches: 1.1.1; Initial revision -+ -+ * NEWS: branches: 1.1.1.1.2; -+ -+ * OPS: branches: 1.1.1; Initial revision -+ -+ * OPS: * OPS.PGP: branches: 1.1.1; Initial revision -+ -+ * OPS.PGP: * Pine.rc: branches: 1.1.1; Initial revision -+ -+ * Pine.rc: * README: branches: 1.1.1; Initial revision -+ -+ * README: * TODO: branches: 1.1.1; Initial revision -+ -+ * TODO: branches: 1.1.1.1.2; -+ -+ * acconfig.h: branches: 1.1.1; Initial revision -+ -+ * acconfig.h: * addrbook.c: branches: 1.1.1; Initial revision -+ -+ * addrbook.c: * alias.c: branches: 1.1.1; Initial revision -+ -+ * alias.c: * attach.c: branches: 1.1.1; Initial revision -+ -+ * attach.c: * attach.h: branches: 1.1.1; Initial revision -+ -+ * attach.h: branches: 1.1.1.1.4; -+ -+ * bind.c: branches: 1.1.1; Initial revision -+ -+ * bind.c: branches: 1.1.1.1.4; -+ -+ * browser.c: branches: 1.1.1; Initial revision -+ -+ * browser.c: branches: 1.1.1.1.4; -+ -+ * buffy.c: branches: 1.1.1; Initial revision -+ -+ * buffy.c: branches: 1.1.1.1.2; -+ -+ * buffy.h: branches: 1.1.1; Initial revision -+ -+ * buffy.h: * color.c: branches: 1.1.1; Initial revision -+ -+ * color.c: * commands.c: branches: 1.1.1; Initial revision -+ -+ * commands.c: * complete.c: branches: 1.1.1; Initial revision -+ -+ * complete.c: * compose.c: branches: 1.1.1; Initial revision -+ -+ * compose.c: * config.h.in: branches: 1.1.1; Initial revision -+ -+ * config.h.in: * configure: branches: 1.1.1; Initial revision -+ -+ * configure: * configure.in: branches: 1.1.1; Initial revision -+ -+ * configure.in: * copy.c: branches: 1.1.1; Initial revision -+ -+ * copy.c: * copy.h: branches: 1.1.1; Initial revision -+ -+ * copy.h: * curs_lib.c: branches: 1.1.1; Initial revision -+ -+ * curs_lib.c: branches: 1.1.1.1.4; -+ -+ * curs_main.c: branches: 1.1.1; Initial revision -+ -+ * curs_main.c: * date.c: branches: 1.1.1; Initial revision -+ -+ * date.c: branches: 1.1.1.1.4; -+ -+ * depend.awk: branches: 1.1.1; Initial revision -+ -+ * depend.awk: * doc/manual.sgml: branches: 1.1.1; Initial -+ revision -+ -+ * doc/manual.sgml: * edit.c: branches: 1.1.1; Initial revision -+ -+ * edit.c: * enter.c: branches: 1.1.1; Initial revision -+ -+ * enter.c: * filter.c: branches: 1.1.1; Initial revision -+ -+ * filter.c: * flags.c: branches: 1.1.1; Initial revision -+ -+ * flags.c: * from.c: branches: 1.1.1; Initial revision -+ -+ * from.c: branches: 1.1.1.1.2; -+ -+ * functions.h: branches: 1.1.1; Initial revision -+ -+ * functions.h: * gen_defs: branches: 1.1.1; Initial revision -+ -+ * gen_defs: * getdomain.c: branches: 1.1.1; Initial revision -+ -+ * getdomain.c: * globals.h: branches: 1.1.1; Initial revision -+ -+ * globals.h: * handler.c: branches: 1.1.1; Initial revision -+ -+ * handler.c: branches: 1.1.1.1.2; -+ -+ * hash.c: branches: 1.1.1; Initial revision -+ -+ * hash.c: branches: 1.1.1.1.4; -+ -+ * hash.h: branches: 1.1.1; Initial revision -+ -+ * hash.h: * hdrline.c: branches: 1.1.1; Initial revision -+ -+ * hdrline.c: * headers.c: branches: 1.1.1; Initial revision -+ -+ * headers.c: * help.c: branches: 1.1.1; Initial revision -+ -+ * help.c: branches: 1.1.1.1.4; -+ -+ * hook.c: branches: 1.1.1; Initial revision -+ -+ * hook.c: * imap.c: branches: 1.1.1; Initial revision -+ -+ * imap.c: * init.c: branches: 1.1.1; Initial revision -+ -+ * init.c: * init.h: branches: 1.1.1; Initial revision -+ -+ * init.h: * install-sh: branches: 1.1.1; Initial revision -+ -+ * install-sh: * keymap.c: branches: 1.1.1; Initial revision -+ -+ * keymap.c: branches: 1.1.1.1.2; -+ -+ * keymap.h: branches: 1.1.1; Initial revision -+ -+ * keymap.h: branches: 1.1.1.1.4; -+ -+ * lib.c: branches: 1.1.1; Initial revision -+ -+ * lib.c: * mailbox.h: branches: 1.1.1; Initial revision -+ -+ * mailbox.h: * main.c: branches: 1.1.1; Initial revision -+ -+ * main.c: * mapping.h: branches: 1.1.1; Initial revision -+ -+ * mapping.h: * mbox.c: branches: 1.1.1; Initial revision -+ -+ * mbox.c: branches: 1.1.1.1.4; -+ -+ * menu.c: branches: 1.1.1; Initial revision -+ -+ * menu.c: * mh.c: branches: 1.1.1; Initial revision -+ -+ * mh.c: * mime.h: branches: 1.1.1; Initial revision -+ -+ * mime.h: branches: 1.1.1.1.2; -+ -+ * mime.types: branches: 1.1.1; Initial revision -+ -+ * mime.types: * mkinstalldirs: branches: 1.1.1; Initial revision -+ -+ * mkinstalldirs: * mutt.h: branches: 1.1.1; Initial revision -+ -+ * mutt.h: * mutt_curses.h: branches: 1.1.1; Initial revision -+ -+ * mutt_curses.h: * mutt_menu.h: branches: 1.1.1; Initial revision -+ -+ * mutt_menu.h: branches: 1.1.1.1.4; -+ -+ * mutt_regex.h: branches: 1.1.1; Initial revision -+ -+ * mutt_regex.h: * mx.c: branches: 1.1.1; Initial revision -+ -+ * mx.c: * mx.h: branches: 1.1.1; Initial revision -+ -+ * mx.h: branches: 1.1.1.1.4; -+ -+ * pager.c: branches: 1.1.1; Initial revision -+ -+ * pager.c: * pager.h: branches: 1.1.1; Initial revision -+ -+ * pager.h: branches: 1.1.1.1.4; -+ -+ * parse.c: branches: 1.1.1; Initial revision -+ -+ * parse.c: branches: 1.1.1.1.2; -+ -+ * parse.h: branches: 1.1.1; Initial revision -+ -+ * parse.h: * pattern.c: branches: 1.1.1; Initial revision -+ -+ * pattern.c: * pgp.c: branches: 1.1.1; Initial revision -+ -+ * pgp.c: * pgp.h: branches: 1.1.1; Initial revision -+ -+ * pgp.h: * pgpinvoke.c: branches: 1.1.1; Initial revision -+ -+ * pgpinvoke.c: * pgpkey.c: branches: 1.1.1; Initial revision -+ -+ * pgpkey.c: * pgppubring.c: branches: 1.1.1; Initial revision -+ -+ * pgppubring.c: * pop.c: branches: 1.1.1; Initial revision -+ -+ * pop.c: branches: 1.1.1.1.2; -+ -+ * postpone.c: branches: 1.1.1; Initial revision -+ -+ * postpone.c: * protos.h: branches: 1.1.1; Initial revision -+ -+ * protos.h: * query.c: branches: 1.1.1; Initial revision -+ -+ * query.c: * reap.pl: branches: 1.1.1; Initial revision -+ -+ * reap.pl: branches: 1.1.1.1.4; -+ -+ * recvattach.c: branches: 1.1.1; Initial revision -+ -+ * recvattach.c: * reldate.h: branches: 1.1.1; Initial revision -+ -+ * reldate.h: * resize.c: branches: 1.1.1; Initial revision -+ -+ * resize.c: * rfc1524.c: branches: 1.1.1; Initial revision -+ -+ * rfc1524.c: branches: 1.1.1.1.4; -+ -+ * rfc1524.h: branches: 1.1.1; Initial revision -+ -+ * rfc1524.h: branches: 1.1.1.1.4; -+ -+ * rfc2047.c: branches: 1.1.1; Initial revision -+ -+ * rfc2047.c: branches: 1.1.1.1.2; -+ -+ * rfc2047.h: branches: 1.1.1; Initial revision -+ -+ * rfc2047.h: * rfc822.c: branches: 1.1.1; Initial revision -+ -+ * rfc822.c: branches: 1.1.1.1.2; -+ -+ * rfc822.h: branches: 1.1.1; Initial revision -+ -+ * rfc822.h: * sample.mailcap: branches: 1.1.1; Initial revision -+ -+ * sample.mailcap: * sample.muttrc: branches: 1.1.1; Initial -+ revision -+ -+ * sample.muttrc: branches: 1.1.1.1.4; -+ -+ * score.c: branches: 1.1.1; Initial revision -+ -+ * score.c: * send.c: branches: 1.1.1; Initial revision -+ -+ * send.c: * sendlib.c: branches: 1.1.1; Initial revision -+ -+ * sendlib.c: * sha.h: branches: 1.1.1; Initial revision -+ -+ * sha.h: * sha1dgst.c: branches: 1.1.1; Initial revision -+ -+ * sha1dgst.c: * sha_locl.h: branches: 1.1.1; Initial revision -+ -+ * sha_locl.h: * signal.c: branches: 1.1.1; Initial revision -+ -+ * signal.c: * snprintf.c: branches: 1.1.1; Initial revision -+ -+ * snprintf.c: branches: 1.1.1.1.2; -+ -+ * sort.c: branches: 1.1.1; Initial revision -+ -+ * sort.c: * sort.h: branches: 1.1.1; Initial revision -+ -+ * sort.h: branches: 1.1.1.1.4; -+ -+ * status.c: branches: 1.1.1; Initial revision -+ -+ * status.c: branches: 1.1.1.1.4; -+ -+ * strcasecmp.c: branches: 1.1.1; Initial revision -+ -+ * strcasecmp.c: * system.c: branches: 1.1.1; Initial revision -+ -+ * system.c: * testmsg: branches: 1.1.1; Initial revision -+ -+ * testmsg: * thread.c: branches: 1.1.1; Initial revision -+ -+ * thread.c: branches: 1.1.1.1.4; -+ -Index: mutt/GPL -=================================================================== -RCS file: /home/roessler/cvs/mutt/GPL,v -retrieving revision 3.0 -retrieving revision 3.1 -diff -u -p -u -a -r3.0 -r3.1 ---- mutt/GPL 24 Jan 2002 12:10:47 -0000 3.0 -+++ mutt/GPL 17 Sep 2005 19:15:35 -0000 3.1 -@@ -2,7 +2,7 @@ - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. -- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -@@ -291,7 +291,7 @@ convey the exclusion of warranty; and ea - the "copyright" line and a pointer to where the full notice is found. - - -- Copyright (C) 19yy -+ Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by -@@ -305,7 +305,7 @@ the "copyright" line and a pointer to wh - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - - - Also add information on how to contact you by electronic and paper mail. -@@ -313,7 +313,7 @@ Also add information on how to contact y - If the program is interactive, make it output a short notice like this - when it starts in an interactive mode: - -- Gnomovision version 69, Copyright (C) 19yy name of author -+ Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. -@@ -338,4 +338,3 @@ proprietary programs. If your program i - consider it more useful to permit linking proprietary applications with the - library. If this is what you want to do, use the GNU Library General - Public License instead of this License. --$Id: GPL,v 3.0 2002/01/24 12:10:47 roessler Exp $ -Index: mutt/Makefile.am -=================================================================== -RCS file: /home/roessler/cvs/mutt/Makefile.am,v -retrieving revision 3.37 -retrieving revision 3.38 -diff -u -p -u -a -r3.37 -r3.38 ---- mutt/Makefile.am 11 Aug 2005 21:22:41 -0000 3.37 -+++ mutt/Makefile.am 15 Sep 2005 23:18:48 -0000 3.38 -@@ -167,15 +167,15 @@ commit-real: - commit-changelog: - (cd $(top_srcdir) && cvs commit -m "# changelog commit" ChangeLog) - --commit: pclean check-security commit-real changelog commit-changelog -+commit: pclean check-security commit-real update-changelog commit-changelog - --changelog: -+update-changelog: - (cd $(top_srcdir); \ - cvs update ChangeLog; \ - sh ./mkchangelog.sh | fmt -c | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog; \ - $${VISUAL:-vi} ChangeLog) - --ChangeLog: changelog -+#ChangeLog: changelog - - # kluge around automake problems. - -Index: mutt/Muttrc.head.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/Muttrc.head.in,v -retrieving revision 3.0 -retrieving revision 3.1 -diff -u -p -u -a -r3.0 -r3.1 ---- mutt/Muttrc.head.in 24 Jan 2002 12:10:47 -0000 3.0 -+++ mutt/Muttrc.head.in 17 Sep 2005 17:39:18 -0000 3.1 -@@ -8,16 +8,17 @@ ignore "from " received content- mime-ve - ignore sender references return-path lines - - # imitate the old search-body function --macro index \eb '/~b ' 'search in message bodies' -+macro index \eb "~b " "search in message bodies" - - # simulate the old url menu --macro index \cb |urlview\n 'call urlview to extract URLs out of a message' --macro pager \cb |urlview\n 'call urlview to extract URLs out of a message' -+macro index,pager \cb "urlview" "call urlview to extract URLs out of a message" - - # Show documentation when pressing F1 --macro generic "!less @docdir@/manual.txt\n" "Show Mutt documentation" --macro index "!less @docdir@/manual.txt\n" "Show Mutt documentation" --macro pager "!less @docdir@/manual.txt\n" "Show Mutt documentation" -+macro generic,pager "less @docdir@/manual.txt" "show Mutt documentation" -+ -+# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" -+macro index,pager y "?" "show incoming mailboxes list" -+bind browser y exit - - # If Mutt is unable to determine your site's domain name correctly, you can - # set the default here. -Index: mutt/_regex.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/_regex.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/_regex.h 24 Jan 2002 12:10:47 -0000 3.0 -+++ mutt/_regex.h 17 Sep 2005 20:46:09 -0000 3.2 -@@ -17,8 +17,8 @@ - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, -- write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- Boston, MA 02111-1307, USA. */ -+ write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ - - #ifndef __REGEXP_LIBRARY_H__ - #define __REGEXP_LIBRARY_H__ -Index: mutt/account.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/account.c,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/account.c 7 Aug 2005 16:45:35 -0000 3.9 -+++ mutt/account.c 17 Sep 2005 20:46:09 -0000 3.11 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* remote host account manipulation (POP/IMAP) */ -Index: mutt/account.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/account.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/account.h 28 Jun 2005 19:26:54 -0000 3.2 -+++ mutt/account.h 17 Sep 2005 20:46:09 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* remote host account manipulation (POP/IMAP) */ -Index: mutt/addrbook.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/addrbook.c,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/addrbook.c 3 Feb 2005 17:01:42 -0000 3.8 -+++ mutt/addrbook.c 17 Sep 2005 20:46:09 -0000 3.10 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/alias.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/alias.c,v -retrieving revision 3.11 -retrieving revision 3.13 -diff -u -p -u -a -r3.11 -r3.13 ---- mutt/alias.c 12 Feb 2005 19:12:40 -0000 3.11 -+++ mutt/alias.c 17 Sep 2005 20:46:09 -0000 3.13 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/ascii.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/ascii.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/ascii.c 3 Feb 2005 17:01:42 -0000 3.3 -+++ mutt/ascii.c 17 Sep 2005 20:46:09 -0000 3.5 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - * - */ - -Index: mutt/ascii.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/ascii.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/ascii.h 24 Jan 2002 12:10:47 -0000 3.0 -+++ mutt/ascii.h 17 Sep 2005 20:46:09 -0000 3.2 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - * - */ - -Index: mutt/attach.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/attach.c,v -retrieving revision 3.17 -retrieving revision 3.19 -diff -u -p -u -a -r3.17 -r3.19 ---- mutt/attach.c 3 Sep 2005 23:22:30 -0000 3.17 -+++ mutt/attach.c 17 Sep 2005 20:46:09 -0000 3.19 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/attach.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/attach.h,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/attach.h 5 Aug 2005 02:16:46 -0000 3.3 -+++ mutt/attach.h 17 Sep 2005 20:46:09 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* common protos for compose / attach menus */ -Index: mutt/base64.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/base64.c,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/base64.c 3 Feb 2005 17:01:42 -0000 3.1 -+++ mutt/base64.c 17 Sep 2005 20:46:09 -0000 3.3 -@@ -13,8 +13,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - * - */ - -Index: mutt/browser.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/browser.c,v -retrieving revision 3.16 -retrieving revision 3.18 -diff -u -p -u -a -r3.16 -r3.18 ---- mutt/browser.c 7 Aug 2005 22:16:25 -0000 3.16 -+++ mutt/browser.c 17 Sep 2005 20:46:09 -0000 3.18 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/browser.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/browser.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/browser.h 11 Dec 2002 11:19:39 -0000 3.1 -+++ mutt/browser.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -1,4 +1,4 @@ --/* $Id: browser.h,v 3.1 2002/12/11 11:19:39 roessler Exp $ */ -+/* $Id: browser.h,v 3.3 2005/09/17 20:46:10 brendan Exp $ */ - /* - * Copyright (C) 1996-2000 Michael R. Elkins - * -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _BROWSER_H -Index: mutt/buffy.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/buffy.c,v -retrieving revision 3.11 -retrieving revision 3.13 -diff -u -p -u -a -r3.11 -r3.13 ---- mutt/buffy.c 3 Feb 2005 17:01:42 -0000 3.11 -+++ mutt/buffy.c 17 Sep 2005 20:46:10 -0000 3.13 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/buffy.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/buffy.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/buffy.h 11 Dec 2002 11:19:39 -0000 3.2 -+++ mutt/buffy.h 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /*parameter to mutt_parse_mailboxes*/ -Index: mutt/charset.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/charset.c,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/charset.c 12 Feb 2005 19:52:28 -0000 3.9 -+++ mutt/charset.c 17 Sep 2005 20:46:10 -0000 3.11 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/charset.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/charset.h,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/charset.h 3 Mar 2003 14:01:06 -0000 3.6 -+++ mutt/charset.h 17 Sep 2005 20:46:10 -0000 3.8 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _CHARSET_H -Index: mutt/color.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/color.c,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/color.c 3 Feb 2005 17:01:42 -0000 3.6 -+++ mutt/color.c 17 Sep 2005 20:46:10 -0000 3.8 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/commands.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/commands.c,v -retrieving revision 3.33 -retrieving revision 3.35 -diff -u -p -u -a -r3.33 -r3.35 ---- mutt/commands.c 2 Aug 2005 05:58:18 -0000 3.33 -+++ mutt/commands.c 17 Sep 2005 20:46:10 -0000 3.35 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/complete.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/complete.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/complete.c 3 Feb 2005 17:01:42 -0000 3.3 -+++ mutt/complete.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/compose.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/compose.c,v -retrieving revision 3.25 -retrieving revision 3.27 -diff -u -p -u -a -r3.25 -r3.27 ---- mutt/compose.c 4 Aug 2005 01:15:52 -0000 3.25 -+++ mutt/compose.c 17 Sep 2005 20:46:10 -0000 3.27 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/config.guess -=================================================================== -RCS file: /home/roessler/cvs/mutt/config.guess,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/config.guess 11 Apr 2003 11:56:58 -0000 3.1 -+++ mutt/config.guess 17 Sep 2005 20:46:10 -0000 3.3 -@@ -17,7 +17,7 @@ timestamp='2003-02-22' - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -Index: mutt/config.sub -=================================================================== -RCS file: /home/roessler/cvs/mutt/config.sub,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/config.sub 11 Apr 2003 11:56:58 -0000 3.1 -+++ mutt/config.sub 17 Sep 2005 20:46:10 -0000 3.3 -@@ -21,8 +21,8 @@ timestamp='2003-02-22' - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, --# Boston, MA 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -Index: mutt/configure.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/configure.in,v -retrieving revision 3.33 -retrieving revision 3.37 -diff -u -p -u -a -r3.33 -r3.37 ---- mutt/configure.in 7 Sep 2005 00:22:09 -0000 3.33 -+++ mutt/configure.in 22 Sep 2005 16:38:08 -0000 3.37 -@@ -9,11 +9,11 @@ AM_CONFIG_HEADER([config.h]) - - mutt_cv_version=`cat $srcdir/VERSION` - AM_INIT_AUTOMAKE(mutt, $mutt_cv_version) --AC_SUBST([CONFIGURE_DEPENDENCIES], ['$(top_srcdir)/VERSION']) -+AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(top_srcdir)/VERSION']) - - 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" -+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" - - AC_CANONICAL_HOST - -@@ -738,10 +738,23 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([-- - OLDLIBS="$LIBS" - - need_md5="yes" -+ -+ ac_prefer_qdbm=yes -+ AC_ARG_WITH(qdbm, AC_HELP_STRING([--without-qdbm], [Don't use qdbm even if it is available]), -+ ac_prefer_qdbm=$withval) -+ if test x$ac_prefer_qdbm != xno; then -+ CPPFLAGS="$OLDCPPFLAGS" -+ LIBS="$OLDLIBS -lqdbm"; -+ AC_CACHE_CHECK(for vlopen, ac_cv_vlopen,[ -+ ac_cv_vlopen=no -+ AC_TRY_LINK([#include ],[vlopen(0,0,0);],[ac_cv_vlopen=yes]) -+ ]) -+ fi -+ - ac_prefer_gdbm=yes - AC_ARG_WITH(gdbm, AC_HELP_STRING([--without-gdbm], [Don't use gdbm even if it is available]), - ac_prefer_gdbm=$withval) -- if test x$ac_prefer_gdbm != xno; then -+ if test x$ac_prefer_gdbm != xno -a x$ac_cv_vlopen != xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; - AC_CACHE_CHECK(for gdbm_open, ac_cv_gdbmopen,[ -@@ -753,7 +766,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([-- - ac_bdb_prefix=yes - AC_ARG_WITH(bdb, AC_HELP_STRING([--with-bdb[=DIR]], [Use BerkeleyDB4 if gdbm is not available]), - ac_bdb_prefix=$withval) -- if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes; then -+ if test x$ac_bdb_prefix != xno -a x$ac_cv_gdbmopen != xyes -a x$ac_cv_vlopen != xyes; then - test x$ac_bdb_prefix = xyes && ac_bdb_prefix="$mutt_cv_prefix /opt/csw/bdb4 /opt /usr/local /usr" - for d in $ac_bdb_prefix; do - bdbpfx="$bdbpfx $d" -@@ -799,7 +812,11 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([-- - fi - fi - -- if test x$ac_cv_gdbmopen = xyes; then -+ if test x$ac_cv_vlopen = xyes; then -+ CPPFLAGS="$OLDCPPFLAGS" -+ LIBS="$OLDLIBS -lqdbm"; -+ AC_DEFINE(HAVE_QDBM, 1, [QDBM Support]) -+ elif test x$ac_cv_gdbmopen = xyes; then - CPPFLAGS="$OLDCPPFLAGS" - LIBS="$OLDLIBS -lgdbm"; - AC_DEFINE(HAVE_GDBM, 1, [GDBM Support]) -@@ -808,7 +825,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([-- - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" - AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support]) - else -- AC_MSG_ERROR(You need Sleepycat DB4 or GDBM for --enable-hcache) -+ AC_MSG_ERROR(You need QDBM, Sleepycat DB4 or GDBM for --enable-hcache) - fi - fi]) - dnl -- end cache -- -Index: mutt/copy.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/copy.c,v -retrieving revision 3.22 -retrieving revision 3.24 -diff -u -p -u -a -r3.22 -r3.24 ---- mutt/copy.c 11 Aug 2005 21:16:38 -0000 3.22 -+++ mutt/copy.c 17 Sep 2005 20:46:10 -0000 3.24 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/copy.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/copy.h,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/copy.h 2 Nov 2004 13:30:58 -0000 3.7 -+++ mutt/copy.h 17 Sep 2005 20:46:10 -0000 3.9 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* flags to _mutt_copy_message */ -Index: mutt/crypt-gpgme.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-gpgme.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/crypt-gpgme.c 11 Aug 2005 21:16:38 -0000 3.7 -+++ mutt/crypt-gpgme.c 17 Sep 2005 20:46:10 -0000 3.9 -@@ -17,7 +17,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/crypt-gpgme.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-gpgme.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/crypt-gpgme.h 11 Aug 2005 21:16:38 -0000 3.2 -+++ mutt/crypt-gpgme.h 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef CRYPT_GPGME_H -Index: mutt/crypt-mod-pgp-classic.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-mod-pgp-classic.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/crypt-mod-pgp-classic.c 11 Aug 2005 21:16:38 -0000 3.3 -+++ mutt/crypt-mod-pgp-classic.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/crypt-mod-pgp-gpgme.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-mod-pgp-gpgme.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/crypt-mod-pgp-gpgme.c 11 Aug 2005 21:16:38 -0000 3.3 -+++ mutt/crypt-mod-pgp-gpgme.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/crypt-mod-smime-classic.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-mod-smime-classic.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/crypt-mod-smime-classic.c 11 Aug 2005 21:16:38 -0000 3.3 -+++ mutt/crypt-mod-smime-classic.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/crypt-mod-smime-gpgme.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-mod-smime-gpgme.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/crypt-mod-smime-gpgme.c 11 Aug 2005 21:16:38 -0000 3.3 -+++ mutt/crypt-mod-smime-gpgme.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/crypt-mod.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-mod.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/crypt-mod.c 3 Feb 2005 17:01:43 -0000 3.2 -+++ mutt/crypt-mod.c 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/crypt-mod.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt-mod.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/crypt-mod.h 11 Aug 2005 21:16:38 -0000 3.2 -+++ mutt/crypt-mod.h 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef CRYPTOGRAPHY_H -Index: mutt/crypt.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt.c,v -retrieving revision 3.29 -retrieving revision 3.31 -diff -u -p -u -a -r3.29 -r3.31 ---- mutt/crypt.c 11 Aug 2005 21:16:38 -0000 3.29 -+++ mutt/crypt.c 17 Sep 2005 20:46:10 -0000 3.31 -@@ -18,7 +18,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/cryptglue.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/cryptglue.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/cryptglue.c 14 Aug 2005 02:22:47 -0000 3.7 -+++ mutt/cryptglue.c 17 Sep 2005 20:46:10 -0000 3.9 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/curs_lib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/curs_lib.c,v -retrieving revision 3.21 -retrieving revision 3.23 -diff -u -p -u -a -r3.21 -r3.23 ---- mutt/curs_lib.c 12 Sep 2005 06:22:21 -0000 3.21 -+++ mutt/curs_lib.c 17 Sep 2005 20:46:10 -0000 3.23 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/curs_main.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/curs_main.c,v -retrieving revision 3.29 -retrieving revision 3.33 -diff -u -p -u -a -r3.29 -r3.33 ---- mutt/curs_main.c 6 Sep 2005 00:45:28 -0000 3.29 -+++ mutt/curs_main.c 21 Sep 2005 14:17:14 -0000 3.33 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -@@ -589,10 +589,6 @@ int mutt_index_menu (void) - move (menu->current - menu->top + menu->offset, COLS - 1); - mutt_refresh (); - -- op = km_dokey (MENU_MAIN); -- -- dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op)); -- - #if defined (USE_SLANG_CURSES) || defined (HAVE_RESIZETERM) - if (SigWinch) - { -@@ -611,6 +607,10 @@ int mutt_index_menu (void) - } - #endif - -+ op = km_dokey (MENU_MAIN); -+ -+ dprint(4, (debugfile, "mutt_index_menu[%d]: Got op %d\n", __LINE__, op)); -+ - if (op == -1) - continue; /* either user abort or timeout */ - -@@ -1072,7 +1072,15 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); - mutt_buffy (buf, sizeof (buf)); - - if (mutt_enter_fname (cp, buf, sizeof (buf), &menu->redraw, 1) == -1) -- break; -+ { -+ if (menu->menu == MENU_PAGER) -+ { -+ op = OP_DISPLAY_MESSAGE; -+ continue; -+ } -+ else -+ break; -+ } - if (!buf[0]) - { - CLEARLINE (LINES-1); -Index: mutt/date.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/date.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/date.c 3 Feb 2005 17:01:43 -0000 3.2 -+++ mutt/date.c 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/depcomp -=================================================================== -RCS file: /home/roessler/cvs/mutt/depcomp,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/depcomp 11 Apr 2003 11:56:58 -0000 3.1 -+++ mutt/depcomp 17 Sep 2005 20:46:10 -0000 3.3 -@@ -15,8 +15,8 @@ - - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -Index: mutt/dotlock.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/dotlock.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/dotlock.c 3 Feb 2005 17:01:43 -0000 3.2 -+++ mutt/dotlock.c 17 Sep 2005 20:46:10 -0000 3.4 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/dotlock.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/dotlock.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/dotlock.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/dotlock.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _DOTLOCK_H -Index: mutt/edit.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/edit.c,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -u -a -r3.5 -r3.7 ---- mutt/edit.c 3 Feb 2005 17:01:43 -0000 3.5 -+++ mutt/edit.c 17 Sep 2005 20:46:10 -0000 3.7 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* Close approximation of the mailx(1) builtin editor for sending mail. */ -Index: mutt/editmsg.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/editmsg.c,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/editmsg.c 12 Feb 2005 19:35:36 -0000 3.8 -+++ mutt/editmsg.c 17 Sep 2005 20:46:10 -0000 3.10 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* simple, editor-based message editing */ -Index: mutt/enter.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/enter.c,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/enter.c 26 Jul 2005 16:37:28 -0000 3.9 -+++ mutt/enter.c 17 Sep 2005 20:46:10 -0000 3.11 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/extlib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/extlib.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/extlib.c 3 Feb 2005 17:01:43 -0000 3.3 -+++ mutt/extlib.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/filter.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/filter.c,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/filter.c 3 Feb 2005 17:01:43 -0000 3.1 -+++ mutt/filter.c 17 Sep 2005 20:46:10 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/flags.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/flags.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/flags.c 3 Feb 2005 17:01:43 -0000 3.4 -+++ mutt/flags.c 17 Sep 2005 20:46:10 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/from.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/from.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/from.c 3 Feb 2005 17:01:43 -0000 3.2 -+++ mutt/from.c 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/functions.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/functions.h,v -retrieving revision 3.10 -retrieving revision 3.12 -diff -u -p -u -a -r3.10 -r3.12 ---- mutt/functions.h 24 Jul 2005 16:51:38 -0000 3.10 -+++ mutt/functions.h 17 Sep 2005 20:46:10 -0000 3.12 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/globals.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/globals.h,v -retrieving revision 3.22 -retrieving revision 3.25 -diff -u -p -u -a -r3.22 -r3.25 ---- mutt/globals.h 14 Sep 2005 02:45:44 -0000 3.22 -+++ mutt/globals.h 22 Sep 2005 16:38:08 -0000 3.25 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - WHERE void (*mutt_error) (const char *, ...); -@@ -69,8 +69,10 @@ WHERE char *MailcapPath; - WHERE char *Maildir; - #if USE_HCACHE - WHERE char *HeaderCache; -+#if HAVE_GDBM || HAVE_DB4 - WHERE char *HeaderCachePageSize; --#endif -+#endif /* HAVE_GDBM || HAVE_DB4 */ -+#endif /* USE_HCACHE */ - WHERE char *MhFlagged; - WHERE char *MhReplied; - WHERE char *MhUnseen; -Index: mutt/gnupgparse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/gnupgparse.c,v -retrieving revision 3.10 -retrieving revision 3.12 -diff -u -p -u -a -r3.10 -r3.12 ---- mutt/gnupgparse.c 3 Feb 2005 17:01:43 -0000 3.10 -+++ mutt/gnupgparse.c 17 Sep 2005 20:46:10 -0000 3.12 -@@ -16,8 +16,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/handler.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/handler.c,v -retrieving revision 3.20 -retrieving revision 3.22 -diff -u -p -u -a -r3.20 -r3.22 ---- mutt/handler.c 11 Aug 2005 21:16:38 -0000 3.20 -+++ mutt/handler.c 17 Sep 2005 20:46:10 -0000 3.22 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/hash.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/hash.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/hash.c 24 Jul 2005 15:46:26 -0000 3.4 -+++ mutt/hash.c 17 Sep 2005 20:46:10 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/hash.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/hash.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/hash.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/hash.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _HASH_H -Index: mutt/hcache.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/hcache.c,v -retrieving revision 3.7 -retrieving revision 3.11 -diff -u -p -u -a -r3.7 -r3.11 ---- mutt/hcache.c 6 Jul 2005 21:03:00 -0000 3.7 -+++ mutt/hcache.c 22 Sep 2005 16:38:08 -0000 3.11 -@@ -15,14 +15,18 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H - #include "config.h" - #endif /* HAVE_CONFIG_H */ - --#if HAVE_GDBM -+#if HAVE_QDBM -+#include -+#include -+#include -+#elif HAVE_GDBM - #include - #elif HAVE_DB4 - #include -@@ -42,7 +46,14 @@ - #include "lib.h" - #include "md5.h" - --#if HAVE_GDBM -+#if HAVE_QDBM -+static struct header_cache -+{ -+ VILLA *db; -+ char *folder; -+ unsigned int crc; -+} HEADER_CACHE; -+#elif HAVE_GDBM - static struct header_cache - { - GDBM_FILE db; -@@ -450,7 +461,7 @@ generate_crc32() - SPAM_LIST *sp = SpamList; - RX_LIST *rx = NoSpamList; - -- crc = crc32(crc, (unsigned char const *) "$Id: hcache.c,v 3.7 2005/07/06 21:03:00 brendan Exp $", mutt_strlen("$Id: hcache.c,v 3.7 2005/07/06 21:03:00 brendan Exp $")); -+ 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 $")); - - #if HAVE_LANGINFO_CODESET - crc = crc32(crc, (unsigned char const *) Charset, mutt_strlen(Charset)); -@@ -615,7 +626,129 @@ mutt_hcache_restore(const unsigned char - return h; - } - --#if HAVE_GDBM -+#if HAVE_QDBM -+void * -+mutt_hcache_open(const char *path, const char *folder) -+{ -+ struct header_cache *h = safe_calloc(1, sizeof (HEADER_CACHE)); -+ int flags = VL_OWRITER | VL_OCREAT; -+ h->db = NULL; -+ h->folder = safe_strdup(folder); -+ h->crc = generate_crc32(); -+ -+ if (!path || path[0] == '\0') -+ { -+ FREE(&h->folder); -+ FREE(&h); -+ return NULL; -+ } -+ -+ path = mutt_hcache_per_folder(path, folder); -+ -+ if (option(OPTHCACHECOMPRESS)) -+ flags |= VL_OZCOMP; -+ -+ h->db = vlopen(path, flags, VL_CMPLEX); -+ if (h->db) -+ return h; -+ else -+ { -+ FREE(&h->folder); -+ FREE(&h); -+ -+ return NULL; -+ } -+} -+ -+void -+mutt_hcache_close(void *db) -+{ -+ struct header_cache *h = db; -+ -+ if (!h) -+ return; -+ -+ vlclose(h->db); -+ FREE(&h->folder); -+ FREE(&h); -+} -+ -+void * -+mutt_hcache_fetch(void *db, const char *filename, -+ size_t(*keylen) (const char *fn)) -+{ -+ struct header_cache *h = db; -+ char path[_POSIX_PATH_MAX]; -+ int ksize; -+ char *data = NULL; -+ -+ if (!h) -+ return NULL; -+ -+ strncpy(path, h->folder, sizeof (path)); -+ safe_strcat(path, sizeof (path), filename); -+ -+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); -+ -+ data = vlget(h->db, path, ksize, NULL); -+ -+ if (! crc32_matches(data, h->crc)) -+ { -+ FREE(&data); -+ return NULL; -+ } -+ -+ return data; -+} -+ -+int -+mutt_hcache_store(void *db, const char *filename, HEADER * header, -+ unsigned long uid_validity, -+ size_t(*keylen) (const char *fn)) -+{ -+ struct header_cache *h = db; -+ char path[_POSIX_PATH_MAX]; -+ int ret; -+ int ksize, dsize; -+ char *data = NULL; -+ -+ if (!h) -+ return -1; -+ -+ strncpy(path, h->folder, sizeof (path)); -+ safe_strcat(path, sizeof (path), filename); -+ -+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); -+ -+ data = mutt_hcache_dump(db, header, &dsize, uid_validity); -+ -+ ret = vlput(h->db, path, ksize, data, dsize, VL_DOVER); -+ -+ FREE(&data); -+ -+ return ret; -+} -+ -+int -+mutt_hcache_delete(void *db, const char *filename, -+ size_t(*keylen) (const char *fn)) -+{ -+ struct header_cache *h = db; -+ char path[_POSIX_PATH_MAX]; -+ int ksize; -+ -+ if (!h) -+ return -1; -+ -+ strncpy(path, h->folder, sizeof (path)); -+ safe_strcat(path, sizeof (path), filename); -+ -+ ksize = strlen(h->folder) + keylen(path + strlen(h->folder)); -+ -+ return vlout(h->db, path, ksize); -+} -+ -+#elif HAVE_GDBM - - void * - mutt_hcache_open(const char *path, const char *folder) -Index: mutt/hdrline.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/hdrline.c,v -retrieving revision 3.14 -retrieving revision 3.16 -diff -u -p -u -a -r3.14 -r3.16 ---- mutt/hdrline.c 12 Feb 2005 19:12:40 -0000 3.14 -+++ mutt/hdrline.c 17 Sep 2005 20:46:10 -0000 3.16 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/headers.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/headers.c,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/headers.c 3 Feb 2005 17:01:43 -0000 3.6 -+++ mutt/headers.c 17 Sep 2005 20:46:10 -0000 3.8 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/help.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/help.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/help.c 3 Feb 2005 17:01:43 -0000 3.2 -+++ mutt/help.c 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #define HELP_C -Index: mutt/history.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/history.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/history.c 3 Feb 2005 17:01:43 -0000 3.4 -+++ mutt/history.c 17 Sep 2005 20:46:10 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/history.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/history.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/history.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/history.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _HISTORY_H -Index: mutt/hook.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/hook.c,v -retrieving revision 3.10 -retrieving revision 3.12 -diff -u -p -u -a -r3.10 -r3.12 ---- mutt/hook.c 3 Feb 2005 17:01:43 -0000 3.10 -+++ mutt/hook.c 17 Sep 2005 20:46:10 -0000 3.12 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/init.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/init.c,v -retrieving revision 3.39 -retrieving revision 3.44 -diff -u -p -u -a -r3.39 -r3.44 ---- mutt/init.c 6 Sep 2005 03:16:11 -0000 3.39 -+++ mutt/init.c 22 Sep 2005 04:05:49 -0000 3.44 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -@@ -49,6 +49,17 @@ - #include - #include - -+#define CHECK_PAGER \ -+ if ((CurrentMenu == MENU_PAGER) && \ -+ (MuttVars[idx].flags & R_RESORT)) \ -+ { \ -+ snprintf (err->data, err->dsize, \ -+ _("Not available in this menu.")); \ -+ return (-1); \ -+ } else -+ -+static int var_to_string (int idx, char* val, size_t len); -+ - void toggle_quadoption (int opt) - { - int n = opt/4; -@@ -941,7 +952,8 @@ static int parse_alias (BUFFER *buf, BUF - if (debuglevel >= 2) - { - ADDRESS *a; -- for (a = tmp->addr; a; a = a->next) -+ /* A group is terminated with an empty address, so check a->mailbox */ -+ for (a = tmp->addr; a && a->mailbox; a = a->next) - { - if (!a->group) - dprint (2, (debugfile, "parse_alias: %s\n", -@@ -1260,12 +1272,26 @@ static int parse_set (BUFFER *tmp, BUFFE - - if (!mutt_strcmp ("all", tmp->data)) - { -+ if (CurrentMenu == MENU_PAGER) -+ { -+ snprintf (err->data, err->dsize, _("Not available in this menu.")); -+ return (-1); -+ } - for (idx = 0; MuttVars[idx].option; idx++) - mutt_restore_default (&MuttVars[idx]); -+ set_option (OPTFORCEREDRAWINDEX); -+ set_option (OPTFORCEREDRAWPAGER); -+ set_option (OPTSORTSUBTHREADS); -+ set_option (OPTNEEDRESORT); -+ set_option (OPTRESORTINIT); -+ set_option (OPTREDRAWTREE); - return 0; - } - else -+ { -+ CHECK_PAGER; - mutt_restore_default (&MuttVars[idx]); -+ } - } - else if (DTYPE (MuttVars[idx].type) == DT_BOOL) - { -@@ -1297,6 +1323,7 @@ static int parse_set (BUFFER *tmp, BUFFE - return 0; - } - -+ CHECK_PAGER; - if (unset) - unset_option (MuttVars[idx].data); - else if (inv) -@@ -1310,6 +1337,7 @@ static int parse_set (BUFFER *tmp, BUFFE - { - if (unset) - { -+ CHECK_PAGER; - if (DTYPE (MuttVars[idx].type) == DT_ADDR) - rfc822_free_address ((ADDRESS **) MuttVars[idx].data); - else -@@ -1336,6 +1364,7 @@ static int parse_set (BUFFER *tmp, BUFFE - } - else - { -+ CHECK_PAGER; - s->dptr++; - - /* copy the value of the string */ -@@ -1384,6 +1413,7 @@ static int parse_set (BUFFER *tmp, BUFFE - break; - } - -+ CHECK_PAGER; - s->dptr++; - - /* copy the value of the string */ -@@ -1477,6 +1507,7 @@ static int parse_set (BUFFER *tmp, BUFFE - break; - } - -+ CHECK_PAGER; - s->dptr++; - - /* copy the value of the string */ -@@ -1501,6 +1532,7 @@ static int parse_set (BUFFER *tmp, BUFFE - break; - } - -+ CHECK_PAGER; - s->dptr++; - - mutt_extract_token (tmp, s, 0); -@@ -1539,6 +1571,7 @@ static int parse_set (BUFFER *tmp, BUFFE - break; - } - -+ CHECK_PAGER; - if (*s->dptr == '=') - { - s->dptr++; -@@ -1609,6 +1642,7 @@ static int parse_set (BUFFER *tmp, BUFFE - p); - return 0; - } -+ CHECK_PAGER; - s->dptr++; - mutt_extract_token (tmp, s , 0); - -@@ -1991,108 +2025,112 @@ int mutt_var_value_complete (char *buffe - if (mutt_strncmp (buffer, "set", 3) == 0) - { - int idx; -+ char val[LONG_STRING]; -+ - strfcpy (var, pt, sizeof (var)); - /* ignore the trailing '=' when comparing */ - var[mutt_strlen (var) - 1] = 0; - if ((idx = mutt_option_index (var)) == -1) - return 0; /* no such variable. */ -- else -+ else if (var_to_string (idx, val, sizeof (val))) - { -- char tmp [LONG_STRING], tmp2[LONG_STRING]; -- char *s, *d; -- size_t dlen = buffer + len - pt - spaces; -- char *vals[] = { "no", "yes", "ask-no", "ask-yes" }; -+ snprintf (pt, len - (pt - buffer), "%s=\"%s\"", var, val); -+ return 1; -+ } -+ } -+ return 0; -+} - -- tmp[0] = '\0'; -+static int var_to_string (int idx, char* val, size_t len) -+{ -+ char tmp[LONG_STRING]; -+ char *s, *d; -+ char *vals[] = { "no", "yes", "ask-no", "ask-yes" }; - -- if ((DTYPE(MuttVars[idx].type) == DT_STR) || -- (DTYPE(MuttVars[idx].type) == DT_PATH) || -- (DTYPE(MuttVars[idx].type) == DT_RX)) -- { -- strfcpy (tmp, NONULL (*((char **) MuttVars[idx].data)), sizeof (tmp)); -- if (DTYPE (MuttVars[idx].type) == DT_PATH) -- mutt_pretty_mailbox (tmp); -- } -- else if (DTYPE (MuttVars[idx].type) == DT_ADDR) -- { -- rfc822_write_address (tmp, sizeof (tmp), *((ADDRESS **) MuttVars[idx].data), 0); -- } -- else if (DTYPE (MuttVars[idx].type) == DT_QUAD) -- strfcpy (tmp, vals[quadoption (MuttVars[idx].data)], sizeof (tmp)); -- else if (DTYPE (MuttVars[idx].type) == DT_NUM) -- snprintf (tmp, sizeof (tmp), "%d", (*((short *) MuttVars[idx].data))); -- else if (DTYPE (MuttVars[idx].type) == DT_SORT) -- { -- const struct mapping_t *map; -- char *p; -+ tmp[0] = '\0'; - -- switch (MuttVars[idx].type & DT_SUBTYPE_MASK) -- { -- case DT_SORT_ALIAS: -- map = SortAliasMethods; -- break; -- case DT_SORT_BROWSER: -- map = SortBrowserMethods; -- break; -- case DT_SORT_KEYS: -- if ((WithCrypto & APPLICATION_PGP)) -- map = SortKeyMethods; -- else -- map = SortMethods; -- break; -- default: -- map = SortMethods; -- break; -- } -- p = mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK, map); -- snprintf (tmp, sizeof (tmp), "%s%s%s", -- (*((short *) MuttVars[idx].data) & SORT_REVERSE) ? "reverse-" : "", -- (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" : "", -- p); -- } -- else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) -- { -- char *p; -+ if ((DTYPE(MuttVars[idx].type) == DT_STR) || -+ (DTYPE(MuttVars[idx].type) == DT_PATH) || -+ (DTYPE(MuttVars[idx].type) == DT_RX)) -+ { -+ strfcpy (tmp, NONULL (*((char **) MuttVars[idx].data)), sizeof (tmp)); -+ if (DTYPE (MuttVars[idx].type) == DT_PATH) -+ mutt_pretty_mailbox (tmp); -+ } -+ else if (DTYPE (MuttVars[idx].type) == DT_ADDR) -+ { -+ rfc822_write_address (tmp, sizeof (tmp), *((ADDRESS **) MuttVars[idx].data), 0); -+ } -+ else if (DTYPE (MuttVars[idx].type) == DT_QUAD) -+ strfcpy (tmp, vals[quadoption (MuttVars[idx].data)], sizeof (tmp)); -+ else if (DTYPE (MuttVars[idx].type) == DT_NUM) -+ snprintf (tmp, sizeof (tmp), "%d", (*((short *) MuttVars[idx].data))); -+ else if (DTYPE (MuttVars[idx].type) == DT_SORT) -+ { -+ const struct mapping_t *map; -+ char *p; - -- switch (DefaultMagic) -- { -- case M_MBOX: -- p = "mbox"; -- break; -- case M_MMDF: -- p = "MMDF"; -- break; -- case M_MH: -- p = "MH"; -- break; -- case M_MAILDIR: -- p = "Maildir"; -- break; -- default: -- p = "unknown"; -- } -- strfcpy (tmp, p, sizeof (tmp)); -- } -- else if (DTYPE (MuttVars[idx].type) == DT_BOOL) -- strfcpy (tmp, option (MuttVars[idx].data) ? "yes" : "no", sizeof (tmp)); -- else -- return 0; -- -- for (s = tmp, d = tmp2; *s && (d - tmp2) < sizeof (tmp2) - 2;) -- { -- if (*s == '\\' || *s == '"') -- *d++ = '\\'; -- *d++ = *s++; -- } -- *d = '\0'; -- -- strfcpy (tmp, pt, sizeof (tmp)); -- snprintf (pt, dlen, "%s\"%s\"", tmp, tmp2); -- -- return 1; -+ switch (MuttVars[idx].type & DT_SUBTYPE_MASK) -+ { -+ case DT_SORT_ALIAS: -+ map = SortAliasMethods; -+ break; -+ case DT_SORT_BROWSER: -+ map = SortBrowserMethods; -+ break; -+ case DT_SORT_KEYS: -+ if ((WithCrypto & APPLICATION_PGP)) -+ map = SortKeyMethods; -+ else -+ map = SortMethods; -+ break; -+ default: -+ map = SortMethods; -+ break; - } -+ p = mutt_getnamebyvalue (*((short *) MuttVars[idx].data) & SORT_MASK, map); -+ snprintf (tmp, sizeof (tmp), "%s%s%s", -+ (*((short *) MuttVars[idx].data) & SORT_REVERSE) ? "reverse-" : "", -+ (*((short *) MuttVars[idx].data) & SORT_LAST) ? "last-" : "", -+ p); - } -- return 0; -+ else if (DTYPE (MuttVars[idx].type) == DT_MAGIC) -+ { -+ char *p; -+ -+ switch (DefaultMagic) -+ { -+ case M_MBOX: -+ p = "mbox"; -+ break; -+ case M_MMDF: -+ p = "MMDF"; -+ break; -+ case M_MH: -+ p = "MH"; -+ break; -+ case M_MAILDIR: -+ p = "Maildir"; -+ break; -+ default: -+ p = "unknown"; -+ } -+ strfcpy (tmp, p, sizeof (tmp)); -+ } -+ else if (DTYPE (MuttVars[idx].type) == DT_BOOL) -+ strfcpy (tmp, option (MuttVars[idx].data) ? "yes" : "no", sizeof (tmp)); -+ else -+ return 0; -+ -+ for (s = tmp, d = val; *s && len - (d - val) > 2; len--) -+ { -+ if (*s == '\\' || *s == '"') -+ *d++ = '\\'; -+ *d++ = *s++; -+ } -+ *d = '\0'; -+ -+ return 1; - } - - /* Implement the -Q command line flag */ -Index: mutt/init.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/init.h,v -retrieving revision 3.85 -retrieving revision 3.89 -diff -u -p -u -a -r3.85 -r3.89 ---- mutt/init.h 14 Sep 2005 14:15:06 -0000 3.85 -+++ mutt/init.h 22 Sep 2005 16:38:08 -0000 3.89 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifdef _MAKEDOC -@@ -1069,6 +1069,7 @@ struct option_t MuttVars[] = { - ** files when the header cache is in use. This incurs one stat(2) per - ** message every time the folder is opened. - */ -+#if HAVE_GDBM || HAVE_DB4 - { "header_cache_pagesize", DT_STR, R_NONE, UL &HeaderCachePageSize, UL "16384" }, - /* - ** .pp -@@ -1077,6 +1078,16 @@ struct option_t MuttVars[] = { - ** or less the best you can get. For details, google for mutt header - ** cache (first hit). - */ -+#endif /* HAVE_GDBM || HAVE_DB4 */ -+#if HAVE_QDBM -+ { "header_cache_compress", DT_BOOL, R_NONE, OPTHCACHECOMPRESS, 0 }, -+ /* -+ ** .pp -+ ** If enabled the header cache will be compressed. So only one fifth of the usual -+ ** diskspace is used, but the uncompression can result in a slower open of the -+ ** cached folder. -+ */ -+#endif /* HAVE_QDBM */ - #endif /* USE_HCACHE */ - { "maildir_trash", DT_BOOL, R_NONE, OPTMAILDIRTRASH, 0 }, - /* -Index: mutt/keymap.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/keymap.c,v -retrieving revision 3.15 -retrieving revision 3.17 -diff -u -p -u -a -r3.15 -r3.17 ---- mutt/keymap.c 4 Sep 2005 18:01:57 -0000 3.15 -+++ mutt/keymap.c 17 Sep 2005 20:46:10 -0000 3.17 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/keymap.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/keymap.h,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/keymap.h 17 Jun 2004 20:36:13 -0000 3.8 -+++ mutt/keymap.h 17 Sep 2005 20:46:10 -0000 3.10 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef KEYMAP_H -Index: mutt/lib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/lib.c,v -retrieving revision 3.17 -retrieving revision 3.19 -diff -u -p -u -a -r3.17 -r3.19 ---- mutt/lib.c 6 Aug 2005 22:20:55 -0000 3.17 -+++ mutt/lib.c 17 Sep 2005 20:46:10 -0000 3.19 -@@ -16,8 +16,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/lib.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/lib.h,v -retrieving revision 3.11 -retrieving revision 3.13 -diff -u -p -u -a -r3.11 -r3.13 ---- mutt/lib.h 6 Aug 2005 22:20:55 -0000 3.11 -+++ mutt/lib.h 17 Sep 2005 20:46:10 -0000 3.13 -@@ -16,8 +16,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* mutt functions which are generally useful. */ -Index: mutt/mailbox.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mailbox.h,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/mailbox.h 12 Nov 2002 07:53:09 -0000 3.4 -+++ mutt/mailbox.h 17 Sep 2005 20:46:10 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _MAILBOX_H -Index: mutt/main.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/main.c,v -retrieving revision 3.30 -retrieving revision 3.33 -diff -u -p -u -a -r3.30 -r3.33 ---- mutt/main.c 6 Sep 2005 01:46:46 -0000 3.30 -+++ mutt/main.c 17 Sep 2005 20:46:10 -0000 3.33 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #define MAIN_C 1 -@@ -58,10 +58,10 @@ - - static const char *ReachingUs = N_("\ - To contact the developers, please mail to .\n\ --To report a bug, please use the flea(1) utility.\n"); -+To report a bug, please visit http://bugs.mutt.org/.\n"); - - static const char *Notice = N_("\ --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"); -@@ -75,9 +75,10 @@ Copyright (C) 1999-2005 Brendan Cully \n\ - Copyright (C) 2000-2002 Edmund Grimley Evans \n\ - \n\ --Lots of others not mentioned here contributed lots of code,\n\ --fixes, and suggestions.\n\ --\n\ -+Many others not mentioned here contributed code, fixes,\n\ -+and suggestions.\n"); -+ -+static const char *Licence = 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\ -@@ -86,11 +87,11 @@ fixes, and suggestions.\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\ -+ GNU General Public License for more details.\n"); -+static const char *Obtaining = 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n\ -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n\ - "); - - void mutt_exit (int code) -@@ -110,8 +111,9 @@ static void mutt_usage (void) - mutt [ -nR ] [ -e ] [ -F ] -D\n\ - mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n\ - mutt [ -n ] [ -e ] [ -F ] -p\n\ -- mutt -v[v]\n\ --\n\ -+ mutt -v[v]\n"); -+ -+ puts _("\ - options:\n\ - -A \texpand the given alias\n\ - -a \tattach a file to the message\n\ -@@ -129,7 +131,9 @@ options:\n\ - -i \tspecify a file which Mutt should include in the body\n\ - -m \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"); -+ -+ puts _("\ - -Q \tquery a configuration variable\n\ - -R\t\topen mailbox in read-only mode\n\ - -s \tspecify a subject (must be in quotes if it has spaces)\n\ -@@ -277,8 +281,15 @@ static void show_version (void) - #else - "-USE_SASL " - #endif -- "\n" -- -+ -+#if HAVE_GETADDRINFO -+ "+HAVE_GETADDRINFO " -+#else -+ "-HAVE_GETADDRINFO " -+#endif -+ ); -+ -+ puts ( - #ifdef HAVE_REGCOMP - "+HAVE_REGCOMP " - #else -@@ -354,7 +365,9 @@ static void show_version (void) - #else - "-CRYPT_BACKEND_GPGME " - #endif -- -+ ); -+ -+ puts ( - #ifdef BUFFY_SIZE - "+BUFFY_SIZE " - #else -@@ -431,12 +444,6 @@ static void show_version (void) - "-HAVE_GETSID " - #endif - --#if HAVE_GETADDRINFO -- "+HAVE_GETADDRINFO " --#else -- "-HAVE_GETADDRINFO " --#endif -- - #if USE_HCACHE - "+USE_HCACHE " - #else -@@ -671,6 +678,8 @@ int main (int argc, char **argv) - default: - puts (mutt_make_version ()); - puts (_(Copyright)); -+ puts (_(Licence)); -+ puts (_(Obtaining)); - puts (_(ReachingUs)); - exit (0); - } -Index: mutt/makedoc.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/makedoc.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/makedoc.c 1 Sep 2005 01:39:05 -0000 3.4 -+++ mutt/makedoc.c 17 Sep 2005 20:46:10 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /** -Index: mutt/mapping.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mapping.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/mapping.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/mapping.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef MAPPING_H -Index: mutt/mbox.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mbox.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/mbox.c 1 Aug 2005 18:05:12 -0000 3.7 -+++ mutt/mbox.c 17 Sep 2005 20:46:10 -0000 3.9 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* This file contains code to parse ``mbox'' and ``mmdf'' style mailboxes */ -Index: mutt/mbyte.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mbyte.c,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -u -a -r3.5 -r3.7 ---- mutt/mbyte.c 26 Jul 2005 03:09:55 -0000 3.5 -+++ mutt/mbyte.c 17 Sep 2005 20:46:10 -0000 3.7 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/menu.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/menu.c,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/menu.c 10 Sep 2005 18:47:17 -0000 3.19 -+++ mutt/menu.c 17 Sep 2005 20:46:10 -0000 3.21 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mh.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mh.c,v -retrieving revision 3.27 -retrieving revision 3.29 -diff -u -p -u -a -r3.27 -r3.29 ---- mutt/mh.c 25 Jul 2005 15:48:36 -0000 3.27 -+++ mutt/mh.c 17 Sep 2005 20:46:10 -0000 3.29 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/mime.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mime.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/mime.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/mime.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* Content-Type */ -Index: mutt/missing -=================================================================== -RCS file: /home/roessler/cvs/mutt/missing,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/missing 11 Apr 2003 11:56:58 -0000 3.1 -+++ mutt/missing 17 Sep 2005 20:46:10 -0000 3.3 -@@ -15,8 +15,8 @@ - - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -+# 02110-1301, USA. - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -Index: mutt/mkchangelog.sh -=================================================================== -RCS file: /home/roessler/cvs/mutt/mkchangelog.sh,v -retrieving revision 3.2 -retrieving revision 3.3 -diff -u -p -u -a -r3.2 -r3.3 ---- mutt/mkchangelog.sh 18 Dec 2002 10:24:08 -0000 3.2 -+++ mutt/mkchangelog.sh 19 Sep 2005 06:14:27 -0000 3.3 -@@ -2,4 +2,5 @@ - - TZ=GMT; export TZ - date="`head -1 ChangeLog | awk '{print $1, $2}'`" -+test -n "$date" || exit 1 - cvs -z9 log -d ">$date" | perl ./cvslog2changelog.pl -Index: mutt/mutt.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt.h,v -retrieving revision 3.54 -retrieving revision 3.57 -diff -u -p -u -a -r3.54 -r3.57 ---- mutt/mutt.h 7 Sep 2005 00:22:09 -0000 3.54 -+++ mutt/mutt.h 21 Sep 2005 06:04:37 -0000 3.57 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef MUTT_H -@@ -353,6 +353,9 @@ enum - OPTFORWQUOTE, - #if USE_HCACHE - OPTHCACHEVERIFY, -+#if HAVE_QDBM -+ OPTHCACHECOMPRESS, -+#endif /* HAVE_QDBM */ - #endif - OPTHDRS, - OPTHEADER, -Index: mutt/mutt_crypt.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_crypt.h,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/mutt_crypt.h 11 Aug 2005 21:16:38 -0000 3.9 -+++ mutt/mutt_crypt.h 17 Sep 2005 20:46:10 -0000 3.11 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/mutt_curses.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_curses.h,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/mutt_curses.h 7 Sep 2005 07:44:05 -0000 3.6 -+++ mutt/mutt_curses.h 17 Sep 2005 20:46:10 -0000 3.8 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _MUTT_CURSES_H_ -Index: mutt/mutt_idna.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_idna.c,v -retrieving revision 3.10 -retrieving revision 3.12 -diff -u -p -u -a -r3.10 -r3.12 ---- mutt/mutt_idna.c 8 Feb 2005 17:23:50 -0000 3.10 -+++ mutt/mutt_idna.c 17 Sep 2005 20:46:10 -0000 3.12 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mutt_idna.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_idna.h,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/mutt_idna.h 5 Feb 2005 14:11:36 -0000 3.3 -+++ mutt/mutt_idna.h 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _MUTT_IDNA_H -Index: mutt/mutt_menu.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_menu.h,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/mutt_menu.h 5 Aug 2005 02:16:46 -0000 3.3 -+++ mutt/mutt_menu.h 17 Sep 2005 20:46:10 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/mutt_regex.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_regex.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/mutt_regex.h 1 Feb 2004 17:10:43 -0000 3.2 -+++ mutt/mutt_regex.h 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/mutt_sasl.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_sasl.c,v -retrieving revision 3.18 -retrieving revision 3.20 -diff -u -p -u -a -r3.18 -r3.20 ---- mutt/mutt_sasl.c 6 Sep 2005 00:24:49 -0000 3.18 -+++ mutt/mutt_sasl.c 17 Sep 2005 20:46:10 -0000 3.20 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* common SASL helper routines */ -Index: mutt/mutt_sasl.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_sasl.h,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/mutt_sasl.h 6 Sep 2005 00:24:50 -0000 3.4 -+++ mutt/mutt_sasl.h 17 Sep 2005 20:46:10 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* common SASL helper routines */ -Index: mutt/mutt_socket.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_socket.c,v -retrieving revision 3.12 -retrieving revision 3.14 -diff -u -p -u -a -r3.12 -r3.14 ---- mutt/mutt_socket.c 8 Sep 2005 14:50:49 -0000 3.12 -+++ mutt/mutt_socket.c 17 Sep 2005 20:46:10 -0000 3.14 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mutt_socket.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_socket.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/mutt_socket.h 5 Mar 2005 07:10:57 -0000 3.1 -+++ mutt/mutt_socket.h 17 Sep 2005 20:46:10 -0000 3.3 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _MUTT_SOCKET_H_ -Index: mutt/mutt_ssl.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_ssl.c,v -retrieving revision 3.10 -retrieving revision 3.12 -diff -u -p -u -a -r3.10 -r3.12 ---- mutt/mutt_ssl.c 3 Aug 2005 06:51:24 -0000 3.10 -+++ mutt/mutt_ssl.c 17 Sep 2005 20:46:10 -0000 3.12 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mutt_ssl.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_ssl.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/mutt_ssl.h 2 Aug 2005 16:10:42 -0000 3.2 -+++ mutt/mutt_ssl.h 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _MUTT_SSL_H_ -Index: mutt/mutt_ssl_gnutls.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_ssl_gnutls.c,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/mutt_ssl_gnutls.c 12 Aug 2005 23:06:25 -0000 3.9 -+++ mutt/mutt_ssl_gnutls.c 17 Sep 2005 20:46:10 -0000 3.11 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mutt_tunnel.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_tunnel.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/mutt_tunnel.c 6 Aug 2005 22:20:55 -0000 3.3 -+++ mutt/mutt_tunnel.c 17 Sep 2005 20:46:10 -0000 3.5 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mutt_tunnel.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt_tunnel.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/mutt_tunnel.h 24 Jan 2002 12:10:50 -0000 3.0 -+++ mutt/mutt_tunnel.h 17 Sep 2005 20:46:10 -0000 3.2 -@@ -11,7 +11,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _MUTT_TUNNEL_H_ -Index: mutt/muttbug.sh.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/muttbug.sh.in,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/muttbug.sh.in 9 Jan 2005 15:35:51 -0000 3.7 -+++ mutt/muttbug.sh.in 17 Sep 2005 20:46:10 -0000 3.9 -@@ -5,7 +5,7 @@ - # - - # --# $Id: muttbug.sh.in,v 3.7 2005/01/09 15:35:51 roessler Exp $ -+# $Id: muttbug.sh.in,v 3.9 2005/09/17 20:46:10 brendan Exp $ - # - - # -@@ -24,7 +24,7 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - # - - exec >&2 -Index: mutt/muttlib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/muttlib.c,v -retrieving revision 3.34 -retrieving revision 3.38 -diff -u -p -u -a -r3.34 -r3.38 ---- mutt/muttlib.c 1 Aug 2005 07:35:04 -0000 3.34 -+++ mutt/muttlib.c 20 Sep 2005 23:41:21 -0000 3.38 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -@@ -1588,7 +1588,7 @@ int mutt_match_spam_list (const char *s, - if (*p == '%') - { - n = atoi(++p); /* find pmatch index */ -- while (isdigit(*p)) -+ while (isdigit((unsigned char)*p)) - ++p; /* skip subst token */ - for (i = pmatch[n].rm_so; (i < pmatch[n].rm_eo) && (tlen < x); i++) - text[tlen++] = s[i]; -Index: mutt/mx.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mx.c,v -retrieving revision 3.21 -retrieving revision 3.23 -diff -u -p -u -a -r3.21 -r3.23 ---- mutt/mx.c 7 Sep 2005 04:51:11 -0000 3.21 -+++ mutt/mx.c 17 Sep 2005 20:46:10 -0000 3.23 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/mx.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mx.h,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -u -a -r3.5 -r3.7 ---- mutt/mx.h 5 Aug 2003 13:55:47 -0000 3.5 -+++ mutt/mx.h 17 Sep 2005 20:46:10 -0000 3.7 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/pager.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pager.c,v -retrieving revision 3.26 -retrieving revision 3.28 -diff -u -p -u -a -r3.26 -r3.28 ---- mutt/pager.c 8 Sep 2005 16:37:59 -0000 3.26 -+++ mutt/pager.c 17 Sep 2005 20:46:10 -0000 3.28 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/pager.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/pager.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/pager.h 5 Aug 2005 02:16:46 -0000 3.2 -+++ mutt/pager.h 17 Sep 2005 20:46:10 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #include "attach.h" -Index: mutt/parse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/parse.c,v -retrieving revision 3.16 -retrieving revision 3.18 -diff -u -p -u -a -r3.16 -r3.18 ---- mutt/parse.c 4 Sep 2005 19:28:18 -0000 3.16 -+++ mutt/parse.c 17 Sep 2005 20:46:10 -0000 3.18 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/pattern.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pattern.c,v -retrieving revision 3.20 -retrieving revision 3.24 -diff -u -p -u -a -r3.20 -r3.24 ---- mutt/pattern.c 8 Sep 2005 14:32:18 -0000 3.20 -+++ mutt/pattern.c 21 Sep 2005 19:30:57 -0000 3.24 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -@@ -263,6 +263,11 @@ int eat_regexp (pattern_t *pat, BUFFER * - snprintf (err->data, err->dsize, _("Error in expression: %s"), s->dptr); - return (-1); - } -+ if (!*buf.data) -+ { -+ snprintf (err->data, err->dsize, _("Empty expression")); -+ return (-1); -+ } - - #if 0 - /* If there are no RE metacharacters, use simple search anyway */ -@@ -1045,7 +1050,7 @@ mutt_pattern_exec (struct pattern_t *pat - case M_WHOLE_MSG: - #ifdef USE_IMAP - /* IMAP search sets h->matched at search compile time */ -- if (Context->magic == M_IMAP && pat->stringmatch) -+ if (ctx->magic == M_IMAP && pat->stringmatch) - return (h->matched); - #endif - return (pat->not ^ msg_search (ctx, pat, h->msgno)); -Index: mutt/pgp.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgp.c,v -retrieving revision 3.55 -retrieving revision 3.58 -diff -u -p -u -a -r3.55 -r3.58 ---- mutt/pgp.c 7 Sep 2005 04:51:11 -0000 3.55 -+++ mutt/pgp.c 21 Sep 2005 04:50:31 -0000 3.58 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -@@ -106,7 +106,15 @@ void pgp_forget_passphrase (void) - - int pgp_use_gpg_agent (void) - { -- return option (OPTUSEGPGAGENT) && getenv ("GPG_TTY") && getenv ("GPG_AGENT_INFO"); -+ char *tty; -+ -+ if (!option (OPTUSEGPGAGENT) || !getenv ("GPG_AGENT_INFO")) -+ return 0; -+ -+ if ((tty = ttyname(0))) -+ setenv("GPG_TTY", tty, 0); -+ -+ return 1; - } - - char *pgp_keyid(pgp_key_t k) -Index: mutt/pgp.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgp.h,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/pgp.h 11 Aug 2005 21:16:38 -0000 3.7 -+++ mutt/pgp.h 17 Sep 2005 20:46:10 -0000 3.9 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifdef CRYPT_BACKEND_CLASSIC_PGP -Index: mutt/pgpinvoke.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgpinvoke.c,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/pgpinvoke.c 3 Feb 2005 17:01:43 -0000 3.6 -+++ mutt/pgpinvoke.c 17 Sep 2005 20:46:10 -0000 3.8 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* This file contains the new pgp invocation code. Note that this -Index: mutt/pgpkey.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgpkey.c,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/pgpkey.c 3 Feb 2005 17:01:44 -0000 3.9 -+++ mutt/pgpkey.c 17 Sep 2005 20:46:11 -0000 3.11 -@@ -16,8 +16,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/pgplib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgplib.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/pgplib.c 3 Feb 2005 17:01:44 -0000 3.4 -+++ mutt/pgplib.c 17 Sep 2005 20:46:11 -0000 3.6 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* Generally useful, pgp-related functions. */ -Index: mutt/pgplib.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgplib.h,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/pgplib.h 21 Jan 2003 12:33:41 -0000 3.4 -+++ mutt/pgplib.h 17 Sep 2005 20:46:11 -0000 3.6 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifdef CRYPT_BACKEND_CLASSIC_PGP -Index: mutt/pgpmicalg.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgpmicalg.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/pgpmicalg.c 3 Feb 2005 17:01:44 -0000 3.2 -+++ mutt/pgpmicalg.c 17 Sep 2005 20:46:11 -0000 3.4 -@@ -13,8 +13,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -- * MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* This module peeks at a PGP signature and figures out the hash -Index: mutt/pgppacket.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgppacket.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/pgppacket.c 3 Feb 2005 17:01:44 -0000 3.2 -+++ mutt/pgppacket.c 17 Sep 2005 20:46:11 -0000 3.4 -@@ -13,8 +13,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -- * MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/pgppacket.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgppacket.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/pgppacket.h 24 Jan 2002 12:10:51 -0000 3.0 -+++ mutt/pgppacket.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,8 +13,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, -- * MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, -+ * MA 02110-1301, USA. - */ - - /* -Index: mutt/pgppubring.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgppubring.c,v -retrieving revision 3.11 -retrieving revision 3.13 -diff -u -p -u -a -r3.11 -r3.13 ---- mutt/pgppubring.c 3 Feb 2005 17:01:44 -0000 3.11 -+++ mutt/pgppubring.c 17 Sep 2005 20:46:11 -0000 3.13 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/pop.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pop.c,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/pop.c 12 Sep 2005 06:22:21 -0000 3.6 -+++ mutt/pop.c 17 Sep 2005 20:46:11 -0000 3.8 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/pop.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/pop.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/pop.h 12 Sep 2005 06:22:21 -0000 3.2 -+++ mutt/pop.h 17 Sep 2005 20:46:11 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _POP_H -Index: mutt/pop_auth.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pop_auth.c,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -u -a -r3.5 -r3.7 ---- mutt/pop_auth.c 1 Sep 2005 17:07:14 -0000 3.5 -+++ mutt/pop_auth.c 17 Sep 2005 20:46:11 -0000 3.7 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/pop_lib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pop_lib.c,v -retrieving revision 3.10 -retrieving revision 3.12 -diff -u -p -u -a -r3.10 -r3.12 ---- mutt/pop_lib.c 12 Sep 2005 06:22:21 -0000 3.10 -+++ mutt/pop_lib.c 17 Sep 2005 20:46:11 -0000 3.12 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/postpone.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/postpone.c,v -retrieving revision 3.12 -retrieving revision 3.14 -diff -u -p -u -a -r3.12 -r3.14 ---- mutt/postpone.c 3 Feb 2005 17:01:44 -0000 3.12 -+++ mutt/postpone.c 17 Sep 2005 20:46:11 -0000 3.14 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/protos.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/protos.h,v -retrieving revision 3.36 -retrieving revision 3.38 -diff -u -p -u -a -r3.36 -r3.38 ---- mutt/protos.h 6 Sep 2005 01:46:46 -0000 3.36 -+++ mutt/protos.h 17 Sep 2005 20:46:11 -0000 3.38 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - -Index: mutt/query.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/query.c,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/query.c 3 Feb 2005 17:01:44 -0000 3.8 -+++ mutt/query.c 17 Sep 2005 20:46:11 -0000 3.10 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/recvattach.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/recvattach.c,v -retrieving revision 3.17 -retrieving revision 3.19 -diff -u -p -u -a -r3.17 -r3.19 ---- mutt/recvattach.c 30 Jul 2005 03:59:04 -0000 3.17 -+++ mutt/recvattach.c 17 Sep 2005 20:46:11 -0000 3.19 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/recvcmd.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/recvcmd.c,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/recvcmd.c 3 Feb 2005 17:01:44 -0000 3.8 -+++ mutt/recvcmd.c 17 Sep 2005 20:46:11 -0000 3.10 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/regex.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/regex.c,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/regex.c 3 Feb 2005 17:01:44 -0000 3.1 -+++ mutt/regex.c 17 Sep 2005 20:46:11 -0000 3.3 -@@ -20,8 +20,8 @@ - * - * You should have received a copy of the GNU Library General Public - * License along with the GNU C Library; see the file COPYING.LIB. If not, -- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111-1307, USA. -+ * write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/remailer.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/remailer.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/remailer.c 3 Feb 2005 17:01:44 -0000 3.4 -+++ mutt/remailer.c 17 Sep 2005 20:46:11 -0000 3.6 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/remailer.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/remailer.h,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/remailer.h 5 Feb 2005 14:11:36 -0000 3.2 -+++ mutt/remailer.h 17 Sep 2005 20:46:11 -0000 3.4 -@@ -16,7 +16,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/resize.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/resize.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/resize.c 3 Feb 2005 17:01:44 -0000 3.2 -+++ mutt/resize.c 17 Sep 2005 20:46:11 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/rfc1524.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc1524.c,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/rfc1524.c 3 Feb 2005 17:01:44 -0000 3.6 -+++ mutt/rfc1524.c 17 Sep 2005 20:46:11 -0000 3.8 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/rfc1524.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc1524.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/rfc1524.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/rfc1524.h 17 Sep 2005 20:46:11 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _RFC1524_H -Index: mutt/rfc2047.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc2047.c,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/rfc2047.c 3 Feb 2005 17:01:44 -0000 3.8 -+++ mutt/rfc2047.c 17 Sep 2005 20:46:11 -0000 3.10 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/rfc2047.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc2047.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/rfc2047.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/rfc2047.h 17 Sep 2005 20:46:11 -0000 3.3 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - char *mutt_choose_charset (const char *fromcode, const char *charsets, -Index: mutt/rfc2231.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc2231.c,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -u -a -r3.5 -r3.7 ---- mutt/rfc2231.c 3 Feb 2005 17:01:44 -0000 3.5 -+++ mutt/rfc2231.c 17 Sep 2005 20:46:11 -0000 3.7 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/rfc2231.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc2231.h,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/rfc2231.h 11 Dec 2002 11:19:40 -0000 3.1 -+++ mutt/rfc2231.h 17 Sep 2005 20:46:11 -0000 3.3 -@@ -15,8 +15,8 @@ - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the Free -- * Software Foundation, Inc., 59 Temple Place - Suite 330, -- * Boston, MA 02111, USA. -+ * Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301, USA. - */ - - void rfc2231_decode_parameters (PARAMETER **); -Index: mutt/rfc822.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc822.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/rfc822.c 3 Feb 2005 17:01:44 -0000 3.7 -+++ mutt/rfc822.c 17 Sep 2005 20:46:11 -0000 3.9 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/rfc822.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/rfc822.h,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/rfc822.h 5 Feb 2005 14:11:36 -0000 3.3 -+++ mutt/rfc822.h 17 Sep 2005 20:46:11 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef rfc822_h -Index: mutt/score.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/score.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/score.c 3 Feb 2005 17:01:44 -0000 3.3 -+++ mutt/score.c 17 Sep 2005 20:46:11 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/send.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/send.c,v -retrieving revision 3.39 -retrieving revision 3.43 -diff -u -p -u -a -r3.39 -r3.43 ---- mutt/send.c 3 Sep 2005 23:22:31 -0000 3.39 -+++ mutt/send.c 22 Sep 2005 09:06:13 -0000 3.43 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -@@ -589,6 +589,12 @@ void mutt_fix_reply_recipients (ENVELOPE - env->to = mutt_remove_duplicates (env->to); - env->cc = mutt_remove_duplicates (env->cc); - env->cc = mutt_remove_xrefs (env->to, env->cc); -+ -+ if (env->cc && !env->to) -+ { -+ env->to = env->cc; -+ env->cc = NULL; -+ } - } - - void mutt_make_forward_subject (ENVELOPE *env, CONTEXT *ctx, HEADER *cur) -@@ -1122,8 +1128,9 @@ ci_send_message (int flags, /* send mod - pbody = mutt_new_body (); - pbody->next = msg->content; /* don't kill command-line attachments */ - msg->content = pbody; -- -- ctype = safe_strdup (ContentType); -+ -+ if (!(ctype = safe_strdup (ContentType))) -+ ctype = safe_strdup ("text/plain"); - mutt_parse_content_type (ctype, msg->content); - FREE (&ctype); - msg->content->unlink = 1; -Index: mutt/sendlib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/sendlib.c,v -retrieving revision 3.32 -retrieving revision 3.34 -diff -u -p -u -a -r3.32 -r3.34 ---- mutt/sendlib.c 14 Sep 2005 02:45:44 -0000 3.32 -+++ mutt/sendlib.c 17 Sep 2005 20:46:11 -0000 3.34 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #define _SENDLIB_C 1 -Index: mutt/signal.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/signal.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/signal.c 3 Feb 2005 17:01:44 -0000 3.4 -+++ mutt/signal.c 17 Sep 2005 20:46:11 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/smime.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/smime.c,v -retrieving revision 3.41 -retrieving revision 3.43 -diff -u -p -u -a -r3.41 -r3.43 ---- mutt/smime.c 14 Aug 2005 02:22:47 -0000 3.41 -+++ mutt/smime.c 17 Sep 2005 20:46:11 -0000 3.43 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/smime.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/smime.h,v -retrieving revision 3.11 -retrieving revision 3.13 -diff -u -p -u -a -r3.11 -r3.13 ---- mutt/smime.h 11 Aug 2005 21:16:38 -0000 3.11 -+++ mutt/smime.h 17 Sep 2005 20:46:11 -0000 3.13 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - -Index: mutt/smime_keys.pl -=================================================================== -RCS file: /home/roessler/cvs/mutt/smime_keys.pl,v -retrieving revision 3.17 -retrieving revision 3.19 -diff -u -p -u -a -r3.17 -r3.19 ---- mutt/smime_keys.pl 27 Jan 2005 18:22:59 -0000 3.17 -+++ mutt/smime_keys.pl 17 Sep 2005 20:46:11 -0000 3.19 -@@ -16,7 +16,7 @@ - # - # You should have received a copy of the GNU General Public License - # along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - use strict; - use File::Copy; -Index: mutt/sort.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/sort.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/sort.c 3 Feb 2005 17:01:44 -0000 3.7 -+++ mutt/sort.c 17 Sep 2005 20:46:11 -0000 3.9 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/sort.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/sort.h,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/sort.h 14 Jul 2004 04:50:19 -0000 3.4 -+++ mutt/sort.h 17 Sep 2005 20:46:11 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #define SORT_DATE 1 /* the date the mail was sent. */ -Index: mutt/status.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/status.c,v -retrieving revision 3.6 -retrieving revision 3.8 -diff -u -p -u -a -r3.6 -r3.8 ---- mutt/status.c 3 Feb 2005 17:01:44 -0000 3.6 -+++ mutt/status.c 17 Sep 2005 20:46:11 -0000 3.8 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/system.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/system.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/system.c 3 Feb 2005 17:01:44 -0000 3.2 -+++ mutt/system.c 17 Sep 2005 20:46:11 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/thread.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/thread.c,v -retrieving revision 3.13 -retrieving revision 3.15 -diff -u -p -u -a -r3.13 -r3.15 ---- mutt/thread.c 25 Jul 2005 15:48:36 -0000 3.13 -+++ mutt/thread.c 17 Sep 2005 20:46:11 -0000 3.15 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/url.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/url.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/url.c 3 Feb 2005 17:01:44 -0000 3.7 -+++ mutt/url.c 17 Sep 2005 20:46:11 -0000 3.9 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* -Index: mutt/contrib/gpg.rc -=================================================================== -RCS file: /home/roessler/cvs/mutt/contrib/gpg.rc,v -retrieving revision 3.5 -retrieving revision 3.6 -diff -u -p -u -a -r3.5 -r3.6 ---- mutt/contrib/gpg.rc 3 Sep 2005 19:41:53 -0000 3.5 -+++ mutt/contrib/gpg.rc 20 Sep 2005 03:56:25 -0000 3.6 -@@ -3,9 +3,9 @@ - # Command formats for gpg. - # - # This version uses gpg-2comp from --# http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp.tar.gz -+# http://70t.de/download/gpg-2comp.tar.gz - # --# $Id: gpg.rc,v 3.5 2005/09/03 19:41:53 brendan Exp $ -+# $Id: gpg.rc,v 3.6 2005/09/20 03:56:25 brendan Exp $ - # - # %p The empty string when no passphrase is needed, - # the string "PGPPASSFD=0" if one is needed. -Index: mutt/doc/Makefile.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/Makefile.in,v -retrieving revision 3.14 -retrieving revision 3.20 -diff -u -p -u -a -r3.14 -r3.20 ---- mutt/doc/Makefile.in 13 Sep 2005 20:36:17 -0000 3.14 -+++ mutt/doc/Makefile.in 18 Sep 2005 02:53:18 -0000 3.20 -@@ -1,4 +1,4 @@ --# $Id: Makefile.in,v 3.14 2005/09/13 20:36:17 brendan Exp $ -+# $Id: Makefile.in,v 3.20 2005/09/18 02:53:18 brendan Exp $ - - SHELL = /bin/sh - -@@ -58,8 +58,7 @@ HTML_DOCFILES = manual.html index.html g - configuration.html mimesupport.html advancedusage.html \ - reference.html miscellany.html - --BUILT_DISTFILES = stamp-doc-xml stamp-doc-man stamp-doc-chunked \ -- manual.txt $(HTML_DOCFILES) -+BUILT_DISTFILES = stamp-doc-xml stamp-doc-chunked manual.txt $(HTML_DOCFILES) - - srcdir_DOCFILES = PGP-Notes.txt applying-patches.txt \ - devel-notes.txt patch-notes.txt smime-notes.txt -@@ -68,9 +67,12 @@ topsrcdir_DOCFILES = COPYRIGHT GPL INSTA - ChangeLog.old \ - README NEWS TODO README.SECURITY README.SSL - --all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt -+all: ../makedoc$(EXEEXT) -+ $(MAKE) makedoc-all - --install: all instdoc -+makedoc-all: mutt.1 muttrc.man manual.html stamp-doc-chunked manual.txt -+ -+install: makedoc-all instdoc - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man1 - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(mandir)/man5 - ./instdoc mutt.1 $(DESTDIR)$(mandir)/man1/mutt.1 -@@ -110,21 +112,20 @@ check: - manual.txt: manual.html - -lynx -dump -nolist -with_backspaces $^ > $@ || w3m -dump $^ > $@ - --manual.html: $(srcdir)/html.xsl manual.xml -- -xsltproc --nonet -o $@ $^ -+manual.html: $(srcdir)/html.xsl stamp-doc-xml -+ -xsltproc --nonet -o $@ $(srcdir)/html.xsl manual.xml - --manual-chunked stamp-doc-chunked: $(srcdir)/chunk.xsl manual.xml -- -xsltproc --nonet $^ -+stamp-doc-chunked: $(srcdir)/chunk.xsl stamp-doc-xml -+ -xsltproc --nonet $(srcdir)/chunk.xsl manual.xml - touch stamp-doc-chunked - --manual.pdf: stamp-doc-tex -+manual.pdf: manual.tex - -if test -f manual.tex; then pdfjadetex manual.tex; fi - --manual.tex stamp-doc-tex: manual.xml -+manual.tex: stamp-doc-xml - -if test -n "$(DSLROOT)"; then \ - openjade -t tex -D $(DSLROOT) -d print/docbook.dsl dtds/decls/xml.dcl manual.xml; \ - fi -- touch stamp-doc-tex - - clean: - rm -f *~ *.html *.orig *.rej stamp-doc-* *.ps mutt.1 muttrc.man -@@ -165,13 +166,12 @@ dist distdir: Makefile $(DISTFILES) - ../makedoc$(EXEEXT): $(top_srcdir)/makedoc.c - (cd .. && $(MAKE) makedoc$(EXEEXT)) - --update-doc: ../makedoc$(EXEEXT) stamp-doc-xml stamp-doc-man stamp-doc-chunked manual.txt manual.html -+update-doc: stamp-doc-xml stamp-doc-chunked manual.txt manual.html - --muttrc.man stamp-doc-man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail -+muttrc.man: ../makedoc$(EXEEXT) $(top_srcdir)/init.h muttrc.man.head muttrc.man.tail - $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -m | \ - cat $(srcdir)/muttrc.man.head - $(srcdir)/muttrc.man.tail\ - > muttrc.man -- touch stamp-doc-man - - EDIT = sed -e 's,@sysconfdir\@,$(sysconfdir),g' \ - -e 's,@bindir\@,$(bindir),g' \ -@@ -180,7 +180,9 @@ EDIT = sed -e 's,@sysconfdir\@,$(sysconf - mutt.1: $(srcdir)/mutt.man - $(EDIT) $(srcdir)/mutt.man > $@ - --manual.xml stamp-doc-xml: ../makedoc$(EXEEXT) $(top_srcdir)/init.h manual.xml.head manual.xml.tail $(top_srcdir)/VERSION -+stamp-doc-xml: $(top_srcdir)/makedoc.c $(top_srcdir)/init.h manual.xml.head manual.xml.tail \ -+ $(top_srcdir)/VERSION -+ $(MAKE) ../makedoc$(EXEEXT) - ( sed -e "s/@VERSION\@/`cat $(top_srcdir)/VERSION`/" $(srcdir)/manual.xml.head ;\ - $(MAKEDOC_CPP) $(top_srcdir)/init.h | ../makedoc -s ) | \ - cat - $(srcdir)/manual.xml.tail > manual.xml -Index: mutt/doc/dotlock.man -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/dotlock.man,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/doc/dotlock.man 29 Sep 2003 15:05:52 -0000 3.1 -+++ mutt/doc/dotlock.man 17 Sep 2005 20:46:11 -0000 3.3 -@@ -16,7 +16,7 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - .\" - .TH dotlock 1 "AUGUST 1999" Unix "User Manuals" - .SH NAME -Index: mutt/doc/manual.xml.head -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/manual.xml.head,v -retrieving revision 3.8 -retrieving revision 3.11 -diff -u -p -u -a -r3.8 -r3.11 ---- mutt/doc/manual.xml.head 6 Sep 2005 16:46:44 -0000 3.8 -+++ mutt/doc/manual.xml.head 19 Sep 2005 05:12:29 -0000 3.11 -@@ -149,7 +149,7 @@ url="news:comp.mail.mutt" - Copyright - - --Mutt is Copyright (C) 1996-2000 Michael R. Elkins -+Mutt is Copyright (C) 1996-2005 Michael R. Elkins - <me@cs.hmc.edu> and others - - -@@ -170,7 +170,7 @@ GNU General Public License for more deta - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software --Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - - - -@@ -4039,11 +4039,6 @@ correspondents. This allows to clean you - annoyances which make it hard to follow a discussion. - - -- --If you want to use these functions with IMAP, you need to compile Mutt --with the --enable-imap-edit-threads configure flag. -- -- - - Linking threads - -Index: mutt/doc/manual.xml.tail -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/manual.xml.tail,v -retrieving revision 3.2 -retrieving revision 3.3 -diff -u -p -u -a -r3.2 -r3.3 ---- mutt/doc/manual.xml.tail 4 Sep 2005 06:57:04 -0000 3.2 -+++ mutt/doc/manual.xml.tail 20 Sep 2005 03:56:25 -0000 3.3 -@@ -523,7 +523,7 @@ The following people have been very help - - Allain Thivillon <Allain.Thivillon@alma.fr>, - --Gero Treuner <gero@faveve.uni-stuttgart.de>, -+Gero Treuner <gero@70t.de>, - - Vsevolod Volkov <vvv@lucky.net>, - -Index: mutt/doc/mutt.man -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/mutt.man,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/doc/mutt.man 16 Aug 2005 18:10:11 -0000 3.8 -+++ mutt/doc/mutt.man 17 Sep 2005 20:46:11 -0000 3.10 -@@ -15,7 +15,7 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - .\" - .TH mutt 1 "January 2002" Unix "User Manuals" - .SH NAME -Index: mutt/doc/muttbug.man -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/muttbug.man,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/doc/muttbug.man 9 Jan 2005 15:35:51 -0000 3.2 -+++ mutt/doc/muttbug.man 17 Sep 2005 20:46:11 -0000 3.4 -@@ -15,7 +15,7 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - .\" - .TH flea 1 "January 2005" Unix "User Manuals" - .SH NAME -Index: mutt/doc/muttrc.man.head -=================================================================== -RCS file: /home/roessler/cvs/mutt/doc/muttrc.man.head,v -retrieving revision 3.16 -retrieving revision 3.18 -diff -u -p -u -a -r3.16 -r3.18 ---- mutt/doc/muttrc.man.head 2 Sep 2005 18:02:27 -0000 3.16 -+++ mutt/doc/muttrc.man.head 17 Sep 2005 20:46:11 -0000 3.18 -@@ -16,7 +16,7 @@ - .\" - .\" You should have received a copy of the GNU General Public License - .\" along with this program; if not, write to the Free Software --.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+.\" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - .\" - .TH muttrc 5 "September 2002" Unix "User Manuals" - .SH NAME -Index: mutt/imap/auth.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/imap/auth.c 3 Feb 2005 17:01:44 -0000 3.3 -+++ mutt/imap/auth.c 17 Sep 2005 20:46:11 -0000 3.5 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* IMAP login/authentication code */ -Index: mutt/imap/auth.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/imap/auth.h 24 Jan 2002 13:35:57 -0000 3.0 -+++ mutt/imap/auth.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* common defs for authenticators. A good place to set up a generic callback -Index: mutt/imap/auth_anon.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth_anon.c,v -retrieving revision 3.2 -retrieving revision 3.4 -diff -u -p -u -a -r3.2 -r3.4 ---- mutt/imap/auth_anon.c 3 Feb 2005 17:01:44 -0000 3.2 -+++ mutt/imap/auth_anon.c 17 Sep 2005 20:46:11 -0000 3.4 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* IMAP login/authentication code */ -Index: mutt/imap/auth_cram.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth_cram.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/imap/auth_cram.c 28 Jul 2005 19:47:40 -0000 3.4 -+++ mutt/imap/auth_cram.c 17 Sep 2005 20:46:11 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* IMAP login/authentication code */ -Index: mutt/imap/auth_gss.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth_gss.c,v -retrieving revision 3.4 -retrieving revision 3.6 -diff -u -p -u -a -r3.4 -r3.6 ---- mutt/imap/auth_gss.c 3 Feb 2005 17:01:44 -0000 3.4 -+++ mutt/imap/auth_gss.c 17 Sep 2005 20:46:11 -0000 3.6 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* GSS login/authentication code */ -Index: mutt/imap/auth_login.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth_login.c,v -retrieving revision 3.3 -retrieving revision 3.5 -diff -u -p -u -a -r3.3 -r3.5 ---- mutt/imap/auth_login.c 28 Jul 2005 19:47:40 -0000 3.3 -+++ mutt/imap/auth_login.c 17 Sep 2005 20:46:11 -0000 3.5 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* plain LOGIN support */ -Index: mutt/imap/auth_sasl.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/auth_sasl.c,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/imap/auth_sasl.c 1 Sep 2005 17:07:14 -0000 3.9 -+++ mutt/imap/auth_sasl.c 17 Sep 2005 20:46:11 -0000 3.11 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* SASL login/authentication code */ -Index: mutt/imap/browse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/browse.c,v -retrieving revision 3.8 -retrieving revision 3.10 -diff -u -p -u -a -r3.8 -r3.10 ---- mutt/imap/browse.c 7 Aug 2005 23:52:08 -0000 3.8 -+++ mutt/imap/browse.c 17 Sep 2005 20:46:11 -0000 3.10 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* Mutt browser support routines */ -Index: mutt/imap/command.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/command.c,v -retrieving revision 3.16 -retrieving revision 3.18 -diff -u -p -u -a -r3.16 -r3.18 ---- mutt/imap/command.c 6 Sep 2005 03:16:11 -0000 3.16 -+++ mutt/imap/command.c 17 Sep 2005 20:46:11 -0000 3.18 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* command.c: routines for sending commands to an IMAP server and parsing -Index: mutt/imap/imap.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap.c,v -retrieving revision 3.40 -retrieving revision 3.44 -diff -u -p -u -a -r3.40 -r3.44 ---- mutt/imap/imap.c 10 Sep 2005 06:02:04 -0000 3.40 -+++ mutt/imap/imap.c 22 Sep 2005 03:09:49 -0000 3.44 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* Support for IMAP4rev1, with the occasional nod to IMAP 4. */ -@@ -1334,8 +1334,6 @@ static int do_search (const pattern_t* s - * match types, and does a better job (eg server doesn't support regexps). */ - static int imap_compile_search (const pattern_t* pat, BUFFER* buf) - { -- char term[STRING]; -- - if (! do_search (pat, 0)) - return 0; - -@@ -1375,6 +1373,7 @@ static int imap_compile_search (const pa - } - else - { -+ char term[STRING]; - char *delim; - - switch (pat->op) -@@ -1613,7 +1612,7 @@ imap_complete_hosts (char *dest, size_t - } - } - -- for (conn = mutt_socket_head (); conn->next; conn = conn->next) -+ for (conn = mutt_socket_head (); conn && conn->next; conn = conn->next) - { - ciss_url_t url; - char urlstr[LONG_STRING]; -Index: mutt/imap/imap.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap.h,v -retrieving revision 3.5 -retrieving revision 3.7 -diff -u -p -u -a -r3.5 -r3.7 ---- mutt/imap/imap.h 6 Sep 2005 03:16:11 -0000 3.5 -+++ mutt/imap/imap.h 17 Sep 2005 20:46:11 -0000 3.7 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _IMAP_H -Index: mutt/imap/imap_private.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/imap_private.h,v -retrieving revision 3.9 -retrieving revision 3.11 -diff -u -p -u -a -r3.9 -r3.11 ---- mutt/imap/imap_private.h 7 Sep 2005 07:44:05 -0000 3.9 -+++ mutt/imap/imap_private.h 17 Sep 2005 20:46:11 -0000 3.11 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #ifndef _IMAP_PRIVATE_H -Index: mutt/imap/message.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/message.c,v -retrieving revision 3.27 -retrieving revision 3.29 -diff -u -p -u -a -r3.27 -r3.29 ---- mutt/imap/message.c 7 Sep 2005 07:44:05 -0000 3.27 -+++ mutt/imap/message.c 17 Sep 2005 20:46:11 -0000 3.29 -@@ -14,9 +14,9 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * -- * $Id: message.c,v 3.27 2005/09/07 07:44:05 brendan Exp $ -+ * $Id: message.c,v 3.29 2005/09/17 20:46:11 brendan Exp $ - */ - - /* message parsing/updating functions */ -Index: mutt/imap/message.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/message.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/imap/message.h 24 Jan 2002 13:35:57 -0000 3.0 -+++ mutt/imap/message.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -14,7 +14,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* message.c data structures */ -Index: mutt/imap/utf7.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/utf7.c,v -retrieving revision 3.7 -retrieving revision 3.9 -diff -u -p -u -a -r3.7 -r3.9 ---- mutt/imap/utf7.c 6 Sep 2005 01:46:46 -0000 3.7 -+++ mutt/imap/utf7.c 17 Sep 2005 20:46:11 -0000 3.9 -@@ -13,7 +13,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - #if HAVE_CONFIG_H -Index: mutt/imap/util.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/imap/util.c,v -retrieving revision 3.12 -retrieving revision 3.15 -diff -u -p -u -a -r3.12 -r3.15 ---- mutt/imap/util.c 6 Aug 2005 21:19:39 -0000 3.12 -+++ mutt/imap/util.c 22 Sep 2005 03:09:50 -0000 3.15 -@@ -15,7 +15,7 @@ - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - - /* general IMAP utility functions */ -@@ -107,7 +107,7 @@ int imap_parse_path (const char* path, I - url_parse_ciss (&url, c); - if (url.scheme == U_IMAP || url.scheme == U_IMAPS) - { -- if (mutt_account_fromurl (&mx->account, &url) < 0) -+ if (mutt_account_fromurl (&mx->account, &url) < 0 || !*mx->account.host) - { - FREE (&c); - return -1; -@@ -165,7 +165,7 @@ int imap_parse_path (const char* path, I - } - } - } -- -+ - if ((mx->account.flags & M_ACCT_SSL) && !(mx->account.flags & M_ACCT_PORT)) - mx->account.port = ImapsPort; - -Index: mutt/intl/Makefile.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/Makefile.in,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/Makefile.in 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/Makefile.in 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - # - # You should have received a copy of the GNU Library General Public - # License along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - # USA. - - PACKAGE = @PACKAGE@ -Index: mutt/intl/bindtextdom.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/bindtextdom.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/bindtextdom.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/bindtextdom.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/config.charset -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/config.charset,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/config.charset 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/config.charset 17 Sep 2005 20:46:11 -0000 3.2 -@@ -15,7 +15,7 @@ - # - # You should have received a copy of the GNU Library General Public - # License along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - # USA. - # - # The table consists of lines of the form -Index: mutt/intl/dcgettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/dcgettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/dcgettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/dcgettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/dcigettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/dcigettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/dcigettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/dcigettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* Tell glibc's to provide a prototype for mempcpy(). -Index: mutt/intl/dcngettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/dcngettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/dcngettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/dcngettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/dgettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/dgettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/dgettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/dgettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/dngettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/dngettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/dngettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/dngettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/explodename.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/explodename.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/explodename.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/explodename.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/finddomain.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/finddomain.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/finddomain.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/finddomain.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -14,7 +14,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/gettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/gettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/gettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/gettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/gettext.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/gettext.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/gettext.h 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/gettext.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifndef _GETTEXT_H -Index: mutt/intl/gettextP.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/gettextP.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/gettextP.h 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/gettextP.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -14,7 +14,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifndef _GETTEXTP_H -Index: mutt/intl/hash-string.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/hash-string.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/hash-string.h 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/hash-string.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* @@ end of prolog @@ */ -Index: mutt/intl/intl-compat.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/intl-compat.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/intl-compat.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/intl-compat.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -14,7 +14,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/l10nflist.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/l10nflist.c,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/intl/l10nflist.c 24 Jul 2003 18:40:50 -0000 3.1 -+++ mutt/intl/l10nflist.c 17 Sep 2005 20:46:11 -0000 3.3 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* Tell glibc's to provide a prototype for stpcpy(). -Index: mutt/intl/libgettext.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/libgettext.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/libgettext.h 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/libgettext.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifndef _LIBGETTEXT_H -Index: mutt/intl/libgnuintl.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/libgnuintl.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/libgnuintl.h 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/libgnuintl.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifndef _LIBINTL_H -Index: mutt/intl/loadinfo.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/loadinfo.h,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/loadinfo.h 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/loadinfo.h 17 Sep 2005 20:46:11 -0000 3.2 -@@ -14,7 +14,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifndef _LOADINFO_H -Index: mutt/intl/loadmsgcat.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/loadmsgcat.c,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/intl/loadmsgcat.c 24 Jul 2003 18:40:50 -0000 3.1 -+++ mutt/intl/loadmsgcat.c 17 Sep 2005 20:46:11 -0000 3.3 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* Tell glibc's to provide a prototype for mempcpy(). -Index: mutt/intl/localcharset.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/localcharset.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/localcharset.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/localcharset.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -14,7 +14,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* Written by Bruno Haible . */ -Index: mutt/intl/locale.alias -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/locale.alias,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/locale.alias 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/locale.alias 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - # - # You should have received a copy of the GNU Library General Public - # License along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - # USA. - - # The format of this file is the same as for the corresponding file of -Index: mutt/intl/localealias.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/localealias.c,v -retrieving revision 3.1 -retrieving revision 3.3 -diff -u -p -u -a -r3.1 -r3.3 ---- mutt/intl/localealias.c 24 Jul 2003 18:40:50 -0000 3.1 -+++ mutt/intl/localealias.c 17 Sep 2005 20:46:11 -0000 3.3 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* Tell glibc's to provide a prototype for mempcpy(). -Index: mutt/intl/ngettext.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/ngettext.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/ngettext.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/ngettext.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/intl/plural.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/plural.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/plural.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/plural.c 17 Sep 2005 20:46:11 -0000 3.2 -@@ -35,7 +35,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* The bison generated parser uses alloca. AIX 3 forces us to put this -@@ -321,8 +321,8 @@ static const short yycheck[] = { 1, - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, -- Boston, MA 02111-1307, USA. */ -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ - - /* As a special exception, when this file is copied by Bison into a - Bison output file, you may use that output file without restriction. -Index: mutt/intl/plural.y -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/plural.y,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/plural.y 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/plural.y 17 Sep 2005 20:46:12 -0000 3.2 -@@ -15,7 +15,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - /* The bison generated parser uses alloca. AIX 3 forces us to put this -Index: mutt/intl/ref-add.sin -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/ref-add.sin,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/ref-add.sin 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/ref-add.sin 17 Sep 2005 20:46:12 -0000 3.2 -@@ -14,7 +14,7 @@ - # - # You should have received a copy of the GNU Library General Public - # License along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - # USA. - # - # Written by Bruno Haible . -Index: mutt/intl/ref-del.sin -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/ref-del.sin,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/ref-del.sin 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/ref-del.sin 17 Sep 2005 20:46:12 -0000 3.2 -@@ -14,7 +14,7 @@ - # - # You should have received a copy of the GNU Library General Public - # License along with this program; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - # USA. - # - # Written by Bruno Haible . -Index: mutt/intl/textdomain.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/intl/textdomain.c,v -retrieving revision 3.0 -retrieving revision 3.2 -diff -u -p -u -a -r3.0 -r3.2 ---- mutt/intl/textdomain.c 24 Jan 2002 13:35:16 -0000 3.0 -+++ mutt/intl/textdomain.c 17 Sep 2005 20:46:12 -0000 3.2 -@@ -13,7 +13,7 @@ - - You should have received a copy of the GNU Library General Public - License along with this program; if not, write to the Free Software -- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - USA. */ - - #ifdef HAVE_CONFIG_H -Index: mutt/po/Makefile.in.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/Makefile.in.in,v -retrieving revision 3.2 -retrieving revision 3.3 -diff -u -p -u -a -r3.2 -r3.3 ---- mutt/po/Makefile.in.in 2 Aug 2005 18:15:33 -0000 3.2 -+++ mutt/po/Makefile.in.in 16 Sep 2005 15:20:59 -0000 3.3 -@@ -158,11 +158,7 @@ maintainer-clean: distclean - rm -f $(GMOFILES) - - distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) --dist distdir: -- $(MAKE) update-po -- @$(MAKE) dist2 --# This is a separate target because 'update-po' must be executed before. --dist2: $(DISTFILES) -+dist distdir: $(DISTFILES) - dists="$(DISTFILES)"; \ - for file in $$dists; do \ - if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ -Index: mutt/po/bg.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/bg.po,v -retrieving revision 1.11 -retrieving revision 1.13 -diff -u -p -u -a -r1.11 -r1.13 ---- mutt/po/bg.po 15 Sep 2005 14:24:37 -0000 1.11 -+++ mutt/po/bg.po 17 Sep 2005 20:46:12 -0000 1.13 -@@ -3206,7 +3206,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Àâòîðñêî ïðàâî (C) 1996-2002 Michael R. Elkins \n" - "Àâòîðñêî ïðàâî (C) 1996-2002 Brandon Long \n" -@@ -3232,7 +3232,7 @@ msgstr "" - " Áè òðÿáâàëî äà ñòå ïîëó÷èëè êîïèå îò GNU General Public License\n" - " çàåäíî ñ òàçè ïðîãðàìà; àêî òîâà íå å òàêà, ìîëÿ ïèøåòå íà Free " - "Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/ca.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ca.po,v -retrieving revision 3.24 -retrieving revision 3.27 -diff -u -p -u -a -r3.24 -r3.27 ---- mutt/po/ca.po 15 Sep 2005 14:24:38 -0000 3.24 -+++ mutt/po/ca.po 17 Sep 2005 20:46:12 -0000 3.27 -@@ -10,10 +10,10 @@ - # IDN = Internationalized Domain Name - msgid "" - msgstr "" --"Project-Id-Version: mutt 1.5.8\n" -+"Project-Id-Version: mutt 1.5.11\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-02-13 10:57+0100\n" -+"PO-Revision-Date: 2005-09-16 12:50+0200\n" - "Last-Translator: Ivan Vilata i Balaguer \n" - "Language-Team: Catalan \n" - "MIME-Version: 1.0\n" -@@ -220,16 +220,15 @@ msgstr "No hi ha cap fitxer que concorde - - #: browser.c:861 - msgid "Create is only supported for IMAP mailboxes" --msgstr "Només es poden crear bústies IMAP." -+msgstr "Només es poden crear bústies sota IMAP." - - #: browser.c:881 --#, fuzzy - msgid "Rename is only supported for IMAP mailboxes" --msgstr "Només es poden crear bústies IMAP." -+msgstr "Només es poden reanomenar bústies sota IMAP." - - #: browser.c:902 - msgid "Delete is only supported for IMAP mailboxes" --msgstr "Només es poden esborrar bústies IMAP." -+msgstr "Només es poden esborrar bústies sota IMAP." - - #: browser.c:910 - #, c-format -@@ -290,7 +289,7 @@ msgstr "Hi ha correu nou en " - #: color.c:326 - #, c-format - msgid "%s: color not supported by term" --msgstr "%s: El terminal no suporta aquest color." -+msgstr "%s: El terminal no permet aquest color." - - #: color.c:332 - #, c-format -@@ -347,7 +346,7 @@ msgstr "Sobren arguments." - # ivb També apareix com a error aïllat. - #: color.c:725 - msgid "default colors not supported" --msgstr "Els colors per defecte no estan suportats." -+msgstr "No es permet l'ús de colors per defecte." - - #. find out whether or not the verify signature - #: commands.c:92 -@@ -762,128 +761,129 @@ msgid "PGP already selected. Clear & con - msgstr "El missatge ja usa PGP. Voleu posar-lo en clar i continuar? " - - #: crypt-gpgme.c:335 --#, fuzzy, c-format -+#, c-format - msgid "error creating gpgme context: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en crear el context GPGME: %s\n" - - #: crypt-gpgme.c:345 - #, c-format - msgid "error enabling CMS protocol: %s\n" --msgstr "" -+msgstr "Error en habilitar el protocol CMS: %s\n" - - #: crypt-gpgme.c:365 --#, fuzzy, c-format -+#, c-format - msgid "error creating gpgme data object: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en crear l'objecte de dades GPGME: %s\n" - - #: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327 --#, fuzzy, c-format -+#, c-format - msgid "error allocating data object: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en reservar l'objecte de dades: %s\n" - - #: crypt-gpgme.c:467 --#, fuzzy, c-format -+#, c-format - msgid "error rewinding data object: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en rebobinar l'objecte de dades: %s\n" - - #: crypt-gpgme.c:489 crypt-gpgme.c:536 --#, fuzzy, c-format -+#, c-format - msgid "error reading data object: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en llegir l'objecte de dades: %s\n" - - #: crypt-gpgme.c:597 --#, fuzzy, c-format -+#, c-format - msgid "error adding recipient `%s': %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en afegir el destinatari «%s»: %s\n" - - #: crypt-gpgme.c:635 - #, c-format - msgid "secret key `%s' not found: %s\n" --msgstr "" -+msgstr "No s'ha trobat la clau secreta «%s»: %s\n" - - #: crypt-gpgme.c:645 - #, c-format - msgid "ambiguous specification of secret key `%s'\n" --msgstr "" -+msgstr "L'especificació de la clau secreta «%s» és ambígua.\n" - - #: crypt-gpgme.c:657 - #, c-format - msgid "error setting secret key `%s': %s\n" --msgstr "" -+msgstr "Error en establir la clau secreta «%s»: %s\n" - - #: crypt-gpgme.c:701 --#, fuzzy, c-format -+#, c-format - msgid "error encrypting data: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en xifrar les dades: %s\n" - - #: crypt-gpgme.c:798 --#, fuzzy, c-format -+#, c-format - msgid "error signing data: %s\n" --msgstr "Error en el patró en: %s" -+msgstr "Error en signar les dades: %s\n" - - #: crypt-gpgme.c:993 --#, fuzzy - msgid "Warning: One of the keys has been revoked\n" --msgstr "Avís: Part d'aquest missatge no ha estat signat." -+msgstr "Avís: Una de les claus ha estat revocada.\n" - -+# I darrere va la data sense punt. ivb - #: crypt-gpgme.c:1002 - msgid "Warning: The key used to create the signature expired at: " --msgstr "" -+msgstr "Avís: La clau usada per a crear la signatura expirà en: " - - #: crypt-gpgme.c:1008 --#, fuzzy - msgid "Warning: At least one certification key has expired\n" --msgstr "El certificat del servidor ha expirat." -+msgstr "Avís: Almenys una de les claus de certificació ha expirat.\n" - -+# I darrere va la data sense punt. ivb - #: crypt-gpgme.c:1024 - msgid "Warning: The signature expired at: " --msgstr "" -+msgstr "Avís: La signatura expirà en: " - - #: crypt-gpgme.c:1030 - msgid "Can't verify due to a missing key or certificate\n" --msgstr "" -+msgstr "No s'ha pogut verificar perquè manca una clau o certificat.\n" - - #: crypt-gpgme.c:1035 --#, fuzzy - msgid "The CRL is not available\n" --msgstr "SSL no es troba disponible." -+msgstr "La CRL (llista de certificats revocats) no es troba disponible.\n" - - #: crypt-gpgme.c:1041 - msgid "Available CRL is too old\n" --msgstr "" -+msgstr "La CRL (llista de certificats revocats) és massa vella.\n" - - #: crypt-gpgme.c:1046 - msgid "A policy requirement was not met\n" --msgstr "" -+msgstr "No s'ha acomplert un requeriment establert per política.\n" - - #: crypt-gpgme.c:1055 - msgid "A system error occurred" --msgstr "" -+msgstr "Ha ocorregut un error de sistema." - -+# XXX No puc unificar les traduccions pq una porta replé i l'altra no! ivb - #: crypt-gpgme.c:1092 crypt-gpgme.c:3036 --#, fuzzy - msgid "Fingerprint: " --msgstr "Empremta digital: %s" -+msgstr "Empremta digital: " - - #: crypt-gpgme.c:1152 - msgid "" - "WARNING: We have NO indication whether the key belongs to the person named " - "as shown above\n" - msgstr "" -+"Avís: RES indica que la clau pertanya a la persona esmentada a sobre.\n" - - #: crypt-gpgme.c:1159 - msgid "WARNING: The key does NOT BELONG to the person named as shown above\n" --msgstr "" -+msgstr "Avís: La clau NO PERTANY a la persona esmentada a sobre.\n" - - #: crypt-gpgme.c:1163 - msgid "" - "WARNING: It is NOT certain that the key belongs to the person named as shown " - "above\n" - msgstr "" -+"Avís: NO és segur que la clau pertanya a la persona esmentada a sobre.\n" - - #: crypt-gpgme.c:1238 - msgid "Error getting key information: " --msgstr "" -+msgstr "Error en obtenir la informació de la clau: " - - #. 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, -@@ -891,102 +891,104 @@ msgstr "" - #. ultimate). - #: crypt-gpgme.c:1245 crypt-gpgme.c:1278 - msgid "Good signature from: " --msgstr "" -+msgstr "Signatura correcta de: " - - #: crypt-gpgme.c:1255 - msgid " aka: " --msgstr "" -+msgstr " també conegut com a: " - - #: crypt-gpgme.c:1259 crypt-gpgme.c:1281 - msgid " created: " --msgstr "" -+msgstr " creada en: " - - #: crypt-gpgme.c:1268 - msgid "*BAD* signature claimed to be from: " --msgstr "" -+msgstr "Signatura *INCORRECTA* de qui diu ser: " - - #: crypt-gpgme.c:1291 --#, fuzzy - msgid "Error checking signature" --msgstr "Error en enviar el missatge." -+msgstr "Error en comprovar la signatura." - - #. 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 "" -+msgstr "[-- Inici de la informació de la signatura. --]\n" - - #: crypt-gpgme.c:1344 --#, fuzzy, c-format -+#, c-format - msgid "Error: verification failed: %s\n" --msgstr "Error en la línia d'ordres: %s\n" -+msgstr "Error: La verificació ha fallat: %s\n" - - #: crypt-gpgme.c:1386 - #, c-format - msgid "*** Begin Notation (signature by: %s) ***\n" --msgstr "" -+msgstr "*** Inici de la notació (signatura de: %s). ***\n" - - #: crypt-gpgme.c:1405 - msgid "*** End Notation ***\n" --msgstr "" -+msgstr "*** Final de la notació. ***\n" - - #: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046 --#, fuzzy - msgid "" - "[-- End signature information --]\n" - "\n" - msgstr "" -+"[-- Final de la informació de la signatura. --]\n" - "\n" --"[-- Final de les dades signades. --]\n" - - #: crypt-gpgme.c:1507 --#, fuzzy, c-format -+#, c-format - msgid "" - "[-- Error: decryption failed: %s --]\n" - "\n" --msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n" -+msgstr "" -+"[-- Error: El desxifratge ha fallat: %s --]\n" -+"\n" - - #: crypt-gpgme.c:2006 - #, c-format - msgid "Error: decryption/verification failed: %s\n" --msgstr "" -+msgstr "Error: El desxifratge o verificació ha fallat: %s\n" - - #: crypt-gpgme.c:2054 - msgid "Error: copy data failed\n" --msgstr "" -+msgstr "Error: La còpia de les dades ha fallat.\n" - -+# Aquests texts en majúscules reprodueixen els marcadors dels fitxers PGP, -+# així que no té molt de sentit mantenir les majúscules en la traducció. ivb - #: crypt-gpgme.c:2074 pgp.c:410 - msgid "" - "[-- BEGIN PGP MESSAGE --]\n" - "\n" - msgstr "" --"[-- COMENÇA EL MISSATGE PGP --]\n" -+"[-- Inici del missatge PGP. --]\n" - "\n" - - #: crypt-gpgme.c:2076 pgp.c:412 - msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" --msgstr "[-- COMENÇA EL BLOC DE CLAU PÚBLICA PGP --]\n" -+msgstr "[-- Inici del bloc de clau pública PGP. --]\n" - - #: crypt-gpgme.c:2079 pgp.c:414 - msgid "" - "[-- BEGIN PGP SIGNED MESSAGE --]\n" - "\n" - msgstr "" --"[-- COMENÇA EL MISSATGE PGP SIGNAT --]\n" -+"[-- Inici del missatge PGP signat. --]\n" - "\n" - - #: crypt-gpgme.c:2106 pgp.c:440 - msgid "[-- END PGP MESSAGE --]\n" --msgstr "[-- TERMINA EL MISSATGE PGP --]\n" -+msgstr "[-- Final del missatge PGP. --]\n" - - #: crypt-gpgme.c:2108 pgp.c:444 - msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" --msgstr "[-- TERMINA EL BLOC DE CLAU PÚBLICA PGP --]\n" -+msgstr "[-- Final del bloc de clau pública PGP. --]\n" - - #: crypt-gpgme.c:2110 pgp.c:446 - msgid "[-- END PGP SIGNED MESSAGE --]\n" --msgstr "[-- TERMINA EL MISSATGE PGP SIGNAT --]\n" -+msgstr "[-- Final del missatge PGP signat. --]\n" - - #: crypt-gpgme.c:2131 pgp.c:476 - msgid "" -@@ -1009,12 +1011,11 @@ msgid "[-- Error: could not create tempo - msgstr "[-- Error: No s'ha pogut crear un fitxer temporal! --]\n" - - #: crypt-gpgme.c:2186 --#, fuzzy - msgid "" - "[-- The following data is PGP/MIME signed and encrypted --]\n" - "\n" - msgstr "" --"[-- Les dades següents es troben xifrades amb PGP/MIME: --]\n" -+"[-- Les dades següents es troben signades i xifrades amb PGP/MIME: --]\n" - "\n" - - #: crypt-gpgme.c:2187 pgp.c:927 -@@ -1026,153 +1027,165 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2209 --#, fuzzy - msgid "[-- End of PGP/MIME signed and encrypted data --]\n" --msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n" -+msgstr "[-- Final de les dades signades i xifrades amb PGP/MIME. --]\n" - - #: crypt-gpgme.c:2210 pgp.c:947 - msgid "[-- End of PGP/MIME encrypted data --]\n" - msgstr "[-- Final de les dades xifrades amb PGP/MIME. --]\n" - - #: crypt-gpgme.c:2252 --#, fuzzy - msgid "" - "[-- The following data is S/MIME signed --]\n" - "\n" --msgstr "[-- Les dades següents es troben signades amb S/MIME: --]\n" -+msgstr "" -+"[-- Les dades següents es troben signades amb S/MIME: --]\n" -+"\n" - - #: crypt-gpgme.c:2253 --#, fuzzy - msgid "" - "[-- The following data is S/MIME encrypted --]\n" - "\n" --msgstr "[-- Les dades següents es troben xifrades amb S/MIME: --]\n" -+msgstr "" -+"[-- Les dades següents es troben xifrades amb S/MIME: --]\n" -+"\n" - - #: crypt-gpgme.c:2283 --#, fuzzy - msgid "[-- End of S/MIME signed data --]\n" --msgstr "" --"\n" --"[-- Final de les dades signades amb S/MIME. --]\n" -+msgstr "[-- Final de les dades signades amb S/MIME. --]\n" - - #: crypt-gpgme.c:2284 --#, fuzzy - msgid "[-- End of S/MIME encrypted data --]\n" --msgstr "" --"\n" --"[-- Final de les dades xifrades amb S/MIME. --]\n" -+msgstr "[-- Final de les dades xifrades amb S/MIME. --]\n" - -+# Cal mantenir-lo curt (porta al davant «Nom ..................: »). ivb - #: crypt-gpgme.c:2876 - msgid "[Can't display this user ID (unknown encoding)]" --msgstr "" -+msgstr "[No es mostra l'ID d'usuari (codificació desconeguda).]" - -+# Cal mantenir-lo curt (porta al davant «Nom ..................: »). ivb - #: crypt-gpgme.c:2878 - msgid "[Can't display this user ID (invalid encoding)]" --msgstr "" -+msgstr "[No es mostra l'ID d'usuari (codificació no vàlida).]" - -+# Cal mantenir-lo curt (porta al davant «Nom ..................: »). ivb - #: crypt-gpgme.c:2883 - msgid "[Can't display this user ID (invalid DN)]" --msgstr "" -+msgstr "[No es mostra l'ID d'usuari (DN desconegut).]" - -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:2962 - msgid " aka ......: " --msgstr "" -+msgstr " també conegut com a : " - -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:2962 - msgid "Name ......: " --msgstr "" -+msgstr "Nom ..................: " - -+# Es refereix a un identificador d'usuari. ivb -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:2965 crypt-gpgme.c:3104 --#, fuzzy - msgid "[Invalid]" --msgstr "No vàlid " -+msgstr "[No és vàlid]" - -+# Es refereix a una clau. ivb -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:2985 crypt-gpgme.c:3128 --#, fuzzy, c-format -+#, c-format - msgid "Valid From : %s\n" --msgstr "El mes no és vàlid: %s" -+msgstr "Vàlida des de ........: %s\n" - -+# Es refereix a una clau. ivb -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:2998 crypt-gpgme.c:3141 --#, fuzzy, c-format -+#, c-format - msgid "Valid To ..: %s\n" --msgstr "El mes no és vàlid: %s" -+msgstr "Vàlida fins a ........: %s\n" - -+# Alineat amb « també conegut com a : ». ivb -+# Tipus de certificat, bits de l'algorisme, tipus d'algorisme. ivb - #: crypt-gpgme.c:3011 crypt-gpgme.c:3154 - #, c-format - msgid "Key Type ..: %s, %lu bit %s\n" --msgstr "" -+msgstr "Tipus de clau ........: %1$s, %3$s de %2$lu bits\n" - -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:3013 crypt-gpgme.c:3156 - #, c-format - msgid "Key Usage .: " --msgstr "" -+msgstr "Utilitat de la clau ..: " - -+# Capacitats d'una clau. ivb - #: crypt-gpgme.c:3018 crypt-gpgme.c:3161 --#, fuzzy - msgid "encryption" --msgstr "Xifra" -+msgstr "xifratge" - - #: 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 "" -+msgstr ", " - -+# Capacitats d'una clau. ivb - #: crypt-gpgme.c:3023 crypt-gpgme.c:3166 - msgid "signing" --msgstr "" -+msgstr "signatura" - -+# Capacitats d'una clau. ivb - #: crypt-gpgme.c:3028 crypt-gpgme.c:3171 --#, fuzzy - msgid "certification" --msgstr "S'ha desat el certificat." -+msgstr "certificació" - -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:3068 - #, c-format - msgid "Serial-No .: 0x%s\n" --msgstr "" -+msgstr "Número de sèrie ......: 0x%s\n" - -+# Alineat amb « també conegut com a : ». ivb - #: crypt-gpgme.c:3076 - #, c-format - msgid "Issued By .: " --msgstr "" -+msgstr "Lliurada per .........: " - -+# Alineat amb « també conegut com a : ». ivb - #. display only the short keyID - #: crypt-gpgme.c:3095 --#, fuzzy, c-format -+#, c-format - msgid "Subkey ....: 0x%s" --msgstr "ID de la clau: 0x%s" -+msgstr "Subclau ..............: 0x%s" - -+# Subclau. ivb - #: crypt-gpgme.c:3099 --#, fuzzy - msgid "[Revoked]" --msgstr "Revocat " -+msgstr "[Revocada]" - -+# Subclau. ivb - #: crypt-gpgme.c:3109 --#, fuzzy - msgid "[Expired]" --msgstr "Expirat " -+msgstr "Expirada" - -+# Subclau. ivb - #: crypt-gpgme.c:3114 - msgid "[Disabled]" --msgstr "" -+msgstr "[Inhabilitada]" - - #: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739 - msgid "Can't create temporary file" - msgstr "No s'ha pogut crear un fitxer temporal." - - #: crypt-gpgme.c:3201 --#, fuzzy - msgid "Collecting data..." --msgstr "S'està connectant amb «%s»..." -+msgstr "S'estan recollint les dades..." - - #: crypt-gpgme.c:3227 --#, fuzzy, c-format -+#, c-format - msgid "Error finding issuer key: %s\n" --msgstr "Error en connectar amb el servidor: %s" -+msgstr "Error en trobar la clau del lliurador: %s\n" - - #: crypt-gpgme.c:3237 - msgid "Error: certification chain to long - stopping here\n" --msgstr "" -+msgstr "Error: La cadena de certificació és massa llarga, es para ací.\n" - - #: crypt-gpgme.c:3248 pgpkey.c:580 - #, c-format -@@ -1180,25 +1193,24 @@ msgid "Key ID: 0x%s" - msgstr "ID de la clau: 0x%s" - - #: crypt-gpgme.c:3331 --#, fuzzy, c-format -+#, c-format - msgid "gpgme_new failed: %s" --msgstr "La negociació d'SSL ha fallat: %s." -+msgstr "Ha fallat gpgme_new(): %s" - - #: crypt-gpgme.c:3370 crypt-gpgme.c:3433 - #, c-format - msgid "gpgme_op_keylist_start failed: %s" --msgstr "" -+msgstr "Ha fallat gpgme_op_keylist_start(): %s" - - #: crypt-gpgme.c:3420 crypt-gpgme.c:3461 - #, c-format - msgid "gpgme_op_keylist_next failed: %s" --msgstr "" -+msgstr "Ha fallat gpgme_op_keylist_next(): %s" - - #: crypt-gpgme.c:3532 --#, fuzzy - msgid "All matching keys are marked expired/revoked." - msgstr "" --"Totes les claus concordants han expirat o estan revocades o inhabilitades." -+"Totes les claus concordants estan marcades com a expirades o revocades." - - #: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514 - #: smime.c:431 -@@ -1215,35 +1227,37 @@ msgstr "Selecciona " - msgid "Check key " - msgstr "Comprova clau " - -+# Darrere va el patró corresponent. ivb - #: crypt-gpgme.c:3583 --#, fuzzy - msgid "PGP and S/MIME keys matching" --msgstr "Claus PGP que concordem amb «%s»." -+msgstr "Claus PGP i S/MIME que concordem amb" - -+# Darrere va el patró corresponent. ivb - #: crypt-gpgme.c:3585 --#, fuzzy - msgid "PGP keys matching" --msgstr "Claus PGP que concordem amb «%s»." -+msgstr "Claus PGP que concordem amb" - -+# Darrere va el patró corresponent. ivb - #: crypt-gpgme.c:3587 --#, fuzzy - msgid "S/MIME keys matching" --msgstr "Certificats S/MIME que concorden amb «%s»." -+msgstr "Claus S/MIME que concorden amb" - -+# Darrere va el patró corresponent. ivb - #: crypt-gpgme.c:3589 --#, fuzzy - msgid "keys matching" --msgstr "Claus PGP que concordem amb «%s»." -+msgstr "Claus que concordem amb" - -+# Nom i adreça? ivb - #: crypt-gpgme.c:3592 - #, c-format - msgid "%s <%s>." --msgstr "" -+msgstr "%s <%s>." - -+# Nom i àlies? ivb - #: crypt-gpgme.c:3594 - #, c-format - msgid "%s \"%s\"." --msgstr "" -+msgstr "%s «%s»." - - #: crypt-gpgme.c:3621 pgpkey.c:600 - msgid "This key can't be used: expired/disabled/revoked." -@@ -1300,37 +1314,34 @@ msgstr "Voleu usar l'ID de clau «%s» p - msgid "Enter keyID for %s: " - msgstr "Entreu l'ID de clau per %s: " - -+# És un missatge d'error. ivb - #: crypt-gpgme.c:4103 - msgid "" - "\n" - "Using GPGME backend, although no gpg-agent is running" - msgstr "" -+"\n" -+"S'està usant el motor GPGME, però «gpg-agent» no està corrent." - - #: crypt-gpgme.c:4131 --#, fuzzy - msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?" --msgstr "S/MIME: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? " -+msgstr "" -+"S/MIME: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, (p)gp, o en (c)lar? " - --# ivb (2003/03/26) --# ivb (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar --# La «f» i la «c» originals s'agafen en el mateix cas en el codi. ivb -+# (x)ifra, (s)igna, si(g)na com a, (a)mbdós, (p)gp, o en (c)lar - #: crypt-gpgme.c:4132 --#, fuzzy - msgid "esabpfc" --msgstr "xsfgac" -+msgstr "xsgapc" - - #: crypt-gpgme.c:4135 --#, fuzzy - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?" --msgstr "PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, %s, o en (c)lar? " -+msgstr "" -+"PGP: (x)ifra, (s)igna, si(g)na com a, (a)mbdós, s/(m)ime, o en (c)lar? " - --# ivb (2003/03/26) --# ivb (x)ifra, (s)igna, xi(f)ra amb, si(g)na com a, (a)mbdós, o en (c)lar --# La «f» i la «c» originals s'agafen en el mateix cas en el codi. ivb -+# (x)ifra, (s)igna, si(g)na com a, (a)mbdós, s/(m)ime, o en (c)lar - #: crypt-gpgme.c:4136 --#, fuzzy - msgid "esabmfc" --msgstr "xsfgac" -+msgstr "xsgamc" - - #. sign (a)s - #. unset_option(OPTCRYPTCHECKTRUST); -@@ -1341,23 +1352,22 @@ msgstr "Signa com a: " - - #: crypt-gpgme.c:4249 - msgid "Failed to verify sender" --msgstr "" -+msgstr "No s'ha pogut verificar el remitent." - - #: crypt-gpgme.c:4252 --#, fuzzy - msgid "Failed to figure out sender" --msgstr "No s'ha pogut obrir el fitxer per interpretar-ne les capçaleres." -+msgstr "No s'ha pogut endevinar el remitent." - - #: crypt.c:69 - #, c-format - msgid " (current time: %c)" - msgstr " (data actual: %c)" - --# La primera: «OpenSSL» o «PGP» (meec, apòstrof); la segona l'enterior. ivb -+# La primera: «OpenSSL» o «PGP» (meec, apòstrof); la segona l'anterior. ivb - #: crypt.c:75 - #, c-format - msgid "[-- %s output follows%s --]\n" --msgstr "[-- Aquesta és l'eixida de %s%s --]\n" -+msgstr "[-- Aquesta és l'eixida de %s%s. --]\n" - - #: crypt.c:90 - msgid "Passphrase(s) forgotten." -@@ -1384,7 +1394,7 @@ msgstr "No s'ha enviat el missatge." - - #: crypt.c:397 - msgid "S/MIME messages with no hints on content are unsupported." --msgstr "No es suporten els misatges S/MIME sense pistes sobre el contingut." -+msgstr "No es permeten els misatges S/MIME sense pistes sobre el contingut." - - #: crypt.c:616 crypt.c:660 - msgid "Trying to extract PGP keys...\n" -@@ -1408,8 +1418,7 @@ msgid "" - "[-- Error: Unknown multipart/signed protocol %s! --]\n" - "\n" - msgstr "" --"[-- Error: El protocol «%s» de «multipart/signed» --]\n" --"[-- no és conegut! --]\n" -+"[-- Error: El protocol «%s» de «multipart/signed» no és conegut! --]\n" - "\n" - - #: crypt.c:862 -@@ -1449,9 +1458,9 @@ msgstr "" - #: cryptglue.c:89 - msgid "\"crypt_use_gpgme\" set but not build with GPGME support." - msgstr "" -+"S'ha activat «crypt_use_gpgme», però Mutt no s'ha compiŀlat per a usar GPGME." - - #: cryptglue.c:112 --#, fuzzy - msgid "Invoking S/MIME..." - msgstr "S'està invocant S/MIME..." - -@@ -1634,24 +1643,23 @@ msgstr "No s'ha habilitat l'ús de fils. - - #: curs_main.c:1210 - msgid "Thread broken" --msgstr "" -+msgstr "S'ha trencat el fil." - - #: curs_main.c:1232 - msgid "No Message-ID: header available to link thread" --msgstr "" -+msgstr "No hi ha capçalera «Message-ID:» amb què enllaçar el fil." - - #: curs_main.c:1234 --#, fuzzy - msgid "First, please tag a message to be linked here" --msgstr "desa aquest missatge per enviar-lo més endavant" -+msgstr "Per favor, marqueu un missatge per a enllaçar-lo ací." - - #: curs_main.c:1246 - msgid "Threads linked" --msgstr "" -+msgstr "S'han enllaçat els fils." - - #: curs_main.c:1249 - msgid "No thread linked" --msgstr "" -+msgstr "No s'ha enllaçat cap fil." - - #: curs_main.c:1285 curs_main.c:1310 - msgid "You are on the last message." -@@ -1796,17 +1804,17 @@ msgstr "%s: L'ordre de l'editor no és c - #: editmsg.c:78 - #, c-format - msgid "could not create temporary folder: %s" --msgstr "No s'ha pogut crear una carpeta temporal: %s." -+msgstr "No s'ha pogut crear una carpeta temporal: %s" - - #: editmsg.c:90 - #, c-format - msgid "could not write temporary mail folder: %s" --msgstr "No s'ha pogut escriure en una carpeta temporal: %s." -+msgstr "No s'ha pogut escriure en una carpeta temporal: %s" - - #: editmsg.c:107 - #, c-format - msgid "could not truncate temporary mail folder: %s" --msgstr "No s'ha pogut truncar una carpeta temporal: %s." -+msgstr "No s'ha pogut truncar una carpeta temporal: %s" - - #: editmsg.c:122 - msgid "Message file is empty!" -@@ -1819,12 +1827,12 @@ msgstr "El missatge no ha estat modifica - #: editmsg.c:137 - #, c-format - msgid "Can't open message file: %s" --msgstr "No s'ha pogut obrir el fitxer missatge: %s." -+msgstr "No s'ha pogut obrir el fitxer missatge: %s" - - #: editmsg.c:144 editmsg.c:172 - #, c-format - msgid "Can't append to folder: %s" --msgstr "No s'ha pogut afegir a la carpeta: %s." -+msgstr "No s'ha pogut afegir a la carpeta: %s" - - #: editmsg.c:203 - #, c-format -@@ -1863,7 +1871,7 @@ msgstr "[-- Tipus: %s/%s, Codificació: - msgid "[-- Autoview using %s --]\n" - msgstr "" - "[-- Eixida de l'ordre de visualització automàtica --]\n" --"[-- «%s» --]\n" -+"[-- «%s». --]\n" - - # ivb (2001/12/08) - # ivb ABREUJAT! -@@ -1883,13 +1891,13 @@ msgstr "[-- No s'ha pogut executar «%s - msgid "[-- Autoview stderr of %s --]\n" - msgstr "" - "[-- Errors de l'ordre de visualització automàtica --]\n" --"[-- «%s» --]\n" -+"[-- «%s». --]\n" - - #: handler.c:1659 - msgid "[-- Error: message/external-body has no access-type parameter --]\n" - msgstr "" --"[-- Error: La part «message/external-body» --]\n" --"[-- no té paràmetre «access-type». --]\n" -+"[-- Error: La part «message/external-body» no té paràmetre «access-type». " -+"--]\n" - - #: handler.c:1678 - #, c-format -@@ -1903,6 +1911,7 @@ msgstr "" - msgid "(size %s bytes) " - msgstr "(amb mida %s octets) " - -+# No es pot posar sempre el punt en la frase! ivb - #: handler.c:1687 - msgid "has been deleted --]\n" - msgstr "ha estat esborrat --]\n" -@@ -1910,12 +1919,12 @@ msgstr "ha estat esborrat --]\n" - #: handler.c:1692 - #, c-format - msgid "[-- on %s --]\n" --msgstr "[-- amb data %s --]\n" -+msgstr "[-- amb data %s. --]\n" - - #: handler.c:1697 - #, c-format - msgid "[-- name: %s --]\n" --msgstr "[-- nom: %s --]\n" -+msgstr "[-- Nom: %s --]\n" - - #: handler.c:1710 handler.c:1726 - #, c-format -@@ -1931,9 +1940,7 @@ msgstr "[-- i la font externa indicada h - #: handler.c:1730 - #, c-format - msgid "[-- and the indicated access-type %s is unsupported --]\n" --msgstr "" --"[-- i el valor indicat d'«access-type» «%s» --]\n" --"[-- no es suporta. --]\n" -+msgstr "[-- i no es pot usar el mètode d'accés indicat, «%s». --]\n" - - #: handler.c:1841 - msgid "Error: multipart/signed has no protocol." -@@ -1950,12 +1957,12 @@ msgstr "No s'ha pogut obrir el fitxer te - #: handler.c:1952 - #, c-format - msgid "[-- %s/%s is unsupported " --msgstr "[-- No es suporta «%s/%s». " -+msgstr "[-- No es pot mostrar «%s/%s» " - - #: handler.c:1957 - #, c-format - msgid "(use '%s' to view this part)" --msgstr "(useu «%s» per veure aquesta part)" -+msgstr "(useu «%s» per a veure aquesta part)" - - #: handler.c:1959 - msgid "(need 'view-attachments' bound to key!)" -@@ -2098,19 +2105,18 @@ msgid "Mailbox created." - msgstr "S'ha creat la bústia." - - #: imap/browse.c:332 --#, fuzzy, c-format -+#, c-format - msgid "Rename mailbox %s to: " --msgstr "Crea la bústia: " -+msgstr "Reanomena la bústia «%s» a: " - - #: imap/browse.c:345 --#, fuzzy, c-format -+#, c-format - msgid "Rename failed: %s" --msgstr "La negociació d'SSL ha fallat: %s." -+msgstr "El reanomenament ha fallat: %s" - - #: imap/browse.c:350 --#, fuzzy - msgid "Mailbox renamed." --msgstr "S'ha creat la bústia." -+msgstr "S'ha reanomenat la bústia." - - #: imap/command.c:298 - msgid "Mailbox closed" -@@ -2134,7 +2140,7 @@ msgstr "Aquest servidor IMAP és antic. - - #: imap/imap.c:422 - msgid "Checking mailbox subscriptions" --msgstr "" -+msgstr "S'estan comprovant les subscripcions a bústies..." - - #: imap/imap.c:460 pop_lib.c:286 - msgid "Secure connection with TLS?" -@@ -2146,7 +2152,7 @@ msgstr "No s'ha pogut negociar la connex - - #: imap/imap.c:489 pop_lib.c:331 - msgid "Encrypted connection unavailable" --msgstr "" -+msgstr "No s'ha pogut establir una connexió xifrada." - - #: imap/imap.c:618 - #, c-format -@@ -2188,10 +2194,11 @@ msgstr "imap_sync_mailbox: Ha fallat «E - msgid "CLOSE failed" - msgstr "Ha fallat «CLOSE»." - -+# És un missatge d'error. ivb - #: imap/imap.c:1388 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "Cercar les capçaleres requereix un nom de capçalera: %s" - - #: imap/imap.c:1536 - msgid "Bad mailbox name" -@@ -2237,7 +2244,6 @@ msgid "The message index is incorrect. T - msgstr "L'índex del missatge no és correcte. Proveu de reobrir la bústia." - - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." - msgstr "S'està penjant el missatge..." - -@@ -2848,7 +2854,7 @@ msgstr "redacta un nou missatge de corre - - #: keymap_alldefs.h:103 - msgid "break the thread in two" --msgstr "" -+msgstr "parteix el fil en dos" - - #: keymap_alldefs.h:104 - msgid "open a different folder" -@@ -2887,9 +2893,8 @@ msgid "show only messages matching a pat - msgstr "mostra només els missatges que concorden amb un patró" - - #: keymap_alldefs.h:113 --#, fuzzy - msgid "link tagged message to the current one" --msgstr "Redirigeix els missatges marcats a: " -+msgstr "enllaça el missatge marcat a l'actual" - - #: keymap_alldefs.h:114 - msgid "jump to the next new message" -@@ -3050,9 +3055,8 @@ msgid "{internal}" - msgstr "{interna}" - - #: keymap_alldefs.h:153 --#, fuzzy - msgid "rename the current mailbox (IMAP only)" --msgstr "esborra la bústia actual (només en IMAP)" -+msgstr "reanomena la bústia actual (només en IMAP)" - - #: keymap_alldefs.h:154 - msgid "reply to a message" -@@ -3246,7 +3250,7 @@ msgstr "esborra de la memòria la o les - - #: keymap_alldefs.h:200 - msgid "extract supported public keys" --msgstr "extreu les claus públiques suportades" -+msgstr "extreu totes les claus públiques possibles" - - #: keymap_alldefs.h:201 - msgid "show S/MIME options" -@@ -3283,7 +3287,6 @@ msgstr "" - "condicions; useu «mutt -vv» per obtenir-ne més detalls.\n" - - #: main.c:69 --#, fuzzy - msgid "" - "Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3308,13 +3311,13 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" --"Copyright © 1996-2002 Michael R. Elkins \n" -+"Copyright © 1996-2004 Michael R. Elkins \n" - "Copyright © 1996-2002 Brandon Long \n" --"Copyright © 1997-2002 Thomas Roessler \n" --"Copyright © 1998-2002 Werner Koch \n" --"Copyright © 1999-2002 Brendan Cully \n" -+"Copyright © 1997-2005 Thomas Roessler \n" -+"Copyright © 1998-2005 Werner Koch \n" -+"Copyright © 1999-2005 Brendan Cully \n" - "Copyright © 1999-2002 Tommi Komulainen \n" - "Copyright © 2000-2002 Edmund Grimley Evans \n" - "\n" -@@ -3336,11 +3339,10 @@ msgstr "" - "\n" - " Hauríeu d'haver rebut una còpia de la Llicència Pública General GNU\n" - " juntament amb aquest programa; en cas contrari, escriviu a la Free\n" --" Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,\n" --" MA 02111, USA.\n" -+" Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,\n" -+" MA 02110-1301, USA.\n" - - #: main.c:107 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3364,46 +3366,26 @@ msgstr "" - "Forma d'ús: mutt [-nRyzZ] [-e ORDRE] [-F FITXER] [-m TIPUS] [-f FITXER]\n" - " mutt [-nR] [-e ORDRE] [-F FITXER] -Q VAR [-Q VAR] [...]\n" - " mutt [-nR] [-e ORDRE] [-F FITXER] -A ÀLIES [-A ÀLIES] [...]\n" -+" mutt [-nR] [-e ORDRE] [-F FITXER] -D\n" - " mutt [-nx] [-e ORDRE] [-a FITXER] [-F FITXER] [-H FITXER]\n" --" [-i FITXER] [-s ASSUMPTE] [-b ADREÇA] [-c ADREÇA] " --"ADREÇA...\n" -+" [-i FITXER] [-s ASSUMPTE] [-b ADREÇA] [-c ADREÇA] ADREÇA...\n" - " mutt [-n] [-e ORDRE] [-F FITXER] -p\n" - " mutt -v[v]\n" - "\n" - "Opcions:\n" - " -A ÀLIES Expandeix l'ÀLIES indicat.\n" - " -a FITXER Adjunta un FITXER al missatge.\n" --" -b ADREÇA Indica una ADREÇA per la còpia cega (BCC).\n" --" -c ADREÇA Indica una ADREÇA per la còpia (CC).\n" --" -e ORDRE Indica una ORDRE a executar abans de la " --"inicialització.\n" --" -f FITXER Indica quina bústia llegir.\n" --" -F FITXER Indica un FITXER «muttrc» alternatiu.\n" --" -H FITXER Indica un FITXER esborrany d'on llegir la capçalera i " --"el\n" --" cos.\n" --" -i FITXER Indica un FITXER que Mutt inclourà en el cos.\n" --" -m TIPUS Indica un TIPUS de bústia per defecte.\n" --" -n Fa que Mutt no llija el fitxer «Muttrc» del sistema.\n" --" -p Recupera un missatge posposat.\n" --" -Q VARIABLE Consulta el valor d'una VARIABLE de configuració.\n" --" -R Obri la bústia en mode de només lectura.\n" --" -s ASSUMPTE Indica l'ASSUMPTE (entre cometes si porta espais).\n" --" -v Mostra la versió i les definicions de compiŀlació.\n" --" -x Simula el mode d'enviament de «mailx».\n" --" -y Selecciona una bústia de la vostra llista " --"«mailboxes».\n" --" -z Ix immediatament si no hi ha missatges en la bústia.\n" --" -Z Obri la primera bústia amb missatges nous, i ix\n" --" immediatament si no n'hi ha cap.\n" --" -h Mostra aquest missatge d'ajuda." -+" -b ADREÇA Indica una ADREÇA per a la còpia cega (BCC).\n" -+" -c ADREÇA Indica una ADREÇA per a la còpia (CC).\n" -+" -D Mostra el valor de totes les variables en l'eixida\n" -+" estàndard." - - #: main.c:122 - msgid " -d \tlog debugging output to ~/.muttdebug0" - msgstr "" -+" -d NIVELL Escriu els missatges de depuració en «~/.muttdebug0»." - - #: main.c:125 --#, fuzzy - msgid "" - " -e \tspecify a command to be executed after initialization\n" - " -f \tspecify which mailbox to read\n" -@@ -3423,20 +3405,6 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --"Forma d'ús: mutt [-nRyzZ] [-e ORDRE] [-F FITXER] [-m TIPUS] [-f FITXER]\n" --" mutt [-nR] [-e ORDRE] [-F FITXER] -Q VAR [-Q VAR] [...]\n" --" mutt [-nR] [-e ORDRE] [-F FITXER] -A ÀLIES [-A ÀLIES] [...]\n" --" mutt [-nx] [-e ORDRE] [-a FITXER] [-F FITXER] [-H FITXER]\n" --" [-i FITXER] [-s ASSUMPTE] [-b ADREÇA] [-c ADREÇA] " --"ADREÇA...\n" --" mutt [-n] [-e ORDRE] [-F FITXER] -p\n" --" mutt -v[v]\n" --"\n" --"Opcions:\n" --" -A ÀLIES Expandeix l'ÀLIES indicat.\n" --" -a FITXER Adjunta un FITXER al missatge.\n" --" -b ADREÇA Indica una ADREÇA per la còpia cega (BCC).\n" --" -c ADREÇA Indica una ADREÇA per la còpia (CC).\n" - " -e ORDRE Indica una ORDRE a executar abans de la " - "inicialització.\n" - " -f FITXER Indica quina bústia llegir.\n" -@@ -3491,7 +3459,7 @@ msgstr "«%s» no existeix. Voleu crear- - #: main.c:753 - #, c-format - msgid "Can't create %s: %s." --msgstr "No s'ha pogut crear «%s»: %s." -+msgstr "No s'ha pogut crear «%s»: %s" - - #: main.c:798 - msgid "No recipients specified.\n" -@@ -3721,7 +3689,7 @@ msgstr "Error d'E/S" - #: mutt_ssl.c:331 - #, c-format - msgid "SSL failed: %s" --msgstr "La negociació d'SSL ha fallat: %s." -+msgstr "La negociació d'SSL ha fallat: %s" - - #: mutt_ssl.c:340 mutt_ssl_gnutls.c:493 mutt_ssl_gnutls.c:502 - #: mutt_ssl_gnutls.c:531 -@@ -3821,89 +3789,82 @@ msgstr "S'ha desat el certificat." - - #: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117 - msgid "Error: no TLS socket open" --msgstr "" -+msgstr "Error: No hi ha un connector TLS obert." - - #: mutt_ssl_gnutls.c:204 - msgid "All available protocols for TLS/SSL connection disabled" --msgstr "" -+msgstr "Tots els protocols de connexió TLS/SSL disponibles estan inhabilitats." - - #: mutt_ssl_gnutls.c:265 --#, fuzzy, c-format -+#, c-format - msgid "SSL/TLS connection using %s (%s/%s/%s)" --msgstr "La connexió SSL usa «%s» (%s)." -+msgstr "La connexió SSL/TLS usa «%s» (%s/%s/%s)." - - #: mutt_ssl_gnutls.c:508 - #, c-format - msgid "Certificate verification error (%s)" --msgstr "" -+msgstr "Error en la verificació del certificat: %s" - - #: mutt_ssl_gnutls.c:516 --#, fuzzy - msgid "Certificate is not X.509" --msgstr "S'ha desat el certificat." -+msgstr "El certificat no és de tipus X.509." - - #: mutt_ssl_gnutls.c:523 --#, fuzzy - msgid "Error initialising gnutls certificate data" --msgstr "Error en inicialitzar el terminal." -+msgstr "Error en inicialitzar les dades del certificat GNU TLS." - - #: mutt_ssl_gnutls.c:539 - msgid "Error processing certificate data" --msgstr "" -+msgstr "Error en processar les dades del certificat." - - #: mutt_ssl_gnutls.c:724 --#, fuzzy, c-format -+#, c-format - msgid "SHA1 Fingerprint: %s" --msgstr "Empremta digital: %s" -+msgstr "Empremta digital SHA1: %s" - - #: mutt_ssl_gnutls.c:727 --#, fuzzy, c-format -+#, c-format - msgid "MD5 Fingerprint: %s" --msgstr "Empremta digital: %s" -+msgstr "Empremta digital MD5: %s" - - #: mutt_ssl_gnutls.c:732 --#, fuzzy - msgid "WARNING: Server certificate is not yet valid" --msgstr "El certificat del servidor encara no és vàlid." -+msgstr "Avís: El certificat del servidor encara no és vàlid." - - #: mutt_ssl_gnutls.c:737 --#, fuzzy - msgid "WARNING: Server certificate has expired" --msgstr "El certificat del servidor ha expirat." -+msgstr "Avís: El certificat del servidor ha expirat." - - #: mutt_ssl_gnutls.c:742 --#, fuzzy - msgid "WARNING: Server certificate has been revoked" --msgstr "El certificat del servidor ha expirat." -+msgstr "Avís: El certificat del servidor ha estat revocat." - - #: mutt_ssl_gnutls.c:747 - msgid "WARNING: Server hostname does not match certificate" --msgstr "" -+msgstr "Avís: El nom d'estació del servidor no concorda amb el del certificat." - - #: mutt_ssl_gnutls.c:752 --#, fuzzy - msgid "WARNING: Signer of server certificate is not a CA" --msgstr "El certificat del servidor encara no és vàlid." -+msgstr "Avís: El signatari del certificat del servidor no és una CA." - - #: mutt_ssl_gnutls.c:755 --#, fuzzy - msgid "TLS/SSL Certificate check" --msgstr "Comprovació del certificat SSL" -+msgstr "Comprovació del certificat TLS/SSL" - - #: mutt_tunnel.c:70 --#, fuzzy, c-format -+#, c-format - msgid "Connecting with \"%s\"..." - msgstr "S'està connectant amb «%s»..." - - #: mutt_tunnel.c:137 - #, c-format - msgid "Tunnel to %s returned error %d (%s)" --msgstr "" -+msgstr "El túnel a «%s» ha tornat l'error %d: %s" - - #: mutt_tunnel.c:155 mutt_tunnel.c:171 --#, fuzzy, c-format -+#, c-format - msgid "Tunnel error talking to %s: %s" --msgstr "Error en parlar amb «%s» (%s)." -+msgstr "Error en el túnel establert amb «%s»: %s" - - #: muttlib.c:910 - msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" -@@ -4166,7 +4127,7 @@ msgstr "%c: L'ordre no és vàlida." - #: pattern.c:840 - #, c-format - msgid "%c: not supported in this mode" --msgstr "%c: No es suporta en aquest mode." -+msgstr "%c: No es permet en aquest mode." - - #: pattern.c:853 - #, c-format -@@ -4232,15 +4193,13 @@ msgstr "" - "\n" - - #: pgp.c:392 pgp.c:956 --#, fuzzy - msgid "Could not decrypt PGP message" --msgstr "No s'ha pogut copiar el missatge." -+msgstr "No s'ha pogut desxifrar el missatge PGP." - - #. clear 'Invoking...' message, since there's no error - #: pgp.c:441 pgp.c:952 --#, fuzzy - msgid "PGP message successfully decrypted." --msgstr "S'ha pogut verificar amb èxit la signatura PGP." -+msgstr "S'ha pogut desxifrar amb èxit el missatge PGP." - - #: pgp.c:728 - msgid "Internal error. Inform ." -@@ -4255,7 +4214,6 @@ msgstr "" - "\n" - - #: pgp.c:833 --#, fuzzy - msgid "Decryption failed" - msgstr "El desxifratge ha fallat." - -@@ -4328,7 +4286,7 @@ msgstr "Clau PGP %s." - #: pop.c:91 pop_lib.c:201 - #, c-format - msgid "Command TOP is not supported by server." --msgstr "El servidor no suporta l'ordre «TOP»." -+msgstr "El servidor no permet l'ordre «TOP»." - - #: pop.c:118 - msgid "Can't write header to temporary file!" -@@ -4337,7 +4295,7 @@ msgstr "No s'ha pogut escriure la capça - #: pop.c:199 pop_lib.c:203 - #, c-format - msgid "Command UIDL is not supported by server." --msgstr "El servidor no suporta l'ordre «UIDL»." -+msgstr "El servidor no permet l'ordre «UIDL»." - - #: pop.c:248 pop.c:565 - #, c-format -@@ -4404,7 +4362,7 @@ msgstr "L'autenticació APOP ha fallat." - #: pop_auth.c:243 - #, c-format - msgid "Command USER is not supported by server." --msgstr "El servidor no suporta l'ordre «USER»." -+msgstr "El servidor no permet l'ordre «USER»." - - #: pop_lib.c:199 - msgid "Unable to leave messages on server." -@@ -5051,14 +5009,14 @@ msgstr "El missatge pare no és visible - msgid "Parent message is not available." - msgstr "El missatge pare no es troba disponible." - --#~ msgid "First entry is shown." --#~ msgstr "La primera entrada ja és visible." -+msgid "First entry is shown." -+msgstr "La primera entrada ja és visible." - --#~ msgid "Last entry is shown." --#~ msgstr "L'última entrada ja és visible." -+msgid "Last entry is shown." -+msgstr "L'última entrada ja és visible." - --#~ msgid "Unexpected response received from server: %s" --#~ msgstr "S'ha rebut una resposta inesperada del servidor: %s" -+msgid "Unexpected response received from server: %s" -+msgstr "S'ha rebut una resposta inesperada del servidor: %s" - --#~ msgid "Unable to append to IMAP mailboxes at this server" --#~ msgstr "Aquest servidor no permet afegir a les bústies IMAP." -+msgid "Unable to append to IMAP mailboxes at this server" -+msgstr "Aquest servidor no permet afegir a les bústies IMAP." -Index: mutt/po/cs.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/cs.po,v -retrieving revision 3.20 -retrieving revision 3.22 -diff -u -p -u -a -r3.20 -r3.22 ---- mutt/po/cs.po 15 Sep 2005 14:24:38 -0000 3.20 -+++ mutt/po/cs.po 17 Sep 2005 20:46:12 -0000 3.22 -@@ -3741,7 +3741,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2003 Michael R. Elkins \n" - "Copyright (C) 1996-2003 Brandon Long \n" -@@ -3770,7 +3770,7 @@ msgstr "" - "\n" - " Kopie Obecné veøejné licence GNU mìla být dodána spolu s tímto programem;\n" - "pokud se tak nestalo, napi¹te o ni Free Software Foundation, Inc.,\n" --"59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+"51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - "\n" - - # -Index: mutt/po/da.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/da.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/da.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/da.po 17 Sep 2005 20:46:12 -0000 3.21 -@@ -3170,7 +3170,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3195,7 +3195,7 @@ msgstr "" - "\n" - " Du skulle have modtaget en kopi af GNU General Public License\n" - " sammen med dette program; hvis ikke, så skriv til The Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/de.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/de.po,v -retrieving revision 3.27 -retrieving revision 3.29 -diff -u -p -u -a -r3.27 -r3.29 ---- mutt/po/de.po 15 Sep 2005 14:24:38 -0000 3.27 -+++ mutt/po/de.po 17 Sep 2005 20:46:12 -0000 3.29 -@@ -3162,7 +3162,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3189,8 +3189,8 @@ msgstr "" - "\n" - " Sie sollten eine Kopie der GNU General Public License zusammen mit\n" - " diesem Programm erhalten haben; falls nicht, schreiben sie an Free\n" --" Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA " --"02111, USA.\n" -+" Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -+"02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/el.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/el.po,v -retrieving revision 3.20 -retrieving revision 3.22 -diff -u -p -u -a -r3.20 -r3.22 ---- mutt/po/el.po 15 Sep 2005 14:24:38 -0000 3.20 -+++ mutt/po/el.po 17 Sep 2005 20:46:12 -0000 3.22 -@@ -3810,7 +3810,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3837,7 +3837,7 @@ msgstr "" - "\n" - "Èá Ýðñåðå íá Ý÷åôå ëÜâåé Ýíá áíôßãñáöï ôçò GNU ÃåíéêÞò Äçìüóéáò ¶äåéáò\n" - "ìå áõôü ôï ðñüãñáììá. ÅÜí ü÷é, ãñÜøôå óôï Free Software \n" --"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - "\n" - - # -Index: mutt/po/eo.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/eo.po,v -retrieving revision 3.20 -retrieving revision 3.22 -diff -u -p -u -a -r3.20 -r3.22 ---- mutt/po/eo.po 15 Sep 2005 14:24:38 -0000 3.20 -+++ mutt/po/eo.po 17 Sep 2005 20:46:12 -0000 3.22 -@@ -3185,7 +3185,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Kopirajto (C) 1996-2002 Michael R. Elkins \n" - "Kopirajto (C) 1996-2002 Brandon Long \n" -@@ -3210,7 +3210,7 @@ msgstr "" - "\n" - " Vi devus esti ricevinta kopion de la Øenerala Publika Rajtigilo de\n" - " GNU kun æi tiu programo; se ne, skribu al Free Software Foundation,\n" --" Inc., 59 Temple Place - Suite 330, Boston, MA 02111, Usono.\n" -+" Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Usono.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/es.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/es.po,v -retrieving revision 3.22 -retrieving revision 3.24 -diff -u -p -u -a -r3.22 -r3.24 ---- mutt/po/es.po 15 Sep 2005 14:24:38 -0000 3.22 -+++ mutt/po/es.po 17 Sep 2005 20:46:12 -0000 3.24 -@@ -3234,7 +3234,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2001 Michael R. Elkins \n" - "Copyright (C) 1996-2001 Brandon Long \n" -@@ -3262,7 +3262,7 @@ msgstr "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/et.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/et.po,v -retrieving revision 3.21 -retrieving revision 3.23 -diff -u -p -u -a -r3.21 -r3.23 ---- mutt/po/et.po 15 Sep 2005 14:24:38 -0000 3.21 -+++ mutt/po/et.po 17 Sep 2005 20:46:12 -0000 3.23 -@@ -3190,7 +3190,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Autoriõigus (C) 1996-2002 Michael R. Elkins \n" - "Autoriõigus (C) 1996-2002 Brandon Long \n" -@@ -3214,7 +3214,7 @@ msgstr "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/fr.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/fr.po,v -retrieving revision 3.36 -retrieving revision 3.39 -diff -u -p -u -a -r3.36 -r3.39 ---- mutt/po/fr.po 15 Sep 2005 14:24:38 -0000 3.36 -+++ mutt/po/fr.po 17 Sep 2005 20:46:12 -0000 3.39 -@@ -8,10 +8,10 @@ - # , fuzzy - msgid "" - msgstr "" --"Project-Id-Version: Mutt 1.5.10\n" -+"Project-Id-Version: Mutt 1.5.11\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-08-12 01:40+0200\n" -+"POT-Creation-Date: 2005-09-17 02:35+0200\n" -+"PO-Revision-Date: 2005-09-17 02:37+0200\n" - "Last-Translator: Vincent Lefevre \n" - "Language-Team: mutt-dev \n" - "MIME-Version: 1.0\n" -@@ -2154,7 +2154,7 @@ msgstr "CLOSE a échoué" - #: imap/imap.c:1388 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "Recherche d'en-tête sans nom d'en-tête : %s" - - #: imap/imap.c:1536 - msgid "Bad mailbox name" -@@ -2206,9 +2206,8 @@ msgstr "" - "L'index du message est incorrect. Essayez de rouvrir la boîte aux lettres." - - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." --msgstr "Chargement du message ..." -+msgstr "Chargement du message..." - - # , c-format - #: imap/message.c:708 -@@ -3276,7 +3275,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3301,10 +3300,9 @@ msgstr "" - "\n" - " 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3342,7 +3340,7 @@ msgstr "" - " -a \tattache un fichier à ce message\n" - " -b \tspécifie une adresse à mettre en copie aveugle (BCC)\n" - " -c \tspécifie une adresse à mettre en copie (CC)\n" --" -D\t\técrit la valeur de toutes les variables sur stderr" -+" -D\t\técrit la valeur de toutes les variables sur stdout" - - #: main.c:122 - msgid " -d \tlog debugging output to ~/.muttdebug0" -Index: mutt/po/ga.po -=================================================================== -RCS file: mutt/po/ga.po -diff -N mutt/po/ga.po ---- /dev/null 1 Jan 1970 00:00:00 -0000 -+++ mutt/po/ga.po 17 Sep 2005 20:46:13 -0000 1.3 -@@ -0,0 +1,4775 @@ -+# Irish translations for mutt. -+# Copyright (C) 2003 Free Software Foundation, Inc. -+# Kevin Patrick Scannell , 2005. -+# -+msgid "" -+msgstr "" -+"Project-Id-Version: mutt 1.5.11\n" -+"Report-Msgid-Bugs-To: \n" -+"POT-Creation-Date: 2005-09-15 16:23+0200\n" -+"PO-Revision-Date: 2005-09-16 14:22-0500\n" -+"Last-Translator: Kevin Patrick Scannell \n" -+"Language-Team: Irish \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=ISO-8859-1\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#: account.c:154 -+#, c-format -+msgid "Username at %s: " -+msgstr "Ainm úsáideora ag %s: " -+ -+#: account.c:209 -+#, c-format -+msgid "Password for %s@%s: " -+msgstr "Focal faire do %s@%s: " -+ -+#: addrbook.c:37 browser.c:45 pager.c:1483 postpone.c:43 query.c:48 -+#: recvattach.c:54 -+msgid "Exit" -+msgstr "Scoir" -+ -+#: addrbook.c:38 curs_main.c:407 pager.c:1490 postpone.c:44 -+msgid "Del" -+msgstr "Scr" -+ -+#: addrbook.c:39 curs_main.c:408 postpone.c:45 -+msgid "Undel" -+msgstr "DíScr" -+ -+#: addrbook.c:40 -+msgid "Select" -+msgstr "Roghnaigh" -+ -+#. __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 "Cabhair" -+ -+#: addrbook.c:145 -+msgid "You have no aliases!" -+msgstr "Níl aon ailias agat!" -+ -+#: addrbook.c:156 -+msgid "Aliases" -+msgstr "Ailiasanna" -+ -+#. add a new alias -+#: alias.c:246 -+msgid "Alias as: " -+msgstr "Ailias: " -+ -+#: alias.c:252 -+msgid "You already have an alias defined with that name!" -+msgstr "Tá an t-ailias seo agat cheana féin!" -+ -+#: alias.c:258 -+msgid "Warning: This alias name may not work. Fix it?" -+msgstr "" -+"Rabhadh: Is féidir nach n-oibreoidh an t-ailias seo i gceart. Ceartaigh?" -+ -+#: alias.c:283 -+msgid "Address: " -+msgstr "Seoladh: " -+ -+#: alias.c:293 send.c:206 -+#, c-format -+msgid "Error: '%s' is a bad IDN." -+msgstr "Earráid: Is drochIDN é '%s'" -+ -+#: alias.c:305 -+msgid "Personal name: " -+msgstr "Ainm pearsanta: " -+ -+#: alias.c:314 -+#, c-format -+msgid "[%s = %s] Accept?" -+msgstr "[%s = %s] Glac Leis?" -+ -+#: alias.c:331 recvattach.c:394 recvattach.c:417 recvattach.c:430 -+#: recvattach.c:443 recvattach.c:471 -+msgid "Save to file: " -+msgstr "Sábháil go comhad: " -+ -+#: alias.c:346 -+msgid "Alias added." -+msgstr "Cuireadh an t-ailias leis." -+ -+#: attach.c:113 attach.c:245 attach.c:477 attach.c:968 -+msgid "Can't match nametemplate, continue?" -+msgstr "Ní féidir ainmtheimpléad comhoiriúnach a fháil; lean ar aghaidh?" -+ -+#. For now, editing requires a file, no piping -+#: attach.c:126 -+#, c-format -+msgid "Mailcap compose entry requires %%s" -+msgstr "Tá gá le %%s in iontráil chumtha Mailcap" -+ -+#: 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 "Earráid agus \"%s\" á rith!" -+ -+#: attach.c:144 -+msgid "Failure to open file to parse headers." -+msgstr "Níorbh fhéidir comhad a oscailt chun ceanntásca a pharsáil." -+ -+#: attach.c:175 -+msgid "Failure to open file to strip headers." -+msgstr "Níorbh fhéidir comhad a oscailt chun ceanntásca a struipeáil." -+ -+#: attach.c:184 -+msgid "Failure to rename file." -+msgstr "Theip ar athainmniú comhaid." -+ -+#: attach.c:197 -+#, c-format -+msgid "No mailcap compose entry for %s, creating empty file." -+msgstr "Níl aon iontráil chumadóra mailcap do %s, comhad folamh á chruthú." -+ -+#. For now, editing requires a file, no piping -+#: attach.c:258 -+#, c-format -+msgid "Mailcap Edit entry requires %%s" -+msgstr "Tá gá le %%s in iontráil Eagair Mailcap" -+ -+#: attach.c:280 -+#, c-format -+msgid "No mailcap edit entry for %s" -+msgstr "Níl aon iontráil eagair mailcap do %s" -+ -+#: attach.c:443 -+msgid "No matching mailcap entry found. Viewing as text." -+msgstr "Níor aimsíodh iontráil chomhoiriúnach mailcap. Féach air mar théacs." -+ -+#: attach.c:456 -+msgid "MIME type not defined. Cannot view attachment." -+msgstr "Tá an cineál MIME gan sainmhíniú. Ní féidir an t-iatán a léamh." -+ -+#: attach.c:546 -+msgid "Cannot create filter" -+msgstr "Ní féidir an scagaire a chruthú" -+ -+#: 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 "Ní féidir an scagaire a chruthú" -+ -+#: attach.c:840 -+msgid "Write fault!" -+msgstr "Fadhb i rith scríofa!" -+ -+#: attach.c:1082 -+msgid "I don't know how to print that!" -+msgstr "Ní fhéadaim priontáil!" -+ -+#: browser.c:46 -+msgid "Chdir" -+msgstr "Chdir" -+ -+#: browser.c:47 -+msgid "Mask" -+msgstr "Masc" -+ -+#: browser.c:382 browser.c:990 -+#, c-format -+msgid "%s is not a directory." -+msgstr "Ní comhadlann í %s." -+ -+#: browser.c:502 -+#, c-format -+msgid "Mailboxes [%d]" -+msgstr "Boscaí Poist [%d]" -+ -+#: browser.c:509 -+#, c-format -+msgid "Subscribed [%s], File mask: %s" -+msgstr "Liostáilte [%s], Masc comhaid: %s" -+ -+#: browser.c:513 -+#, c-format -+msgid "Directory [%s], File mask: %s" -+msgstr "Comhadlann [%s], Masc comhaid: %s" -+ -+#: browser.c:525 -+msgid "Can't attach a directory!" -+msgstr "Ní féidir comhadlann a cheangal!" -+ -+#: browser.c:656 browser.c:1057 browser.c:1154 -+msgid "No files match the file mask" -+msgstr "Níl aon chomhad comhoiriúnach leis an mhasc chomhaid" -+ -+#: browser.c:861 -+msgid "Create is only supported for IMAP mailboxes" -+msgstr "Ní féidir cruthú ach le boscaí poist IMAP" -+ -+#: browser.c:881 -+msgid "Rename is only supported for IMAP mailboxes" -+msgstr "Ní féidir athainmniú ach le boscaí poist IMAP" -+ -+#: browser.c:902 -+msgid "Delete is only supported for IMAP mailboxes" -+msgstr "Ní féidir scriosadh ach le boscaí poist IMAP" -+ -+#: browser.c:910 -+#, c-format -+msgid "Really delete mailbox \"%s\"?" -+msgstr "Scrios bosca poist \"%s\" i ndáiríre?" -+ -+#: browser.c:924 -+msgid "Mailbox deleted." -+msgstr "Scriosadh an bosca." -+ -+#: browser.c:930 -+msgid "Mailbox not deleted." -+msgstr "Níor scriosadh an bosca." -+ -+#: browser.c:949 -+msgid "Chdir to: " -+msgstr "Chdir go: " -+ -+#: browser.c:978 browser.c:1050 -+msgid "Error scanning directory." -+msgstr "Earráid agus comhadlann á scanadh." -+ -+#: browser.c:1001 -+msgid "File Mask: " -+msgstr "Masc Comhaid: " -+ -+#: browser.c:1073 -+msgid "Reverse sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " -+msgstr "" -+"Sórtáil droim ar ais de réir (d)áta, (a)ibítíre, (m)éid, nó (n)á sórtáil? " -+ -+#: browser.c:1074 -+msgid "Sort by (d)ate, (a)lpha, si(z)e or do(n)'t sort? " -+msgstr "Sórtáil de réir (d)áta, (a)ibítíre, (m)éid, nó (n)á sórtáil? " -+ -+#: browser.c:1075 -+msgid "dazn" -+msgstr "damn" -+ -+#: browser.c:1141 -+msgid "New file name: " -+msgstr "Ainm comhaid nua: " -+ -+#: browser.c:1172 -+msgid "Can't view a directory" -+msgstr "Ní féidir comhadlann a scrúdú" -+ -+#: browser.c:1189 -+msgid "Error trying to view file" -+msgstr "Earráid ag iarraidh comhad a scrúdú" -+ -+#: buffy.c:446 -+msgid "New mail in " -+msgstr "Post nua i " -+ -+#: color.c:326 -+#, c-format -+msgid "%s: color not supported by term" -+msgstr "%s: níl dathanna ar fáil leis an teirminéal seo" -+ -+#: color.c:332 -+#, c-format -+msgid "%s: no such color" -+msgstr "%s: níl a leithéid de dhath ann" -+ -+#: color.c:378 color.c:579 color.c:590 -+#, c-format -+msgid "%s: no such object" -+msgstr "%s: níl a leithéid de rud ann" -+ -+#: color.c:385 -+#, c-format -+msgid "%s: command valid only for index object" -+msgstr "%s: is féidir an t-ordú seo a úsáid le réada innéacs amháin" -+ -+#: color.c:393 -+#, c-format -+msgid "%s: too few arguments" -+msgstr "%s: níl go leor argóintí ann" -+ -+#: color.c:567 -+msgid "Missing arguments." -+msgstr "Argóintí ar iarraidh." -+ -+#: color.c:606 color.c:617 -+msgid "color: too few arguments" -+msgstr "color: níl go leor argóintí ann" -+ -+#: color.c:640 -+msgid "mono: too few arguments" -+msgstr "mono: níl go leor argóintí ann" -+ -+#: color.c:660 -+#, c-format -+msgid "%s: no such attribute" -+msgstr "%s: níl a leithéid d'aitreabúid ann" -+ -+#: color.c:700 hook.c:69 hook.c:77 keymap.c:751 -+msgid "too few arguments" -+msgstr "níl go leor argóintí ann" -+ -+#: color.c:709 hook.c:83 -+msgid "too many arguments" -+msgstr "an iomarca argóintí" -+ -+#: color.c:725 -+msgid "default colors not supported" -+msgstr "níl na dathanna réamhshocraithe ar fáil" -+ -+#. find out whether or not the verify signature -+#: commands.c:92 -+msgid "Verify PGP signature?" -+msgstr "Fíoraigh síniú PGP?" -+ -+#: commands.c:117 mbox.c:736 -+msgid "Could not create temporary file!" -+msgstr "Níorbh fhéidir comhad sealadach a chruthú!" -+ -+#: commands.c:130 -+msgid "Cannot create display filter" -+msgstr "Ní féidir scagaire taispeána a chruthú" -+ -+#: commands.c:150 -+msgid "Could not copy message" -+msgstr "Níorbh fhéidir teachtaireacht a chóipeáil" -+ -+#: commands.c:187 -+msgid "S/MIME signature successfully verified." -+msgstr "Bhí an síniú S/MIME fíoraithe." -+ -+#: commands.c:189 -+msgid "S/MIME certificate owner does not match sender." -+msgstr "Níl úinéir an teastais S/MIME comhoiriúnach leis an seoltóir." -+ -+#: commands.c:192 commands.c:203 -+msgid "Warning: Part of this message has not been signed." -+msgstr "Rabhadh: Níor síníodh cuid den teachtaireacht seo." -+ -+#: commands.c:194 -+msgid "S/MIME signature could NOT be verified." -+msgstr "Níorbh fhéidir an síniú S/MIME a fhíorú." -+ -+#: commands.c:201 -+msgid "PGP signature successfully verified." -+msgstr "Bhí an síniú PGP fíoraithe." -+ -+#: commands.c:205 -+msgid "PGP signature could NOT be verified." -+msgstr "Níorbh fhéidir an síniú PGP a fhíorú." -+ -+#: commands.c:228 -+msgid "Command: " -+msgstr "Ordú: " -+ -+#: commands.c:247 recvcmd.c:147 -+msgid "Bounce message to: " -+msgstr "Scinn teachtaireacht go: " -+ -+#: commands.c:249 recvcmd.c:149 -+msgid "Bounce tagged messages to: " -+msgstr "Scinn teachtaireachtaí clibeáilte go: " -+ -+#: commands.c:264 recvcmd.c:158 -+msgid "Error parsing address!" -+msgstr "Earráid agus seoladh á pharsáil!" -+ -+#: commands.c:272 recvcmd.c:166 -+#, c-format -+msgid "Bad IDN: '%s'" -+msgstr "DrochIDN: '%s'" -+ -+#: commands.c:283 recvcmd.c:180 -+#, c-format -+msgid "Bounce message to %s" -+msgstr "Scinn teachtaireacht go %s" -+ -+#: commands.c:283 recvcmd.c:180 -+#, c-format -+msgid "Bounce messages to %s" -+msgstr "Scinn teachtaireachtaí go %s" -+ -+#: commands.c:299 recvcmd.c:196 -+msgid "Message not bounced." -+msgstr "Níor scinneadh an teachtaireacht." -+ -+#: commands.c:299 recvcmd.c:196 -+msgid "Messages not bounced." -+msgstr "Níor scinneadh na teachtaireachtaí." -+ -+#: commands.c:309 recvcmd.c:215 -+msgid "Message bounced." -+msgstr "Scinneadh an teachtaireacht." -+ -+#: commands.c:309 recvcmd.c:215 -+msgid "Messages bounced." -+msgstr "Scinneadh na teachtaireachtaí" -+ -+#: commands.c:386 commands.c:420 commands.c:437 -+msgid "Can't create filter process" -+msgstr "Ní féidir próiseas a chruthú chun scagadh a dhéanamh" -+ -+#: commands.c:466 -+msgid "Pipe to command: " -+msgstr "Píopa go dtí an t-ordú: " -+ -+#: commands.c:483 -+msgid "No printing command has been defined." -+msgstr "Níl aon ordú priontála sainmhínithe." -+ -+#: commands.c:488 -+msgid "Print message?" -+msgstr "Priontáil teachtaireacht?" -+ -+#: commands.c:488 -+msgid "Print tagged messages?" -+msgstr "Priontáil teachtaireachtaí clibeáilte?" -+ -+#: commands.c:497 -+msgid "Message printed" -+msgstr "Priontáilte" -+ -+#: commands.c:497 -+msgid "Messages printed" -+msgstr "Priontáilte" -+ -+#: commands.c:499 -+msgid "Message could not be printed" -+msgstr "Níorbh fhéidir an teachtaireacht a phriontáil" -+ -+#: commands.c:500 -+msgid "Messages could not be printed" -+msgstr "Níorbh fhéidir na teachtaireachtaí a phriontáil" -+ -+#: 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 "" -+"DroimArAis (d)áta/(ó)/(f)ág/á(b)har/(g)o/s(n)áith/dí(s)hórt/(m)éid/s(c)ór/s(p)" -+"am?: " -+ -+#: 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 "" -+"Sórtáil (d)áta/(ó)/(f)ág/á(b)har/(g)o/s(n)áith/dí(s)hórt/(m)éid/s(c)ór/s(p)" -+"am?: " -+ -+#: commands.c:511 -+msgid "dfrsotuzcp" -+msgstr "dófbgnsmcp" -+ -+#: commands.c:568 -+msgid "Shell command: " -+msgstr "Ordú blaoisce: " -+ -+#: commands.c:716 -+#, c-format -+msgid "Decode-save%s to mailbox" -+msgstr "Díchódaigh-sábháil%s go bosca poist" -+ -+#: commands.c:717 -+#, c-format -+msgid "Decode-copy%s to mailbox" -+msgstr "Díchódaigh-cóipeáil%s go bosca poist" -+ -+#: commands.c:718 -+#, c-format -+msgid "Decrypt-save%s to mailbox" -+msgstr "Díchriptigh-sábháil%s go bosca poist" -+ -+#: commands.c:719 -+#, c-format -+msgid "Decrypt-copy%s to mailbox" -+msgstr "Díchriptigh-cóipeáil%s go bosca poist" -+ -+#: commands.c:720 -+#, c-format -+msgid "Save%s to mailbox" -+msgstr "Sábháil%s go dtí an bosca poist" -+ -+#: commands.c:720 -+#, c-format -+msgid "Copy%s to mailbox" -+msgstr "Cóipeáil%s go dtí an bosca poist" -+ -+#: commands.c:721 -+msgid " tagged" -+msgstr " clibeáilte" -+ -+#: commands.c:794 -+#, c-format -+msgid "Copying to %s..." -+msgstr "Á chóipeáil go %s..." -+ -+#: commands.c:926 -+#, c-format -+msgid "Convert to %s upon sending?" -+msgstr "Tiontaigh go %s agus á sheoladh?" -+ -+#: commands.c:936 -+#, c-format -+msgid "Content-Type changed to %s." -+msgstr "Athraíodh Content-Type go %s." -+ -+#: commands.c:941 -+#, c-format -+msgid "Character set changed to %s; %s." -+msgstr "Athraíodh an tacar carachtar go %s; %s." -+ -+#: commands.c:943 -+msgid "not converting" -+msgstr "gan tiontú" -+ -+#: commands.c:943 -+msgid "converting" -+msgstr "á tiontú" -+ -+#: compose.c:47 -+msgid "There are no attachments." -+msgstr "Níl aon iatán ann." -+ -+#: compose.c:89 -+msgid "Send" -+msgstr "Seol" -+ -+#: compose.c:90 remailer.c:487 -+msgid "Abort" -+msgstr "Tobscoir" -+ -+#: compose.c:94 compose.c:668 -+msgid "Attach file" -+msgstr "Iatán" -+ -+#: compose.c:95 -+msgid "Descrip" -+msgstr "Cur Síos" -+ -+#: compose.c:132 -+msgid "Sign, Encrypt" -+msgstr "Sínigh, Criptigh" -+ -+#: compose.c:134 -+msgid "Encrypt" -+msgstr "Criptigh" -+ -+#: compose.c:136 -+msgid "Sign" -+msgstr "Sínigh" -+ -+#: compose.c:138 -+msgid "Clear" -+msgstr "Glan" -+ -+#: compose.c:145 -+msgid " (inline)" -+msgstr " (inlíne)" -+ -+#: compose.c:147 -+msgid " (PGP/MIME)" -+msgstr " (PGP/MIME)" -+ -+#: compose.c:155 compose.c:159 -+msgid " sign as: " -+msgstr " sínigh mar: " -+ -+#: compose.c:155 compose.c:159 -+msgid "" -+msgstr "" -+ -+#: compose.c:167 -+msgid "Encrypt with: " -+msgstr "Criptigh le: " -+ -+#: compose.c:221 -+#, c-format -+msgid "%s [#%d] no longer exists!" -+msgstr "níl %s [#%d] ann níos mó!" -+ -+#: compose.c:229 -+#, c-format -+msgid "%s [#%d] modified. Update encoding?" -+msgstr "Mionathraíodh %s [#%d]. Nuashonraigh a ionchódú?" -+ -+#: compose.c:272 -+msgid "-- Attachments" -+msgstr "-- Iatáin" -+ -+#: compose.c:302 -+#, c-format -+msgid "Warning: '%s' is a bad IDN." -+msgstr "Rabhadh: is drochIDN '%s'." -+ -+#: compose.c:325 -+msgid "You may not delete the only attachment." -+msgstr "Ní féidir leat an t-iatán amháin a scriosadh." -+ -+#: compose.c:601 send.c:1492 -+#, c-format -+msgid "Bad IDN in \"%s\": '%s'" -+msgstr "DrochIDN i \"%s\": '%s'" -+ -+#: compose.c:684 -+msgid "Attaching selected files..." -+msgstr "Comhaid roghnaithe á gceangal..." -+ -+#: compose.c:696 -+#, c-format -+msgid "Unable to attach %s!" -+msgstr "Ní féidir %s a cheangal!" -+ -+#: compose.c:715 -+msgid "Open mailbox to attach message from" -+msgstr "Oscail an bosca poist as a gceanglóidh tú teachtaireacht" -+ -+#: compose.c:753 -+msgid "No messages in that folder." -+msgstr "Níl aon teachtaireacht san fhillteán sin." -+ -+#: compose.c:762 -+msgid "Tag the messages you want to attach!" -+msgstr "Clibeáil na teachtaireachtaí le ceangal!" -+ -+#: compose.c:794 -+msgid "Unable to attach!" -+msgstr "Ní féidir a cheangal!" -+ -+#: compose.c:845 -+msgid "Recoding only affects text attachments." -+msgstr "Téann ath-ionchódú i bhfeidhm ar iatáin téacs amháin." -+ -+#: compose.c:850 -+msgid "The current attachment won't be converted." -+msgstr "Ní thiontófar an t-iatán reatha." -+ -+#: compose.c:852 -+msgid "The current attachment will be converted." -+msgstr "Tiontófar an t-iatán reatha." -+ -+#: compose.c:927 -+msgid "Invalid encoding." -+msgstr "Ionchódú neamhbhailí." -+ -+#: compose.c:953 -+msgid "Save a copy of this message?" -+msgstr "Sábháil cóip den teachtaireacht seo?" -+ -+#: compose.c:1009 -+msgid "Rename to: " -+msgstr "Athainmnigh go: " -+ -+#: compose.c:1014 editmsg.c:116 sendlib.c:856 -+#, c-format -+msgid "Can't stat %s: %s" -+msgstr "ní féidir %s a `stat': %s" -+ -+#: compose.c:1041 -+msgid "New file: " -+msgstr "Comhad nua: " -+ -+#: compose.c:1054 -+msgid "Content-Type is of the form base/sub" -+msgstr "Is san fhoirm base/sub é Content-Type" -+ -+#: compose.c:1060 -+#, c-format -+msgid "Unknown Content-Type %s" -+msgstr "Content-Type anaithnid %s" -+ -+#: compose.c:1073 -+#, c-format -+msgid "Can't create file %s" -+msgstr "Ní féidir an comhad %s a chruthú" -+ -+#: compose.c:1081 -+msgid "What we have here is a failure to make an attachment" -+msgstr "Ní féidir iatán a chruthú" -+ -+#: compose.c:1142 -+msgid "Postpone this message?" -+msgstr "Cuir an teachtaireacht ar athlá?" -+ -+#: compose.c:1201 -+msgid "Write message to mailbox" -+msgstr "Scríobh teachtaireacht sa bhosca poist" -+ -+#: compose.c:1204 -+#, c-format -+msgid "Writing message to %s ..." -+msgstr "Teachtaireacht á scríobh i %s ..." -+ -+#: compose.c:1213 -+msgid "Message written." -+msgstr "Teachtaireacht scríofa." -+ -+#: compose.c:1225 -+msgid "S/MIME already selected. Clear & continue ? " -+msgstr "S/MIME roghnaithe cheana. Glan agus lean ar aghaidh? " -+ -+#: compose.c:1251 -+msgid "PGP already selected. Clear & continue ? " -+msgstr "PGP roghnaithe cheana. Glan agus lean ar aghaidh? " -+ -+#: crypt-gpgme.c:335 -+#, c-format -+msgid "error creating gpgme context: %s\n" -+msgstr "earráid agus comhthéacs gpgme á chruthú: %s\n" -+ -+#: crypt-gpgme.c:345 -+#, c-format -+msgid "error enabling CMS protocol: %s\n" -+msgstr "earráid agus prótacal CMS á chumasú: %s\n" -+ -+#: crypt-gpgme.c:365 -+#, c-format -+msgid "error creating gpgme data object: %s\n" -+msgstr "earráid agus réad gpgme á chruthú: %s\n" -+ -+#: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327 -+#, c-format -+msgid "error allocating data object: %s\n" -+msgstr "earráid agus réad á dháileadh: %s\n" -+ -+#: crypt-gpgme.c:467 -+#, c-format -+msgid "error rewinding data object: %s\n" -+msgstr "earráid agus réad á atochras: %s\n" -+ -+#: crypt-gpgme.c:489 crypt-gpgme.c:536 -+#, c-format -+msgid "error reading data object: %s\n" -+msgstr "earráid agus réad á léamh: %s\n" -+ -+#: crypt-gpgme.c:597 -+#, c-format -+msgid "error adding recipient `%s': %s\n" -+msgstr "earráid agus faighteoir `%s' á chur leis: %s\n" -+ -+#: crypt-gpgme.c:635 -+#, c-format -+msgid "secret key `%s' not found: %s\n" -+msgstr "eochair rúnda `%s' gan aimsiú: %s\n" -+ -+#: crypt-gpgme.c:645 -+#, c-format -+msgid "ambiguous specification of secret key `%s'\n" -+msgstr "sonrú débhríoch d'eochair rúnda `%s'\n" -+ -+#: crypt-gpgme.c:657 -+#, c-format -+msgid "error setting secret key `%s': %s\n" -+msgstr "earráid agus eochair rúnda á shocrú `%s': %s\n" -+ -+#: crypt-gpgme.c:701 -+#, c-format -+msgid "error encrypting data: %s\n" -+msgstr "earráid agus sonraí á gcriptiú: %s\n" -+ -+#: crypt-gpgme.c:798 -+#, c-format -+msgid "error signing data: %s\n" -+msgstr "earráid agus sonraí á síniú: %s\n" -+ -+#: crypt-gpgme.c:993 -+msgid "Warning: One of the keys has been revoked\n" -+msgstr "Rabhadh: Cealaíodh ceann amháin de na heochracha\n" -+ -+#: crypt-gpgme.c:1002 -+msgid "Warning: The key used to create the signature expired at: " -+msgstr "Rabhadh: D'imigh an eochair lena gcruthaíodh an síniú as feidhm ar: " -+ -+#: crypt-gpgme.c:1008 -+msgid "Warning: At least one certification key has expired\n" -+msgstr "Rabhadh: D'imigh eochair amháin deimhnithe as feidhm, ar a laghad\n" -+ -+#: crypt-gpgme.c:1024 -+msgid "Warning: The signature expired at: " -+msgstr "Rabhadh: D'imigh an síniú as feidhm ar: " -+ -+#: crypt-gpgme.c:1030 -+msgid "Can't verify due to a missing key or certificate\n" -+msgstr "Ní féidir fíorú de bharr eochair nó teastas ar iarraidh\n" -+ -+#: crypt-gpgme.c:1035 -+msgid "The CRL is not available\n" -+msgstr "Níl an CRL ar fáil\n" -+ -+#: crypt-gpgme.c:1041 -+msgid "Available CRL is too old\n" -+msgstr "Is róshean an CRL le fáil\n" -+ -+#: crypt-gpgme.c:1046 -+msgid "A policy requirement was not met\n" -+msgstr "Níor freastalaíodh ar riachtanas polasaí\n" -+ -+#: crypt-gpgme.c:1055 -+msgid "A system error occurred" -+msgstr "Tharla earráid chórais" -+ -+#: crypt-gpgme.c:1092 crypt-gpgme.c:3036 -+msgid "Fingerprint: " -+msgstr "Méarlorg: " -+ -+#: crypt-gpgme.c:1152 -+msgid "" -+"WARNING: We have NO indication whether the key belongs to the person named as " -+"shown above\n" -+msgstr "" -+"RABHADH: Níl fianaise AR BITH againn go bhfuil an eochair ag an duine " -+"ainmnithe thuas\n" -+ -+#: crypt-gpgme.c:1159 -+msgid "WARNING: The key does NOT BELONG to the person named as shown above\n" -+msgstr "RABHADH: NÍL an eochair ag an duine ainmnithe thuas\n" -+ -+#: crypt-gpgme.c:1163 -+msgid "" -+"WARNING: It is NOT certain that the key belongs to the person named as shown " -+"above\n" -+msgstr "" -+"RABHADH: NÍL mé cinnte go bhfuil an eochair ag an duine ainmnithe thuas\n" -+ -+#: crypt-gpgme.c:1238 -+msgid "Error getting key information: " -+msgstr "Earráid agus eolas faoin eochair á fháil: " -+ -+#. ultimate). -+#: crypt-gpgme.c:1245 crypt-gpgme.c:1278 -+msgid "Good signature from: " -+msgstr "Síniú maith ó: " -+ -+#: crypt-gpgme.c:1255 -+msgid " aka: " -+msgstr "ar a dtugtar freisin: " -+ -+#: crypt-gpgme.c:1259 crypt-gpgme.c:1281 -+msgid " created: " -+msgstr " cruthaithe: " -+ -+#: crypt-gpgme.c:1268 -+msgid "*BAD* signature claimed to be from: " -+msgstr "*DROCH*shíniú a dhearbhaítear a bheith ó: " -+ -+#: crypt-gpgme.c:1291 -+msgid "Error checking signature" -+msgstr "Earráid agus an síniú á sheiceáil" -+ -+#. data. -+#: crypt-gpgme.c:1335 crypt-gpgme.c:1539 crypt-gpgme.c:2031 -+msgid "[-- Begin signature information --]\n" -+msgstr "[-- Tosú ar eolas faoin síniú --]\n" -+ -+#: crypt-gpgme.c:1344 -+msgid "Error: verification failed: %s\n" -+msgstr "Earráid: theip ar fhíorú: %s\n" -+ -+#: crypt-gpgme.c:1386 -+#, c-format -+msgid "*** Begin Notation (signature by: %s) ***\n" -+msgstr "*** Tosú na Nodaireachta (sínithe ag: %s) ***\n" -+ -+#: crypt-gpgme.c:1405 -+msgid "*** End Notation ***\n" -+msgstr "*** Deireadh na Nodaireachta ***\n" -+ -+#: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046 -+msgid "" -+"[-- End signature information --]\n" -+"\n" -+msgstr "" -+"[-- Deireadh an eolais faoin síniú --\n" -+"\n" -+ -+#: crypt-gpgme.c:1507 -+#, c-format -+msgid "" -+"[-- Error: decryption failed: %s --]\n" -+"\n" -+msgstr "" -+"[-- Earráid: theip ar dhíchriptiú: %s --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2006 -+#, c-format -+msgid "Error: decryption/verification failed: %s\n" -+msgstr "Earráid: theip ar dhíchriptiú/fhíorú: %s\n" -+ -+#: crypt-gpgme.c:2054 -+msgid "Error: copy data failed\n" -+msgstr "Earráid: theip ar chóipeáil na sonraí\n" -+ -+#: crypt-gpgme.c:2074 pgp.c:410 -+msgid "" -+"[-- BEGIN PGP MESSAGE --]\n" -+"\n" -+msgstr "" -+"[-- TOSACH TEACHTAIREACHTA PGP --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2076 pgp.c:412 -+msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" -+msgstr "[-- TOSAIGH BLOC NA hEOCHRACH POIBLÍ PGP --]\n" -+ -+#: crypt-gpgme.c:2079 pgp.c:414 -+msgid "" -+"[-- BEGIN PGP SIGNED MESSAGE --]\n" -+"\n" -+msgstr "" -+"[-- TOSACH TEACHTAIREACHTA PGP SÍNITHE --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2106 pgp.c:440 -+msgid "[-- END PGP MESSAGE --]\n" -+msgstr "[-- DEIREADH TEACHTAIREACHTA PGP --]\n" -+ -+#: crypt-gpgme.c:2108 pgp.c:444 -+msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" -+msgstr "[-- CRÍOCH BHLOC NA hEOCHRACH POIBLÍ PGP --]\n" -+ -+#: crypt-gpgme.c:2110 pgp.c:446 -+msgid "[-- END PGP SIGNED MESSAGE --]\n" -+msgstr "[-- DEIREADH NA TEACHTAIREACHTA SÍNITHE PGP --]\n" -+ -+#: crypt-gpgme.c:2131 pgp.c:476 -+msgid "" -+"[-- Error: could not find beginning of PGP message! --]\n" -+"\n" -+msgstr "" -+"[-- Earráid: níorbh fhéidir tosach na teachtaireachta PGP a aimsiú! --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2162 pgp.c:905 -+msgid "" -+"[-- Error: malformed PGP/MIME message! --]\n" -+"\n" -+msgstr "" -+"[-- Earráid: teachtaireacht mhíchumtha PGP/MIME! --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:918 -+msgid "[-- Error: could not create temporary file! --]\n" -+msgstr "[-- Earráid: ní féidir comhad sealadach a chruthú! --]\n" -+ -+#: crypt-gpgme.c:2186 -+msgid "" -+"[-- The following data is PGP/MIME signed and encrypted --]\n" -+"\n" -+msgstr "" -+"[-- Is sínithe agus criptithe le PGP/MIME iad na sonraí a leanas --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2187 pgp.c:927 -+msgid "" -+"[-- The following data is PGP/MIME encrypted --]\n" -+"\n" -+msgstr "" -+"[-- Is criptithe le PGP/MIME iad na sonraí a leanas --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2209 -+msgid "[-- End of PGP/MIME signed and encrypted data --]\n" -+msgstr "[-- Deireadh na sonraí sínithe agus criptithe le PGP/MIME --]\n" -+ -+#: crypt-gpgme.c:2210 pgp.c:947 -+msgid "[-- End of PGP/MIME encrypted data --]\n" -+msgstr "[-- Deireadh na sonraí criptithe le PGP/MIME --]\n" -+ -+#: crypt-gpgme.c:2252 -+msgid "" -+"[-- The following data is S/MIME signed --]\n" -+"\n" -+msgstr "" -+"[-- Is sínithe le S/MIME iad na sonraí a leanas --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2253 -+msgid "" -+"[-- The following data is S/MIME encrypted --]\n" -+"\n" -+msgstr "" -+"[-- Is criptithe le S/MIME iad na sonraí a leanas --]\n" -+"\n" -+ -+#: crypt-gpgme.c:2283 -+msgid "[-- End of S/MIME signed data --]\n" -+msgstr "[-- Deireadh na sonraí sínithe le S/MIME --]\n" -+ -+#: crypt-gpgme.c:2284 -+msgid "[-- End of S/MIME encrypted data --]\n" -+msgstr "[-- Deireadh na sonraí criptithe le S/MIME --]\n" -+ -+#: crypt-gpgme.c:2876 -+msgid "[Can't display this user ID (unknown encoding)]" -+msgstr "" -+"[Ní féidir an t-aitheantas úsáideora a thaispeáint (ionchódú anaithnid)]" -+ -+#: crypt-gpgme.c:2878 -+msgid "[Can't display this user ID (invalid encoding)]" -+msgstr "" -+"[Ní féidir an t-aitheantas úsáideora a thaispeáint (ionchódú neamhbhailí)]" -+ -+#: crypt-gpgme.c:2883 -+msgid "[Can't display this user ID (invalid DN)]" -+msgstr "[Ní féidir an t-aitheantas úsáideora a thaispeáint (DN neamhbhailí)]" -+ -+#: crypt-gpgme.c:2962 -+msgid " aka ......: " -+msgstr " ar a dtugtar freisin ...:" -+ -+#: crypt-gpgme.c:2962 -+msgid "Name ......: " -+msgstr "Ainm ......: " -+ -+#: crypt-gpgme.c:2965 crypt-gpgme.c:3104 -+msgid "[Invalid]" -+msgstr "[Neamhbhailí]" -+ -+#: crypt-gpgme.c:2985 crypt-gpgme.c:3128 -+#, c-format -+msgid "Valid From : %s\n" -+msgstr "Bailí Ó : %s\n" -+ -+#: crypt-gpgme.c:2998 crypt-gpgme.c:3141 -+#, c-format -+msgid "Valid To ..: %s\n" -+msgstr "Bailí Go ..: %s\n" -+ -+#: crypt-gpgme.c:3011 crypt-gpgme.c:3154 -+#, c-format -+msgid "Key Type ..: %s, %lu bit %s\n" -+msgstr "Cineál na hEochrach ..: %s, %lu giotán %s\n" -+ -+#: crypt-gpgme.c:3013 crypt-gpgme.c:3156 -+#, c-format -+msgid "Key Usage .: " -+msgstr "Úsáid Eochrach .: " -+ -+#: crypt-gpgme.c:3018 crypt-gpgme.c:3161 -+msgid "encryption" -+msgstr "criptiúchán" -+ -+#: 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 "síniú" -+ -+#: crypt-gpgme.c:3028 crypt-gpgme.c:3171 -+msgid "certification" -+msgstr "deimhniú" -+ -+#: crypt-gpgme.c:3068 -+#, c-format -+msgid "Serial-No .: 0x%s\n" -+msgstr "Sraithuimhir .: 0x%s\n" -+ -+#: crypt-gpgme.c:3076 -+#, c-format -+msgid "Issued By .: " -+msgstr "Eisithe Ag .: " -+ -+#. display only the short keyID -+#: crypt-gpgme.c:3095 -+#, c-format -+msgid "Subkey ....: 0x%s" -+msgstr "Fo-eochair ....: 0x%s" -+ -+#: crypt-gpgme.c:3099 -+msgid "[Revoked]" -+msgstr "[Aisghairthe]" -+ -+#: crypt-gpgme.c:3109 -+msgid "[Expired]" -+msgstr "[As Feidhm]" -+ -+#: crypt-gpgme.c:3114 -+msgid "[Disabled]" -+msgstr "[Díchumasaithe]" -+ -+#: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739 -+msgid "Can't create temporary file" -+msgstr "Ní féidir comhad sealadach a chruthú" -+ -+#: crypt-gpgme.c:3201 -+msgid "Collecting data..." -+msgstr "Sonraí á mbailiú..." -+ -+#: crypt-gpgme.c:3227 -+#, c-format -+msgid "Error finding issuer key: %s\n" -+msgstr "Earráid agus eochair an eisitheora á aimsiú: %s\n" -+ -+#: crypt-gpgme.c:3237 -+msgid "Error: certification chain to long - stopping here\n" -+msgstr "Earráid: slabhra rófhada deimhnithe - á stopadh anseo\n" -+ -+#: crypt-gpgme.c:3248 pgpkey.c:580 -+#, c-format -+msgid "Key ID: 0x%s" -+msgstr "Aitheantas na heochrach: 0x%s" -+ -+#: crypt-gpgme.c:3331 -+#, c-format -+msgid "gpgme_new failed: %s" -+msgstr "Theip ar gpgme_new: %s" -+ -+#: crypt-gpgme.c:3370 crypt-gpgme.c:3433 -+#, c-format -+msgid "gpgme_op_keylist_start failed: %s" -+msgstr "theip ar gpgme_op_keylist_start: %s" -+ -+#: crypt-gpgme.c:3420 crypt-gpgme.c:3461 -+#, c-format -+msgid "gpgme_op_keylist_next failed: %s" -+msgstr "theip ar gpgme_op_keylist_next: %s" -+ -+#: crypt-gpgme.c:3532 -+msgid "All matching keys are marked expired/revoked." -+msgstr "Tá gach eochair chomhoiriúnach marcáilte mar as feidhm/aisghairthe." -+ -+#: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514 -+#: smime.c:431 -+msgid "Exit " -+msgstr "Scoir " -+ -+#. __STRCAT_CHECKED__ -+#: crypt-gpgme.c:3563 pgpkey.c:516 smime.c:433 -+msgid "Select " -+msgstr "Roghnaigh " -+ -+#. __STRCAT_CHECKED__ -+#: crypt-gpgme.c:3566 pgpkey.c:519 -+msgid "Check key " -+msgstr "Seiceáil eochair " -+ -+#: crypt-gpgme.c:3583 -+msgid "PGP and S/MIME keys matching" -+msgstr "Eochracha PGP agus S/MIME atá comhoiriúnach le" -+ -+#: crypt-gpgme.c:3585 -+msgid "PGP keys matching" -+msgstr "Eochracha PGP atá comhoiriúnach le" -+ -+#: crypt-gpgme.c:3587 -+msgid "S/MIME keys matching" -+msgstr "Eochracha S/MIME atá comhoiriúnach le" -+ -+#: crypt-gpgme.c:3589 -+msgid "keys matching" -+msgstr "eochracha atá comhoiriúnach le" -+ -+#: 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 "Ní féidir an eochair seo a úsáid: as feidhm/díchumasaithe/aisghairthe." -+ -+#: crypt-gpgme.c:3635 pgpkey.c:612 -+msgid "ID is expired/disabled/revoked." -+msgstr "Is as feidhm/díchumasaithe/aisghairthe é an ID." -+ -+#: crypt-gpgme.c:3655 pgpkey.c:616 -+msgid "ID has undefined validity." -+msgstr "ID gan bailíocht chinnte." -+ -+#: crypt-gpgme.c:3658 pgpkey.c:619 -+msgid "ID is not valid." -+msgstr "Níl an ID bailí." -+ -+#: crypt-gpgme.c:3661 pgpkey.c:622 -+msgid "ID is only marginally valid." -+msgstr "Is ar éigean atá an ID bailí" -+ -+#: crypt-gpgme.c:3669 pgpkey.c:626 -+#, c-format -+msgid "%s Do you really want to use the key?" -+msgstr "%s An bhfuil tú cinnte gur mhaith leat an eochair seo a úsáid?" -+ -+#: crypt-gpgme.c:3726 crypt-gpgme.c:3839 pgpkey.c:839 pgpkey.c:955 -+#, c-format -+msgid "Looking for keys matching \"%s\"..." -+msgstr "Ag cuardach ar eochracha atá comhoiriúnach le \"%s\"..." -+ -+#: crypt-gpgme.c:4002 pgp.c:1154 -+#, c-format -+msgid "Use keyID = \"%s\" for %s?" -+msgstr "Úsáid keyID = \"%s\" le haghaidh %s?" -+ -+#: crypt-gpgme.c:4038 pgp.c:1188 smime.c:665 smime.c:790 -+#, c-format -+msgid "Enter keyID for %s: " -+msgstr "Iontráil keyID le haghaidh %s: " -+ -+#: crypt-gpgme.c:4103 -+msgid "" -+"\n" -+"Using GPGME backend, although no gpg-agent is running" -+msgstr "" -+"\n" -+"Inneall GPGME in úsáid, cé nach bhfuil gpg-agent ag rith" -+ -+#: crypt-gpgme.c:4131 -+msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?" -+msgstr "S/MIME (c)ript, (s)ínigh, sínigh (m)ar, (a)raon, (p)gp, nó (g)lan?" -+ -+#: crypt-gpgme.c:4132 -+msgid "esabpfc" -+msgstr "csmapg" -+ -+#: crypt-gpgme.c:4135 -+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?" -+msgstr "PGP (c)ript, (s)ínigh, sínigh (m)ar, (a)raon, s/m(i)me, nó (g)lan?" -+ -+#: crypt-gpgme.c:4136 -+msgid "esabmfc" -+msgstr "csmaig" -+ -+#. sign (a)s -+#: crypt-gpgme.c:4152 pgp.c:1563 smime.c:1990 -+msgid "Sign as: " -+msgstr "Sínigh mar: " -+ -+#: crypt-gpgme.c:4249 -+msgid "Failed to verify sender" -+msgstr "Theip ar fhíorú an tseoltóra" -+ -+#: crypt-gpgme.c:4252 -+msgid "Failed to figure out sender" -+msgstr "Theip ar dhéanamh amach an tseoltóra" -+ -+#: crypt.c:69 -+#, c-format -+msgid " (current time: %c)" -+msgstr " (an t-am anois: %c)" -+ -+#: crypt.c:75 -+#, c-format -+msgid "[-- %s output follows%s --]\n" -+msgstr "[-- an t-aschur %s:%s --]\n" -+ -+#: crypt.c:90 -+msgid "Passphrase(s) forgotten." -+msgstr "Rinneadh dearmad ar an bhfrása faire." -+ -+#. they really want to send it inline... go for it -+#: crypt.c:147 cryptglue.c:110 pgpkey.c:563 -+msgid "Invoking PGP..." -+msgstr "PGP á thosú..." -+ -+#. otherwise inline won't work...ask for revert -+#: crypt.c:156 -+msgid "Message can't be sent inline. Revert to using PGP/MIME?" -+msgstr "Ní féidir an teachtaireacht a sheoladh inlíne. Úsáid PGP/MIME?" -+ -+#. abort -+#: crypt.c:158 send.c:1444 -+msgid "Mail not sent." -+msgstr "Níor seoladh an post." -+ -+#: crypt.c:397 -+msgid "S/MIME messages with no hints on content are unsupported." -+msgstr "" -+"Ní ghlacann le teachtaireachtaí S/MIME gan leideanna maidir lena n-inneachar." -+ -+#: crypt.c:616 crypt.c:660 -+msgid "Trying to extract PGP keys...\n" -+msgstr "Ag baint triail as eochracha PGP a bhaint amach...\n" -+ -+#: crypt.c:640 crypt.c:680 -+msgid "Trying to extract S/MIME certificates...\n" -+msgstr "Ag baint triail as teastais S/MIME a bhaint amach...\n" -+ -+#: crypt.c:802 -+msgid "" -+"[-- Error: Inconsistent multipart/signed structure! --]\n" -+"\n" -+msgstr "" -+"[-- Earráid: Struchtúr neamhréireach multipart/signed! --]\n" -+"\n" -+ -+#: crypt.c:823 -+#, c-format -+msgid "" -+"[-- Error: Unknown multipart/signed protocol %s! --]\n" -+"\n" -+msgstr "" -+"[-- Earráid: Prótacal anaithnid multipart/signed %s! --]\n" -+"\n" -+ -+#: crypt.c:862 -+#, c-format -+msgid "" -+"[-- Warning: We can't verify %s/%s signatures. --]\n" -+"\n" -+msgstr "" -+"[-- Rabhadh: Ní féidir %s/%s síniú a fhíorú. --]\n" -+"\n" -+ -+#. Now display the signed body -+#: crypt.c:874 -+msgid "" -+"[-- The following data is signed --]\n" -+"\n" -+msgstr "" -+"[-- Is sínithe iad na sonraí a leanas --]\n" -+"\n" -+ -+#: crypt.c:880 -+msgid "" -+"[-- Warning: Can't find any signatures. --]\n" -+"\n" -+msgstr "" -+"[-- Rabhadh: Ní féidir aon síniú a aimsiú. --]\n" -+"\n" -+ -+#: crypt.c:886 -+msgid "" -+"\n" -+"[-- End of signed data --]\n" -+msgstr "" -+"\n" -+"[-- Deireadh na sonraí sínithe --]\n" -+ -+#: cryptglue.c:89 -+msgid "\"crypt_use_gpgme\" set but not build with GPGME support." -+msgstr "" -+"is socraithe \"crypt_use_gpgme\" ach níor tiomsaíodh le tacaíocht GPGME." -+ -+#: cryptglue.c:112 -+msgid "Invoking S/MIME..." -+msgstr "S/MIME á thosú..." -+ -+#: curs_lib.c:188 -+msgid "yes" -+msgstr "is sea" -+ -+#: curs_lib.c:189 -+msgid "no" -+msgstr "ní hea" -+ -+#. restore blocking operation -+#: curs_lib.c:285 -+msgid "Exit Mutt?" -+msgstr "Scoir Mutt?" -+ -+#: curs_lib.c:410 mutt_socket.c:530 mutt_ssl.c:328 -+msgid "unknown error" -+msgstr "earráid anaithnid" -+ -+#: curs_lib.c:430 -+msgid "Press any key to continue..." -+msgstr "Brúigh eochair ar bith chun leanúint..." -+ -+#: curs_lib.c:474 -+msgid " ('?' for list): " -+msgstr " ('?' le haghaidh liosta): " -+ -+#: curs_main.c:52 curs_main.c:624 curs_main.c:654 -+msgid "No mailbox is open." -+msgstr "Níl aon bhosca poist oscailte." -+ -+#: curs_main.c:53 -+msgid "There are no messages." -+msgstr "Níl aon teachtaireacht ann." -+ -+#: curs_main.c:54 mx.c:1135 pager.c:58 recvattach.c:44 -+msgid "Mailbox is read-only." -+msgstr "Tá an bosca poist léimh amháin." -+ -+#: curs_main.c:55 pager.c:59 recvattach.c:873 -+msgid "Function not permitted in attach-message mode." -+msgstr "Ní cheadaítear an fheidhm seo sa mhód iatáin." -+ -+#: curs_main.c:56 -+msgid "No visible messages." -+msgstr "Níl aon teachtaireacht le feiceáil." -+ -+#: curs_main.c:256 -+msgid "Cannot toggle write on a readonly mailbox!" -+msgstr "Ní féidir 'scríobh' a scoránú ar bhosca poist léimh-amháin!" -+ -+#: curs_main.c:263 -+msgid "Changes to folder will be written on folder exit." -+msgstr "Scríobhfar na hathruithe agus an fillteán á dhúnadh." -+ -+#: curs_main.c:268 -+msgid "Changes to folder will not be written." -+msgstr "Ní scríobhfar na hathruithe." -+ -+#: curs_main.c:406 -+msgid "Quit" -+msgstr "Scoir" -+ -+#: curs_main.c:409 recvattach.c:55 -+msgid "Save" -+msgstr "Sábháil" -+ -+#: curs_main.c:410 query.c:49 -+msgid "Mail" -+msgstr "Post" -+ -+#: curs_main.c:411 pager.c:1491 -+msgid "Reply" -+msgstr "Freagair" -+ -+#: curs_main.c:412 -+msgid "Group" -+msgstr "Grúpa" -+ -+#: curs_main.c:501 -+msgid "Mailbox was externally modified. Flags may be wrong." -+msgstr "" -+"Mionathraíodh an bosca poist go seachtrach. Is féidir go bhfuil bratacha " -+"míchearta ann." -+ -+#: curs_main.c:504 -+msgid "New mail in this mailbox." -+msgstr "Post nua sa bhosca seo." -+ -+#: curs_main.c:508 -+msgid "Mailbox was externally modified." -+msgstr "Mionathraíodh an bosca poist go seachtrach." -+ -+#: curs_main.c:630 -+msgid "No tagged messages." -+msgstr "Níl aon teachtaireacht chlibeáilte." -+ -+#: curs_main.c:666 menu.c:900 -+msgid "Nothing to do." -+msgstr "Níl faic le déanamh." -+ -+#: curs_main.c:752 -+msgid "Jump to message: " -+msgstr "Léim go teachtaireacht: " -+ -+#: curs_main.c:758 -+msgid "Argument must be a message number." -+msgstr "Caithfidh an argóint a bheith ina huimhir theachtaireachta." -+ -+#: curs_main.c:791 -+msgid "That message is not visible." -+msgstr "Níl an teachtaireacht sin infheicthe." -+ -+#: curs_main.c:794 -+msgid "Invalid message number." -+msgstr "Uimhir theachtaireachta neamhbhailí." -+ -+#: curs_main.c:813 -+msgid "Delete messages matching: " -+msgstr "Scrios teachtaireachtaí atá comhoiriúnach le: " -+ -+#: curs_main.c:835 -+msgid "No limit pattern is in effect." -+msgstr "Níl aon phatrún teorannaithe i bhfeidhm." -+ -+#. i18n: ask for a limit to apply -+#: curs_main.c:840 -+#, c-format -+msgid "Limit: %s" -+msgstr "Teorainn: %s" -+ -+#: curs_main.c:850 -+msgid "Limit to messages matching: " -+msgstr "Teorannaigh go teachtaireachtaí atá comhoiriúnach le: " -+ -+#: curs_main.c:882 -+msgid "Quit Mutt?" -+msgstr "Scoir Mutt?" -+ -+#: curs_main.c:966 -+msgid "Tag messages matching: " -+msgstr "Clibeáil teachtaireachtaí atá comhoiriúnach le: " -+ -+#: curs_main.c:980 -+msgid "Undelete messages matching: " -+msgstr "Díscrios teachtaireachtaí atá comhoiriúnach le: " -+ -+#: curs_main.c:988 -+msgid "Untag messages matching: " -+msgstr "Díchlibeáil teachtaireachtaí atá comhoiriúnach le: " -+ -+#: curs_main.c:1067 -+msgid "Open mailbox in read-only mode" -+msgstr "Oscail bosca poist i mód léimh amháin" -+ -+#: curs_main.c:1069 -+msgid "Open mailbox" -+msgstr "Oscail bosca poist" -+ -+#: curs_main.c:1085 mx.c:512 mx.c:658 -+#, c-format -+msgid "%s is not a mailbox." -+msgstr "Ní bosca poist é %s." -+ -+#: curs_main.c:1180 -+msgid "Exit Mutt without saving?" -+msgstr "Éirigh as Mutt gan sábháil?" -+ -+#: curs_main.c:1198 curs_main.c:1230 curs_main.c:1692 curs_main.c:1724 -+#: flags.c:293 thread.c:1022 thread.c:1077 thread.c:1132 -+msgid "Threading is not enabled." -+msgstr "Snáithe gan cumasú." -+ -+#: curs_main.c:1210 -+msgid "Thread broken" -+msgstr "Snáithe briste" -+ -+#: curs_main.c:1232 -+msgid "No Message-ID: header available to link thread" -+msgstr "Gan cheanntásc `Message-ID:'; ní féidir an snáithe a nasc" -+ -+#: curs_main.c:1234 -+msgid "First, please tag a message to be linked here" -+msgstr "Ar dtús, clibeáil teachtaireacht le nascadh anseo" -+ -+#: curs_main.c:1246 -+msgid "Threads linked" -+msgstr "Snáitheanna nasctha" -+ -+#: curs_main.c:1249 -+msgid "No thread linked" -+msgstr "Níor nascadh snáithe" -+ -+#: curs_main.c:1285 curs_main.c:1310 -+msgid "You are on the last message." -+msgstr "An teachtaireacht deiridh." -+ -+#: curs_main.c:1292 curs_main.c:1336 -+msgid "No undeleted messages." -+msgstr "Níl aon teachtaireacht nach scriosta." -+ -+#: curs_main.c:1329 curs_main.c:1353 -+msgid "You are on the first message." -+msgstr "An chéad teachtaireacht." -+ -+#: curs_main.c:1428 pattern.c:1361 -+msgid "Search wrapped to top." -+msgstr "Thimfhill an cuardach go dtí an barr." -+ -+#: curs_main.c:1437 pattern.c:1372 -+msgid "Search wrapped to bottom." -+msgstr "Thimfhill an cuardach go dtí an bun." -+ -+#: curs_main.c:1478 -+msgid "No new messages" -+msgstr "Níl aon teachtaireacht nua" -+ -+#: curs_main.c:1478 -+msgid "No unread messages" -+msgstr "Níl aon teachtaireacht gan léamh" -+ -+#: curs_main.c:1479 -+msgid " in this limited view" -+msgstr " san amharc teoranta seo" -+ -+#: curs_main.c:1500 pager.c:2403 -+msgid "Can't change 'important' flag on POP server." -+msgstr "Ní féidir an bhratach 'important' a athrú ar fhreastalaí POP." -+ -+#: curs_main.c:1624 -+msgid "No more threads." -+msgstr "Níl aon snáithe eile." -+ -+#: curs_main.c:1626 -+msgid "You are on the first thread." -+msgstr "Is an chéad snáithe é seo." -+ -+#: curs_main.c:1710 -+msgid "Thread contains unread messages." -+msgstr "Tá teachtaireachtaí gan léamh sa snáithe seo." -+ -+#: curs_main.c:1897 -+msgid "Can't edit message on POP server." -+msgstr "Ní féidir teachtaireacht a chur in eagar ar fhreastalaí POP." -+ -+#. * 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" -+"~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\tionsáigh líne le ~ aonair i dtosach\n" -+"~b úsáideoirí\tcuir úsáideoirí leis an réimse Bcc:\n" -+"~c úsáideoirí\tcuir úsáideoirí leis an réimse Cc:\n" -+"~f tchtaí\tcuir teachtaireachtaí san áireamh\n" -+"~F tchtaí\tar comhbhrí le ~f, ach le ceanntásca\n" -+"~h\t\tcuir an ceanntásc in eagar\n" -+"~m tchtaí\tcuir tchtaí athfhriotail san áireamh\n" -+"~M tchtaí\tar comhbhrí le ~m, ach le ceanntásca\n" -+"~p\t\tpriontáil an teachtaireacht\n" -+"~q\t\tscríobh an comhad agus scoir\n" -+"~r comhad\t\tléigh comhad isteach san eagarthóir\n" -+"~t úsáideoirí\tcuir úsáideoirí leis an réimse To:\n" -+"~u\t\taisghair an líne roimhe seo\n" -+"~v\t\tcuir an tcht in eagar le heagarthóir $visual\n" -+"~w comhad\t\twrite message to file\n" -+"~x\t\ttobscoir, ná sábháil na hathruithe\n" -+"~?\t\tan teachtaireacht seo\n" -+".\t\tar líne leis féin chun ionchur a stopadh\n" -+ -+#: edit.c:186 -+#, c-format -+msgid "%d: invalid message number.\n" -+msgstr "%d: uimhir theachtaireachtaí neamhbhailí.\n" -+ -+#: edit.c:328 -+msgid "(End message with a . on a line by itself)\n" -+msgstr "(Cuir an teachtaireacht i gcrích le . ar líne leis féin amháin)\n" -+ -+#: edit.c:386 -+msgid "No mailbox.\n" -+msgstr "Níl aon bhosca poist.\n" -+ -+#: edit.c:390 -+msgid "Message contains:\n" -+msgstr "Sa teachtaireacht:\n" -+ -+#: edit.c:394 edit.c:451 -+msgid "(continue)\n" -+msgstr "(lean ar aghaidh)\n" -+ -+#: edit.c:407 -+msgid "missing filename.\n" -+msgstr "ainm comhaid ar iarraidh.\n" -+ -+#: edit.c:427 -+msgid "No lines in message.\n" -+msgstr "Níl aon líne sa teachtaireacht.\n" -+ -+#: edit.c:444 -+#, c-format -+msgid "Bad IDN in %s: '%s'\n" -+msgstr "DrochIDN i %s: '%s'\n" -+ -+#: edit.c:462 -+#, c-format -+msgid "%s: unknown editor command (~? for help)\n" -+msgstr "%s: ordú anaithnid eagarthóra (~? = cabhair)\n" -+ -+#: editmsg.c:78 -+#, c-format -+msgid "could not create temporary folder: %s" -+msgstr "ní féidir fillteán sealadach %s a chruthú" -+ -+#: editmsg.c:90 -+#, c-format -+msgid "could not write temporary mail folder: %s" -+msgstr "níorbh fhéidir fillteán poist shealadach a chruthú: %s" -+ -+#: editmsg.c:107 -+#, c-format -+msgid "could not truncate temporary mail folder: %s" -+msgstr "níorbh fhéidir fillteán poist shealadach a theascadh: %s" -+ -+#: editmsg.c:122 -+msgid "Message file is empty!" -+msgstr "Is folamh an teachtaireacht!" -+ -+#: editmsg.c:129 -+msgid "Message not modified!" -+msgstr "Teachtaireacht gan athrú!" -+ -+#: editmsg.c:137 -+#, c-format -+msgid "Can't open message file: %s" -+msgstr "Níorbh fhéidir an comhad theachtaireachta %s a oscailt" -+ -+#: editmsg.c:144 editmsg.c:172 -+#, c-format -+msgid "Can't append to folder: %s" -+msgstr "Ní féidir aon rud a iarcheangal leis an fhillteán: %s" -+ -+#: editmsg.c:203 -+#, c-format -+msgid "Error. Preserving temporary file: %s" -+msgstr "Earráid. Ag caomhnú an chomhaid shealadaigh: %s" -+ -+#: flags.c:336 -+msgid "Set flag" -+msgstr "Socraigh bratach" -+ -+#: flags.c:336 -+msgid "Clear flag" -+msgstr "Glan bratach" -+ -+#: handler.c:1352 -+msgid "[-- Error: Could not display any parts of Multipart/Alternative! --]\n" -+msgstr "" -+"[-- Earráid: Níorbh fhéidir aon chuid de Multipart/Alternative a " -+"thaispeáint! --]\n" -+ -+#: handler.c:1469 -+#, c-format -+msgid "[-- Attachment #%d" -+msgstr "[-- Iatán #%d" -+ -+#: handler.c:1481 -+#, c-format -+msgid "[-- Type: %s/%s, Encoding: %s, Size: %s --]\n" -+msgstr "[-- Cineál: %s/%s, Ionchódú: %s, Méid: %s --]\n" -+ -+#: handler.c:1547 -+#, c-format -+msgid "[-- Autoview using %s --]\n" -+msgstr "[-- Uathamharc le %s --]\n" -+ -+#: handler.c:1548 -+#, c-format -+msgid "Invoking autoview command: %s" -+msgstr "Ordú uathamhairc á rith: %s" -+ -+#: handler.c:1580 -+#, c-format -+msgid "[-- Can't run %s. --]\n" -+msgstr "[-- Ní féidir %s a rith. --]\n" -+ -+#: handler.c:1599 handler.c:1620 -+#, c-format -+msgid "[-- Autoview stderr of %s --]\n" -+msgstr "[-- Uathamharc ar stderr de %s --]\n" -+ -+#: handler.c:1659 -+msgid "[-- Error: message/external-body has no access-type parameter --]\n" -+msgstr "" -+"[-- Earráid: níl aon pharaiméadar den chineál rochtana ag message/external-" -+"body --]\n" -+ -+#: handler.c:1678 -+#, c-format -+msgid "[-- This %s/%s attachment " -+msgstr "[-- Bhí an t-iatán seo %s/%s " -+ -+#: handler.c:1685 -+#, c-format -+msgid "(size %s bytes) " -+msgstr "(méid %s beart) " -+ -+#: handler.c:1687 -+msgid "has been deleted --]\n" -+msgstr "scriosta --]\n" -+ -+#: handler.c:1692 -+#, c-format -+msgid "[-- on %s --]\n" -+msgstr "[-- ar %s --]\n" -+ -+#: handler.c:1697 -+#, c-format -+msgid "[-- name: %s --]\n" -+msgstr "[-- ainm: %s --]\n" -+ -+#: handler.c:1710 handler.c:1726 -+#, c-format -+msgid "[-- This %s/%s attachment is not included, --]\n" -+msgstr "[-- Níor cuireadh an t-iatán seo %s/%s san áireamh, --]\n" -+ -+#: handler.c:1712 -+msgid "" -+"[-- and the indicated external source has --]\n" -+"[-- expired. --]\n" -+msgstr "" -+"[-- agus tá an fhoinse sheachtrach sainithe --]\n" -+"[-- i ndiaidh dul as feidhm. --]\n" -+ -+#: handler.c:1730 -+#, c-format -+msgid "[-- and the indicated access-type %s is unsupported --]\n" -+msgstr "[-- agus ní ghlacann leis an chineál shainithe rochtana %s --]\n" -+ -+#: handler.c:1841 -+msgid "Error: multipart/signed has no protocol." -+msgstr "Earráid: Níl aon phrótacal le haghaidh multipart/signed." -+ -+#: handler.c:1851 -+msgid "Error: multipart/encrypted has no protocol parameter!" -+msgstr "" -+"Earráid: Níl aon pharaiméadar prótacail le haghaidh multipart/encrypted!" -+ -+#: handler.c:1891 -+msgid "Unable to open temporary file!" -+msgstr "Níorbh fhéidir an comhad sealadach a oscailt!" -+ -+#: handler.c:1952 -+#, c-format -+msgid "[-- %s/%s is unsupported " -+msgstr "[-- %s/%s gan tacaíocht " -+ -+#: handler.c:1957 -+#, c-format -+msgid "(use '%s' to view this part)" -+msgstr "(bain úsáid as '%s' chun na páirte seo a fheiceáil)" -+ -+#: handler.c:1959 -+msgid "(need 'view-attachments' bound to key!)" -+msgstr "(ní foláir 'view-attachments' a cheangal le heochair!)" -+ -+#: headers.c:177 -+#, c-format -+msgid "%s: unable to attach file" -+msgstr "%s: ní féidir comhad a cheangal" -+ -+#: help.c:282 -+msgid "ERROR: please report this bug" -+msgstr "Earráid: seol tuairisc fhabht, le do thoil" -+ -+#: help.c:324 -+msgid "" -+msgstr "" -+ -+#: help.c:336 -+msgid "" -+"\n" -+"Generic bindings:\n" -+"\n" -+msgstr "" -+"\n" -+"Ceangail ghinearálta:\n" -+"\n" -+ -+#: help.c:340 -+msgid "" -+"\n" -+"Unbound functions:\n" -+"\n" -+msgstr "" -+"\n" -+"Feidhmeanna gan cheangal:\n" -+"\n" -+ -+#: help.c:348 -+#, c-format -+msgid "Help for %s" -+msgstr "Cabhair le %s" -+ -+#: hook.c:246 -+#, c-format -+msgid "unhook: Can't do unhook * from within a hook." -+msgstr "unhook: Ní cheadaítear unhook * isteach i hook." -+ -+#: hook.c:258 -+#, c-format -+msgid "unhook: unknown hook type: %s" -+msgstr "unhook: cineál anaithnid crúca: %s" -+ -+#: hook.c:264 -+#, c-format -+msgid "unhook: Can't delete a %s from within a %s." -+msgstr "unhook: Ní féidir %s a scriosadh taobh istigh de %s." -+ -+#: imap/auth.c:108 pop_auth.c:390 -+msgid "No authenticators available" -+msgstr "Níl aon fhíordheimhneoirí ar fáil" -+ -+#: imap/auth_anon.c:43 -+msgid "Authenticating (anonymous)..." -+msgstr "Á fhíordheimhniú (gan ainm)..." -+ -+#: imap/auth_anon.c:73 -+msgid "Anonymous authentication failed." -+msgstr "Theip ar fhíordheimhniú gan ainm." -+ -+#: imap/auth_cram.c:48 -+msgid "Authenticating (CRAM-MD5)..." -+msgstr "Á fhíordheimhniú (CRAM-MD5)..." -+ -+#: imap/auth_cram.c:128 -+msgid "CRAM-MD5 authentication failed." -+msgstr "Theip ar fhíordheimhniú CRAM-MD5." -+ -+#. now begin login -+#: imap/auth_gss.c:105 -+msgid "Authenticating (GSSAPI)..." -+msgstr "Á fhíordheimhniú (GSSAPI)..." -+ -+#: imap/auth_gss.c:268 -+msgid "GSSAPI authentication failed." -+msgstr "Theip ar fhíordheimhniú GSSAPI." -+ -+#: imap/auth_login.c:38 -+msgid "LOGIN disabled on this server." -+msgstr "Díchumasaíodh LOGIN ar an fhreastalaí seo." -+ -+#: imap/auth_login.c:47 pop_auth.c:223 -+msgid "Logging in..." -+msgstr "Logáil isteach..." -+ -+#: imap/auth_login.c:67 pop_auth.c:266 -+msgid "Login failed." -+msgstr "Theip ar logáil isteach." -+ -+# %s is the method, not what's being authenticated I think -+#: imap/auth_sasl.c:97 -+#, c-format -+msgid "Authenticating (%s)..." -+msgstr "Á fhíordheimhniú (%s)..." -+ -+#: imap/auth_sasl.c:185 pop_auth.c:151 -+msgid "SASL authentication failed." -+msgstr "Theip ar fhíordheimhniú SASL." -+ -+#: imap/browse.c:69 imap/imap.c:587 -+#, c-format -+msgid "%s is an invalid IMAP path" -+msgstr "Tá %s neamhbhailí mar chonair IMAP" -+ -+#: imap/browse.c:87 -+msgid "Getting namespaces..." -+msgstr "Ainmspásanna á bhfáil..." -+ -+#: imap/browse.c:96 -+msgid "Getting folder list..." -+msgstr "Liosta fillteán á fháil..." -+ -+#: imap/browse.c:225 -+msgid "No such folder" -+msgstr "Níl a leithéid d'fhillteán ann" -+ -+#: imap/browse.c:288 -+msgid "Create mailbox: " -+msgstr "Cruthaigh bosca poist: " -+ -+#: imap/browse.c:293 imap/browse.c:339 -+msgid "Mailbox must have a name." -+msgstr "Ní foláir ainm a thabhairt ar an mbosca." -+ -+#: imap/browse.c:301 -+msgid "Mailbox created." -+msgstr "Cruthaíodh bosca poist." -+ -+#: imap/browse.c:332 -+#, c-format -+msgid "Rename mailbox %s to: " -+msgstr "Athainmnigh bosca poist %s go: " -+ -+#: imap/browse.c:345 -+#, c-format -+msgid "Rename failed: %s" -+msgstr "Theip ar athainmniú: %s" -+ -+#: imap/browse.c:350 -+msgid "Mailbox renamed." -+msgstr "Athainmníodh an bosca poist." -+ -+#: imap/command.c:298 -+msgid "Mailbox closed" -+msgstr "Dúnadh bosca poist" -+ -+#. * than we previously saw -+#: imap/command.c:341 -+msgid "Fatal error. Message count is out of sync!" -+msgstr "Earráid mharfach. Is as sioncronú líon na dteachtaireachtaí!" -+ -+#: imap/imap.c:177 -+#, c-format -+msgid "Closing connection to %s..." -+msgstr "Nasc le %s a' dhúnadh..." -+ -+#: imap/imap.c:340 -+msgid "This IMAP server is ancient. Mutt does not work with it." -+msgstr "Freastalaí ársa IMAP. Ní oibríonn Mutt leis." -+ -+#: imap/imap.c:422 -+msgid "Checking mailbox subscriptions" -+msgstr "Síntiúis bhosca poist á seiceáil" -+ -+#: imap/imap.c:460 pop_lib.c:286 -+msgid "Secure connection with TLS?" -+msgstr "Nasc daingean le TLS?" -+ -+#: imap/imap.c:473 pop_lib.c:310 -+msgid "Could not negotiate TLS connection" -+msgstr "Níorbh fhéidir nasc TLS a shocrú" -+ -+#: imap/imap.c:489 pop_lib.c:331 -+msgid "Encrypted connection unavailable" -+msgstr "Níl nasc criptithe ar fáil" -+ -+#: imap/imap.c:618 -+#, c-format -+msgid "Selecting %s..." -+msgstr "%s á roghnú..." -+ -+#: imap/imap.c:754 -+msgid "Error opening mailbox" -+msgstr "Earráid ag oscailt an bhosca poist" -+ -+#: imap/imap.c:803 imap/message.c:742 muttlib.c:1300 -+#, c-format -+msgid "Create %s?" -+msgstr "Cruthaigh %s?" -+ -+#: imap/imap.c:1041 pop.c:468 -+#, c-format -+msgid "Marking %d messages deleted..." -+msgstr "Ag marcáil %d teachtaireacht mar scriosta..." -+ -+#: imap/imap.c:1050 -+msgid "Expunge failed" -+msgstr "Theip ar scriosadh" -+ -+#: imap/imap.c:1063 -+#, c-format -+msgid "Saving message status flags... [%d/%d]" -+msgstr "Bratacha stádais á sábháil... [%d/%d]" -+ -+#: imap/imap.c:1096 -+msgid "Expunging messages from server..." -+msgstr "Teachtaireachtaí á scriosadh ón fhreastalaí..." -+ -+#: imap/imap.c:1101 -+msgid "imap_sync_mailbox: EXPUNGE failed" -+msgstr "imap_sync_mailbox: Theip ar scriosadh" -+ -+#: imap/imap.c:1110 imap/imap.c:1145 -+msgid "CLOSE failed" -+msgstr "Theip ar dhúnadh" -+ -+#: imap/imap.c:1388 -+#, c-format -+msgid "Header search without header name: %s" -+msgstr "Cuardach ceanntáisc gan ainm an cheanntáisc: %s" -+ -+#: imap/imap.c:1536 -+msgid "Bad mailbox name" -+msgstr "Drochainm ar bhosca poist" -+ -+#: imap/imap.c:1559 -+#, c-format -+msgid "Subscribing to %s..." -+msgstr "Ag liostáil le %s..." -+ -+#: imap/imap.c:1561 -+#, c-format -+msgid "Unsubscribing to %s..." -+msgstr "Ag díliostáil le %s..." -+ -+#. Unable to fetch headers for lower versions -+#: imap/message.c:91 -+msgid "Unable to fetch headers from this IMAP server version." -+msgstr "Ní féidir na ceanntásca a fháil ó fhreastalaí IMAP den leagan seo." -+ -+#: imap/message.c:101 -+#, c-format -+msgid "Could not create temporary file %s" -+msgstr "Níorbh fhéidir comhad sealadach %s a chruthú" -+ -+#: imap/message.c:127 -+#, c-format -+msgid "Evaluating cache... [%d/%d]" -+msgstr "Taisce á scrúdú... [%d/%d]" -+ -+#: imap/message.c:195 pop.c:211 -+#, c-format -+msgid "Fetching message headers... [%d/%d]" -+msgstr "Ceanntásca na dteachtaireachtaí á bhfáil... [%d/%d]" -+ -+#: imap/message.c:358 imap/message.c:413 pop.c:388 -+msgid "Fetching message..." -+msgstr "Teachtaireacht á fáil..." -+ -+#: imap/message.c:401 pop.c:382 -+msgid "The message index is incorrect. Try reopening the mailbox." -+msgstr "" -+"Is mícheart é innéacs na dteachtaireachtaí. Bain triail as an mbosca poist a " -+"athoscailt." -+ -+#: imap/message.c:548 -+msgid "Uploading message..." -+msgstr "Teachtaireacht á huasluchtú..." -+ -+#: imap/message.c:708 -+#, c-format -+msgid "Copying %d messages to %s..." -+msgstr "%d teachtaireacht á gcóipeáil go %s..." -+ -+#: imap/message.c:712 -+#, c-format -+msgid "Copying message %d to %s..." -+msgstr "Teachtaireacht %d á cóipeáil go %s..." -+ -+#: imap/util.c:236 -+msgid "Continue?" -+msgstr "Lean ar aghaidh?" -+ -+#: init.c:427 -+#, c-format -+msgid "Bad regexp: %s" -+msgstr "Slonn ionadaíochta neamhbhailí: %s" -+ -+#: init.c:686 -+msgid "spam: no matching pattern" -+msgstr "spam: níl aon phatrún comhoiriúnach ann" -+ -+#: init.c:688 -+msgid "nospam: no matching pattern" -+msgstr "nospam: níl aon phatrún comhoiriúnach ann" -+ -+#: init.c:891 -+msgid "alias: no address" -+msgstr "ailias: gan seoladh" -+ -+#: init.c:936 -+#, c-format -+msgid "Warning: Bad IDN '%s' in alias '%s'.\n" -+msgstr "Rabhadh: DrochIDN '%s' san ailias '%s'.\n" -+ -+#: init.c:1014 -+msgid "invalid header field" -+msgstr "réimse cheanntáisc neamhbhailí" -+ -+#: init.c:1067 -+#, c-format -+msgid "%s: unknown sorting method" -+msgstr "%s: modh shórtála anaithnid" -+ -+#: init.c:1177 -+#, c-format -+msgid "mutt_restore_default(%s): error in regexp: %s\n" -+msgstr "mutt_restore_default(%s): earráid i regexp: %s\n" -+ -+#: init.c:1242 -+#, c-format -+msgid "%s: unknown variable" -+msgstr "%s: athróg anaithnid" -+ -+#: init.c:1251 -+#, c-format -+msgid "prefix is illegal with reset" -+msgstr "ní cheadaítear an réimír le hathshocrú" -+ -+#: init.c:1257 -+#, c-format -+msgid "value is illegal with reset" -+msgstr "ní cheadaítear an luach le hathshocrú" -+ -+#: init.c:1296 -+#, c-format -+msgid "%s is set" -+msgstr "%s socraithe" -+ -+#: init.c:1296 -+#, c-format -+msgid "%s is unset" -+msgstr "%s gan socrú" -+ -+#: init.c:1486 -+#, c-format -+msgid "%s: invalid mailbox type" -+msgstr "%s: cineál bosca poist neamhbhailí" -+ -+#: init.c:1511 init.c:1556 -+#, c-format -+msgid "%s: invalid value" -+msgstr "%s: luach neamhbhailí" -+ -+#: init.c:1597 -+#, c-format -+msgid "%s: Unknown type." -+msgstr "%s: Cineál anaithnid." -+ -+#: init.c:1623 -+#, c-format -+msgid "%s: unknown type" -+msgstr "%s: cineál anaithnid" -+ -+#: init.c:1682 -+#, c-format -+msgid "Error in %s, line %d: %s" -+msgstr "Earráid i %s, líne %s: %s" -+ -+#. the muttrc source keyword -+#: init.c:1705 -+#, c-format -+msgid "source: errors in %s" -+msgstr "source: earráidí i %s" -+ -+#: init.c:1706 -+#, c-format -+msgid "source: reading aborted due too many errors in %s" -+msgstr "source: an iomarca earráidí i %s, ag tobscor" -+ -+#: init.c:1720 -+#, c-format -+msgid "source: error at %s" -+msgstr "source: earráid ag %s" -+ -+#: init.c:1725 -+msgid "source: too many arguments" -+msgstr "source: an iomarca argóintí" -+ -+#: init.c:1776 -+#, c-format -+msgid "%s: unknown command" -+msgstr "%s: ordú anaithnid" -+ -+#: init.c:2220 -+#, c-format -+msgid "Error in command line: %s\n" -+msgstr "Earráid ar líne ordaithe: %s\n" -+ -+#: init.c:2270 -+msgid "unable to determine home directory" -+msgstr "ní féidir an chomhadlann bhaile a aimsiú" -+ -+#: init.c:2278 -+msgid "unable to determine username" -+msgstr "ní féidir an t-ainm úsáideora a aimsiú" -+ -+#: keymap.c:466 -+msgid "Macro loop detected." -+msgstr "Braitheadh lúb i macraí." -+ -+#: keymap.c:676 keymap.c:684 -+msgid "Key is not bound." -+msgstr "Eochair gan cheangal." -+ -+#: keymap.c:688 -+#, c-format -+msgid "Key is not bound. Press '%s' for help." -+msgstr "Eochair gan cheangal. Brúigh '%s' chun cabhrú a fháil." -+ -+#: keymap.c:699 -+msgid "push: too many arguments" -+msgstr "push: an iomarca argóintí" -+ -+#: keymap.c:729 -+#, c-format -+msgid "%s: no such menu" -+msgstr "%s: níl a leithéid de roghchlár ann" -+ -+#: keymap.c:744 -+msgid "null key sequence" -+msgstr "seicheamh neamhbhailí" -+ -+#: keymap.c:831 -+msgid "bind: too many arguments" -+msgstr "bind: an iomarca argóintí" -+ -+#: keymap.c:854 -+#, c-format -+msgid "%s: no such function in map" -+msgstr "%s: níl a leithéid d'fheidhm sa mhapa" -+ -+#: keymap.c:878 -+msgid "macro: empty key sequence" -+msgstr "macra: seicheamh folamh eochrach" -+ -+#: keymap.c:889 -+msgid "macro: too many arguments" -+msgstr "macro: an iomarca argóintí" -+ -+#: keymap.c:925 -+msgid "exec: no arguments" -+msgstr "exec: níl aon argóint" -+ -+#: keymap.c:945 -+#, c-format -+msgid "%s: no such function" -+msgstr "%s: níl a leithéid d'fheidhm ann" -+ -+#: keymap.c:966 -+msgid "Enter keys (^G to abort): " -+msgstr "Iontráil eochracha (^G chun scor):" -+ -+#: keymap.c:971 -+#, c-format -+msgid "Char = %s, Octal = %o, Decimal = %d" -+msgstr "Car = %s, Ochtnártha = %o, Deachúlach = %d" -+ -+#: keymap_alldefs.h:5 -+msgid "null operation" -+msgstr "oibríocht nialasach" -+ -+#: keymap_alldefs.h:6 -+msgid "end of conditional execution (noop)" -+msgstr "deireadh an reatha coinníollaigh (no-op)" -+ -+#: keymap_alldefs.h:7 -+msgid "force viewing of attachment using mailcap" -+msgstr "amharc ar iatán trí úsáid mailcap" -+ -+#: keymap_alldefs.h:8 -+msgid "view attachment as text" -+msgstr "féach ar an iatán mar théacs" -+ -+#: keymap_alldefs.h:9 -+msgid "Toggle display of subparts" -+msgstr "Scoránaigh taispeáint na bhfopháirteanna" -+ -+#: keymap_alldefs.h:10 -+msgid "move to the bottom of the page" -+msgstr "téigh go bun an leathanaigh" -+ -+#: keymap_alldefs.h:11 -+msgid "remail a message to another user" -+msgstr "athsheol teachtaireacht go húsáideoir eile" -+ -+#: keymap_alldefs.h:12 -+msgid "select a new file in this directory" -+msgstr "roghnaigh comhad nua sa chomhadlann seo" -+ -+#: keymap_alldefs.h:13 -+msgid "view file" -+msgstr "féach ar chomhad" -+ -+#: keymap_alldefs.h:14 -+msgid "display the currently selected file's name" -+msgstr "taispeáin ainm an chomhaid atá roghnaithe faoi láthair" -+ -+#: keymap_alldefs.h:15 -+msgid "subscribe to current mailbox (IMAP only)" -+msgstr "liostáil leis an mbosca poist reatha (IMAP amháin)" -+ -+#: keymap_alldefs.h:16 -+msgid "unsubscribe to current mailbox (IMAP only)" -+msgstr "díliostáil leis an mbosca poist reatha (IMAP amháin)" -+ -+#: keymap_alldefs.h:17 -+msgid "toggle view all/subscribed mailboxes (IMAP only)" -+msgstr "" -+"scoránaigh cé acu gach bosca nó boscaí liostáilte amháin a thaispeántar (IMAP " -+"amháin)" -+ -+#: keymap_alldefs.h:18 -+msgid "list mailboxes with new mail" -+msgstr "taispeáin na boscaí le post nua" -+ -+#: keymap_alldefs.h:19 -+msgid "change directories" -+msgstr "athraigh an chomhadlann" -+ -+#: keymap_alldefs.h:20 -+msgid "check mailboxes for new mail" -+msgstr "seiceáil boscaí do phost nua" -+ -+#: keymap_alldefs.h:21 -+msgid "attach a file(s) to this message" -+msgstr "ceangail comha(i)d leis an teachtaireacht seo" -+ -+#: keymap_alldefs.h:22 -+msgid "attach message(s) to this message" -+msgstr "ceangail teachtaireacht(aí) leis an teachtaireacht seo" -+ -+#: keymap_alldefs.h:23 -+msgid "edit the BCC list" -+msgstr "cuir an liosta BCC in eagar" -+ -+#: keymap_alldefs.h:24 -+msgid "edit the CC list" -+msgstr "cuir an liosta CC in eagar" -+ -+#: keymap_alldefs.h:25 -+msgid "edit attachment description" -+msgstr "cuir cur síos an iatáin in eagar" -+ -+#: keymap_alldefs.h:26 -+msgid "edit attachment transfer-encoding" -+msgstr "cuir transfer-encoding an iatáin in eagar" -+ -+#: keymap_alldefs.h:27 -+msgid "enter a file to save a copy of this message in" -+msgstr "iontráil comhad ina sábhálfar cóip den teachtaireacht seo" -+ -+#: keymap_alldefs.h:28 -+msgid "edit the file to be attached" -+msgstr "cuir an comhad le ceangal in eagar" -+ -+#: keymap_alldefs.h:29 -+msgid "edit the from field" -+msgstr "cuir an réimse \"Ó\" in eagar\"" -+ -+#: keymap_alldefs.h:30 -+msgid "edit the message with headers" -+msgstr "cuir an teachtaireacht in eagar le ceanntásca" -+ -+#: keymap_alldefs.h:31 -+msgid "edit the message" -+msgstr "cuir an teachtaireacht in eagar" -+ -+#: keymap_alldefs.h:32 -+msgid "edit attachment using mailcap entry" -+msgstr "cuir an t-iatán in eagar le hiontráil mailcap" -+ -+#: keymap_alldefs.h:33 -+msgid "edit the Reply-To field" -+msgstr "cuir an réimse \"Reply-To\" in eagar" -+ -+#: keymap_alldefs.h:34 -+msgid "edit the subject of this message" -+msgstr "cuir an t-ábhar teachtaireachta in eagar" -+ -+#: keymap_alldefs.h:35 -+msgid "edit the TO list" -+msgstr "cuir an liosta \"TO\" in eagar" -+ -+#: keymap_alldefs.h:36 -+msgid "create a new mailbox (IMAP only)" -+msgstr "cruthaigh bosca poist nua (IMAP)" -+ -+#: keymap_alldefs.h:37 -+msgid "edit attachment content type" -+msgstr "cuir content type an iatáin in eagar" -+ -+#: keymap_alldefs.h:38 -+msgid "get a temporary copy of an attachment" -+msgstr "faigh cóip shealadach d'iatán" -+ -+#: keymap_alldefs.h:39 -+msgid "run ispell on the message" -+msgstr "rith ispell ar an teachtaireacht" -+ -+#: keymap_alldefs.h:40 -+msgid "compose new attachment using mailcap entry" -+msgstr "cum iatán nua le hiontráil mailcap" -+ -+#: keymap_alldefs.h:41 -+msgid "toggle recoding of this attachment" -+msgstr "scoránaigh ath-ionchódú an iatáin seo" -+ -+#: keymap_alldefs.h:42 -+msgid "save this message to send later" -+msgstr "sábháil an teachtaireacht seo chun é a sheoladh ar ball" -+ -+#: keymap_alldefs.h:43 -+msgid "rename/move an attached file" -+msgstr "athainmnigh/bog comhad ceangailte" -+ -+#: keymap_alldefs.h:44 -+msgid "send the message" -+msgstr "seol an teachtaireacht" -+ -+#: keymap_alldefs.h:45 -+msgid "toggle disposition between inline/attachment" -+msgstr "scoránaigh idir inlíne/iatán" -+ -+#: keymap_alldefs.h:46 -+msgid "toggle whether to delete file after sending it" -+msgstr "" -+"scoránaigh cé acu a scriosfar comhad tar éis é a sheoladh, nó nach scriosfar" -+ -+#: keymap_alldefs.h:47 -+msgid "update an attachment's encoding info" -+msgstr "nuashonraigh eolas faoi ionchódú an iatáin" -+ -+#: keymap_alldefs.h:48 -+msgid "write the message to a folder" -+msgstr "scríobh teachtaireacht i bhfillteán" -+ -+#: keymap_alldefs.h:49 -+msgid "copy a message to a file/mailbox" -+msgstr "cóipeáil teachtaireacht go comhad/bosca poist" -+ -+#: keymap_alldefs.h:50 -+msgid "create an alias from a message sender" -+msgstr "cruthaigh ailias do sheoltóir" -+ -+#: keymap_alldefs.h:51 -+msgid "move entry to bottom of screen" -+msgstr "bog iontráil go bun an scáileáin" -+ -+#: keymap_alldefs.h:52 -+msgid "move entry to middle of screen" -+msgstr "bog iontráil go lár an scáileáin" -+ -+#: keymap_alldefs.h:53 -+msgid "move entry to top of screen" -+msgstr "bog iontráil go barr an scáileáin" -+ -+#: keymap_alldefs.h:54 -+msgid "make decoded (text/plain) copy" -+msgstr "déan cóip dhíchódaithe (text/plain)" -+ -+#: keymap_alldefs.h:55 -+msgid "make decoded copy (text/plain) and delete" -+msgstr "déan cóip dhíchódaithe (text/plain) agus scrios" -+ -+#: keymap_alldefs.h:56 -+msgid "delete the current entry" -+msgstr "scrios an iontráil reatha" -+ -+#: keymap_alldefs.h:57 -+msgid "delete the current mailbox (IMAP only)" -+msgstr "scrios an bosca poist reatha (IMAP amháin)" -+ -+#: keymap_alldefs.h:58 -+msgid "delete all messages in subthread" -+msgstr "scrios gach teachtaireacht san fhoshnáithe" -+ -+#: keymap_alldefs.h:59 -+msgid "delete all messages in thread" -+msgstr "scrios gach teachtaireacht sa snáithe" -+ -+#: keymap_alldefs.h:60 -+msgid "display full address of sender" -+msgstr "taispeáin seoladh iomlán an tseoltóra" -+ -+#: keymap_alldefs.h:61 -+msgid "display message and toggle header weeding" -+msgstr "taispeáin teachtaireacht agus scoránaigh na ceanntásca" -+ -+#: keymap_alldefs.h:62 -+msgid "display a message" -+msgstr "taispeáin teachtaireacht" -+ -+#: keymap_alldefs.h:63 -+msgid "edit the raw message" -+msgstr "cuir an teachtaireacht amh in eagar" -+ -+#: keymap_alldefs.h:64 -+msgid "delete the char in front of the cursor" -+msgstr "scrios an carachtar i ndiaidh an chúrsóra" -+ -+#: keymap_alldefs.h:65 -+msgid "move the cursor one character to the left" -+msgstr "bog an cúrsóir aon charachtar amháin ar chlé" -+ -+#: keymap_alldefs.h:66 -+msgid "move the cursor to the beginning of the word" -+msgstr "bog an cúrsóir go tús an fhocail" -+ -+#: keymap_alldefs.h:67 -+msgid "jump to the beginning of the line" -+msgstr "léim go tús an líne" -+ -+#: keymap_alldefs.h:68 -+msgid "cycle among incoming mailboxes" -+msgstr "bog trí na boscaí isteach" -+ -+#: keymap_alldefs.h:69 -+msgid "complete filename or alias" -+msgstr "comhlánaigh ainm comhaid nó ailias" -+ -+#: keymap_alldefs.h:70 -+msgid "complete address with query" -+msgstr "comhlánaigh seoladh le hiarratas" -+ -+#: keymap_alldefs.h:71 -+msgid "delete the char under the cursor" -+msgstr "scrios an carachtar faoin chúrsóir" -+ -+#: keymap_alldefs.h:72 -+msgid "jump to the end of the line" -+msgstr "léim go deireadh an líne" -+ -+#: keymap_alldefs.h:73 -+msgid "move the cursor one character to the right" -+msgstr "bog an cúrsóir aon charachtar amháin ar dheis" -+ -+#: keymap_alldefs.h:74 -+msgid "move the cursor to the end of the word" -+msgstr "bog an cúrsóir go deireadh an fhocail" -+ -+#: keymap_alldefs.h:75 -+msgid "scroll down through the history list" -+msgstr "scrollaigh síos tríd an stair" -+ -+#: keymap_alldefs.h:76 -+msgid "scroll up through the history list" -+msgstr "scrollaigh suas tríd an stair" -+ -+#: keymap_alldefs.h:77 -+msgid "delete chars from cursor to end of line" -+msgstr "scrios carachtair ón chúrsóir go deireadh an líne" -+ -+#: keymap_alldefs.h:78 -+msgid "delete chars from the cursor to the end of the word" -+msgstr "scrios carachtair ón chúrsóir go deireadh an fhocail" -+ -+#: keymap_alldefs.h:79 -+msgid "delete all chars on the line" -+msgstr "scrios gach carachtar ar an líne" -+ -+#: keymap_alldefs.h:80 -+msgid "delete the word in front of the cursor" -+msgstr "scrios an focal i ndiaidh an chúrsóra" -+ -+#: keymap_alldefs.h:81 -+msgid "quote the next typed key" -+msgstr "cuir an chéad charachtar eile clóscríofa idir comharthaí athfhriotail" -+ -+#: keymap_alldefs.h:82 -+msgid "transpose character under cursor with previous" -+msgstr "malartaigh an carachtar faoin chúrsóir agus an ceann roimhe" -+ -+#: keymap_alldefs.h:83 -+msgid "capitalize the word" -+msgstr "scríobh an focal le ceannlitir" -+ -+#: keymap_alldefs.h:84 -+msgid "convert the word to lower case" -+msgstr "tiontaigh an focal go cás íochtair" -+ -+#: keymap_alldefs.h:85 -+msgid "convert the word to upper case" -+msgstr "tiontaigh an focal go cás uachtair" -+ -+#: keymap_alldefs.h:86 -+msgid "enter a muttrc command" -+msgstr "iontráil ordú muttrc" -+ -+#: keymap_alldefs.h:87 -+msgid "enter a file mask" -+msgstr "iontráil masc comhaid" -+ -+#: keymap_alldefs.h:88 -+msgid "exit this menu" -+msgstr "scoir an roghchlár seo" -+ -+#: keymap_alldefs.h:89 -+msgid "filter attachment through a shell command" -+msgstr "scag iatán le hordú blaoisce" -+ -+#: keymap_alldefs.h:90 -+msgid "move to the first entry" -+msgstr "téigh go dtí an chéad iontráil" -+ -+#: keymap_alldefs.h:91 -+msgid "toggle a message's 'important' flag" -+msgstr "scoránaigh an bhratach 'important' ar theachtaireacht" -+ -+#: keymap_alldefs.h:92 -+msgid "forward a message with comments" -+msgstr "seol teachtaireacht ar aghaidh le nótaí sa bhreis" -+ -+#: keymap_alldefs.h:93 -+msgid "select the current entry" -+msgstr "roghnaigh an iontráil reatha" -+ -+#: keymap_alldefs.h:94 -+msgid "reply to all recipients" -+msgstr "seol freagra chuig gach faighteoir" -+ -+#: keymap_alldefs.h:95 -+msgid "scroll down 1/2 page" -+msgstr "scrollaigh síos leath de leathanach" -+ -+#: keymap_alldefs.h:96 -+msgid "scroll up 1/2 page" -+msgstr "scrollaigh suas leath de leathanach" -+ -+#: keymap_alldefs.h:97 -+msgid "this screen" -+msgstr "an scáileán seo" -+ -+#: keymap_alldefs.h:98 -+msgid "jump to an index number" -+msgstr "téigh go treoiruimhir" -+ -+#: keymap_alldefs.h:99 -+msgid "move to the last entry" -+msgstr "téigh go dtí an iontráil dheireanach" -+ -+#: keymap_alldefs.h:100 -+msgid "reply to specified mailing list" -+msgstr "seol freagra chuig liosta sonraithe ríomhphoist" -+ -+#: keymap_alldefs.h:101 -+msgid "execute a macro" -+msgstr "rith macra" -+ -+#: keymap_alldefs.h:102 -+msgid "compose a new mail message" -+msgstr "cum teachtaireacht nua ríomhphoist" -+ -+#: keymap_alldefs.h:103 -+msgid "break the thread in two" -+msgstr "bris an snáithe ina dhá pháirt" -+ -+#: keymap_alldefs.h:104 -+msgid "open a different folder" -+msgstr "oscail fillteán eile" -+ -+#: keymap_alldefs.h:105 -+msgid "open a different folder in read only mode" -+msgstr "oscail fillteán eile sa mhód léimh-amháin" -+ -+#: keymap_alldefs.h:106 -+msgid "clear a status flag from a message" -+msgstr "glan bratach stádais ó theachtaireacht" -+ -+#: keymap_alldefs.h:107 -+msgid "delete messages matching a pattern" -+msgstr "scrios teachtaireachtaí atá comhoiriúnach le patrún" -+ -+#: keymap_alldefs.h:108 -+msgid "force retrieval of mail from IMAP server" -+msgstr "faigh ríomhphost ón fhreastalaí IMAP" -+ -+#: keymap_alldefs.h:109 -+msgid "retrieve mail from POP server" -+msgstr "faigh ríomhphost ó fhreastalaí POP" -+ -+#: keymap_alldefs.h:110 -+msgid "move to the first message" -+msgstr "téigh go dtí an chéad teachtaireacht" -+ -+#: keymap_alldefs.h:111 -+msgid "move to the last message" -+msgstr "téigh go dtí an teachtaireacht dheireanach" -+ -+#: keymap_alldefs.h:112 -+msgid "show only messages matching a pattern" -+msgstr "ná taispeáin ach na teachtaireachtaí atá comhoiriúnach le patrún" -+ -+#: keymap_alldefs.h:113 -+msgid "link tagged message to the current one" -+msgstr "nasc teachtaireacht chlibeáilte leis an cheann reatha" -+ -+#: keymap_alldefs.h:114 -+msgid "jump to the next new message" -+msgstr "léim go dtí an chéad teachtaireacht nua eile" -+ -+#: keymap_alldefs.h:115 -+msgid "jump to the next new or unread message" -+msgstr "léim go dtí an chéad teachtaireacht nua/neamhléite eile" -+ -+#: keymap_alldefs.h:116 -+msgid "jump to the next subthread" -+msgstr "léim go dtí an chéad fhoshnáithe eile" -+ -+#: keymap_alldefs.h:117 -+msgid "jump to the next thread" -+msgstr "téigh go dtí an chéad snáithe eile" -+ -+#: keymap_alldefs.h:118 -+msgid "move to the next undeleted message" -+msgstr "téigh go dtí an chéad teachtaireacht eile nach scriosta" -+ -+#: keymap_alldefs.h:119 -+msgid "jump to the next unread message" -+msgstr "léim go dtí an chéad teachtaireacht neamhléite eile" -+ -+#: keymap_alldefs.h:120 -+msgid "jump to parent message in thread" -+msgstr "léim go máthair-theachtaireacht sa snáithe" -+ -+#: keymap_alldefs.h:121 -+msgid "jump to previous thread" -+msgstr "léim go dtí an snáithe roimhe seo" -+ -+#: keymap_alldefs.h:122 -+msgid "jump to previous subthread" -+msgstr "léim go dtí an fhoshnáithe roimhe seo" -+ -+#: keymap_alldefs.h:123 -+msgid "move to the previous undeleted message" -+msgstr "téigh go dtí an teachtaireacht nach scriosta roimhe seo" -+ -+#: keymap_alldefs.h:124 -+msgid "jump to the previous new message" -+msgstr "léim go dtí an teachtaireacht nua roimhe seo" -+ -+#: keymap_alldefs.h:125 -+msgid "jump to the previous new or unread message" -+msgstr "léim go dtí an teachtaireacht nua/neamhléite roimhe seo" -+ -+#: keymap_alldefs.h:126 -+msgid "jump to the previous unread message" -+msgstr "léim go dtí an teachtaireacht neamhléite roimhe seo" -+ -+#: keymap_alldefs.h:127 -+msgid "mark the current thread as read" -+msgstr "marcáil an snáithe reatha \"léite\"" -+ -+#: keymap_alldefs.h:128 -+msgid "mark the current subthread as read" -+msgstr "marcáil an fhoshnáithe reatha \"léite\"" -+ -+#: keymap_alldefs.h:129 -+msgid "set a status flag on a message" -+msgstr "socraigh bratach stádais ar theachtaireacht" -+ -+#: keymap_alldefs.h:130 -+msgid "save changes to mailbox" -+msgstr "sábháil athruithe ar bhosca poist" -+ -+#: keymap_alldefs.h:131 -+msgid "tag messages matching a pattern" -+msgstr "clibeáil teachtaireachtaí atá comhoiriúnach le patrún" -+ -+#: keymap_alldefs.h:132 -+msgid "undelete messages matching a pattern" -+msgstr "díscrios teachtaireachtaí atá comhoiriúnach le patrún" -+ -+#: keymap_alldefs.h:133 -+msgid "untag messages matching a pattern" -+msgstr "díchlibeáil teachtaireachtaí atá comhoiriúnach le patrún" -+ -+#: keymap_alldefs.h:134 -+msgid "move to the middle of the page" -+msgstr "téigh go lár an leathanaigh" -+ -+#: keymap_alldefs.h:135 -+msgid "move to the next entry" -+msgstr "téigh go dtí an chéad iontráil eile" -+ -+#: keymap_alldefs.h:136 -+msgid "scroll down one line" -+msgstr "scrollaigh aon líne síos" -+ -+#: keymap_alldefs.h:137 -+msgid "move to the next page" -+msgstr "téigh go dtí an chéad leathanach eile" -+ -+#: keymap_alldefs.h:138 -+msgid "jump to the bottom of the message" -+msgstr "léim go bun na teachtaireachta" -+ -+#: keymap_alldefs.h:139 -+msgid "toggle display of quoted text" -+msgstr "" -+"scoránaigh cé acu a thaispeántar téacs athfhriotail nó nach dtaispeántar" -+ -+#: keymap_alldefs.h:140 -+msgid "skip beyond quoted text" -+msgstr "gabh thar théacs athfhriotail" -+ -+#: keymap_alldefs.h:141 -+msgid "jump to the top of the message" -+msgstr "léim go barr na teachtaireachta" -+ -+#: keymap_alldefs.h:142 -+msgid "pipe message/attachment to a shell command" -+msgstr "píopa teachtaireacht/iatán go hordú blaoisce" -+ -+#: keymap_alldefs.h:143 -+msgid "move to the previous entry" -+msgstr "téigh go dtí an iontráil roimhe seo" -+ -+#: keymap_alldefs.h:144 -+msgid "scroll up one line" -+msgstr "scrollaigh aon líne suas" -+ -+#: keymap_alldefs.h:145 -+msgid "move to the previous page" -+msgstr "téigh go dtí an leathanach roimhe seo" -+ -+#: keymap_alldefs.h:146 -+msgid "print the current entry" -+msgstr "priontáil an iontráil reatha" -+ -+#: keymap_alldefs.h:147 -+msgid "query external program for addresses" -+msgstr "bí ag iarraidh seoltaí ó chlár seachtrach" -+ -+#: keymap_alldefs.h:148 -+msgid "append new query results to current results" -+msgstr "iarcheangail torthaí an iarratais nua leis na torthaí reatha" -+ -+#: keymap_alldefs.h:149 -+msgid "save changes to mailbox and quit" -+msgstr "sábháil athruithe ar bhosca poist agus scoir" -+ -+#: keymap_alldefs.h:150 -+msgid "recall a postponed message" -+msgstr "athghlaoigh teachtaireacht a bhí curtha ar athlá" -+ -+#: keymap_alldefs.h:151 -+msgid "clear and redraw the screen" -+msgstr "glan an scáileán agus ataispeáin" -+ -+#: keymap_alldefs.h:152 -+msgid "{internal}" -+msgstr "{inmheánach}" -+ -+#: keymap_alldefs.h:153 -+msgid "rename the current mailbox (IMAP only)" -+msgstr "athainmnigh an bosca poist reatha (IMAP amháin)" -+ -+#: keymap_alldefs.h:154 -+msgid "reply to a message" -+msgstr "tabhair freagra ar theachtaireacht" -+ -+#: keymap_alldefs.h:155 -+msgid "use the current message as a template for a new one" -+msgstr "úsáid an teachtaireacht reatha mar theimpléad do cheann nua" -+ -+#: keymap_alldefs.h:156 -+msgid "save message/attachment to a file" -+msgstr "sábháil teachtaireacht/iatán go comhad" -+ -+#: keymap_alldefs.h:157 -+msgid "search for a regular expression" -+msgstr "déan cuardach ar shlonn ionadaíochta" -+ -+#: keymap_alldefs.h:158 -+msgid "search backwards for a regular expression" -+msgstr "déan cuardach ar gcúl ar shlonn ionadaíochta" -+ -+#: keymap_alldefs.h:159 -+msgid "search for next match" -+msgstr "déan cuardach arís" -+ -+#: keymap_alldefs.h:160 -+msgid "search for next match in opposite direction" -+msgstr "déan cuardach arís, ach sa treo eile" -+ -+#: keymap_alldefs.h:161 -+msgid "toggle search pattern coloring" -+msgstr "scoránaigh aibhsiú an phatrúin cuardaigh" -+ -+#: keymap_alldefs.h:162 -+msgid "invoke a command in a subshell" -+msgstr "rith ordú i bhfobhlaosc" -+ -+#: keymap_alldefs.h:163 -+msgid "sort messages" -+msgstr "sórtáil teachtaireachtaí" -+ -+#: keymap_alldefs.h:164 -+msgid "sort messages in reverse order" -+msgstr "sórtáil teachtaireachtaí san ord droim ar ais" -+ -+#: keymap_alldefs.h:165 -+msgid "tag the current entry" -+msgstr "clibeáil an iontráil reatha" -+ -+#: keymap_alldefs.h:166 -+msgid "apply next function to tagged messages" -+msgstr "cuir an chéad fheidhm eile i bhfeidhm ar theachtaireachtaí clibeáilte" -+ -+#: keymap_alldefs.h:167 -+msgid "apply next function ONLY to tagged messages" -+msgstr "" -+"cuir an chéad fheidhm eile i bhfeidhm ar theachtaireachtaí clibeáilte AMHÁIN" -+ -+#: keymap_alldefs.h:168 -+msgid "tag the current subthread" -+msgstr "clibeáil an fhoshnáithe reatha" -+ -+#: keymap_alldefs.h:169 -+msgid "tag the current thread" -+msgstr "clibeáil an snáithe reatha" -+ -+#: keymap_alldefs.h:170 -+msgid "toggle a message's 'new' flag" -+msgstr "scoránaigh bratach 'nua' ar theachtaireacht" -+ -+#: keymap_alldefs.h:171 -+msgid "toggle whether the mailbox will be rewritten" -+msgstr "scoránaigh cé acu an mbeidh an bosca athscríofa, nó nach mbeidh" -+ -+#: keymap_alldefs.h:172 -+msgid "toggle whether to browse mailboxes or all files" -+msgstr "scoránaigh cé acu boscaí poist nó comhaid a bhrabhsálfar" -+ -+#: keymap_alldefs.h:173 -+msgid "move to the top of the page" -+msgstr "téigh go dtí an barr" -+ -+#: keymap_alldefs.h:174 -+msgid "undelete the current entry" -+msgstr "díscrios an iontráil reatha" -+ -+#: keymap_alldefs.h:175 -+msgid "undelete all messages in thread" -+msgstr "díscrios gach teachtaireacht sa snáithe" -+ -+#: keymap_alldefs.h:176 -+msgid "undelete all messages in subthread" -+msgstr "díscrios gach teachtaireacht san fhoshnáithe" -+ -+#: keymap_alldefs.h:177 -+msgid "show the Mutt version number and date" -+msgstr "taispeáin an uimhir leagain Mutt agus an dáta" -+ -+#: keymap_alldefs.h:178 -+msgid "view attachment using mailcap entry if necessary" -+msgstr "amharc ar iatán le hiontráil mailcap, más gá" -+ -+#: keymap_alldefs.h:179 -+msgid "show MIME attachments" -+msgstr "taispeáin iatáin MIME" -+ -+#: keymap_alldefs.h:180 -+msgid "display the keycode for a key press" -+msgstr "taispeáin an cód atá bainte le heochairbhrú" -+ -+#: keymap_alldefs.h:181 -+msgid "show currently active limit pattern" -+msgstr "taispeáin an patrún teorannaithe atá i bhfeidhm" -+ -+#: keymap_alldefs.h:182 -+msgid "collapse/uncollapse current thread" -+msgstr "laghdaigh/leathnaigh an snáithe reatha" -+ -+#: keymap_alldefs.h:183 -+msgid "collapse/uncollapse all threads" -+msgstr "laghdaigh/leathnaigh gach snáithe" -+ -+#: keymap_alldefs.h:184 -+msgid "attach a PGP public key" -+msgstr "ceangail eochair phoiblí PGP" -+ -+#: keymap_alldefs.h:185 -+msgid "show PGP options" -+msgstr "taispeáin roghanna PGP" -+ -+#: keymap_alldefs.h:186 -+msgid "mail a PGP public key" -+msgstr "seol eochair phoiblí PGP" -+ -+#: keymap_alldefs.h:187 -+msgid "verify a PGP public key" -+msgstr "fíoraigh eochair phoiblí PGP" -+ -+#: keymap_alldefs.h:188 -+msgid "view the key's user id" -+msgstr "amharc ar ID úsáideora na heochrach" -+ -+#: keymap_alldefs.h:189 -+msgid "check for classic pgp" -+msgstr "seiceáil le haghaidh pgp clasaiceach" -+ -+#: keymap_alldefs.h:190 -+msgid "Accept the chain constructed" -+msgstr "Glac leis an slabhra cruthaithe" -+ -+#: keymap_alldefs.h:191 -+msgid "Append a remailer to the chain" -+msgstr "Iarcheangail athphostóir leis an slabhra" -+ -+#: keymap_alldefs.h:192 -+msgid "Insert a remailer into the chain" -+msgstr "Ionsáigh athphostóir isteach sa slabhra" -+ -+#: keymap_alldefs.h:193 -+msgid "Delete a remailer from the chain" -+msgstr "Scrios athphostóir as an slabhra" -+ -+#: keymap_alldefs.h:194 -+msgid "Select the previous element of the chain" -+msgstr "Roghnaigh an ball roimhe seo ón slabhra" -+ -+#: keymap_alldefs.h:195 -+msgid "Select the next element of the chain" -+msgstr "Roghnaigh an chéad bhall eile ón slabhra" -+ -+#: keymap_alldefs.h:196 -+msgid "send the message through a mixmaster remailer chain" -+msgstr "seol an teachtaireacht trí shlabhra athphostóirí \"mixmaster\"" -+ -+#: keymap_alldefs.h:197 -+msgid "make decrypted copy and delete" -+msgstr "déan cóip dhíchriptithe agus scrios" -+ -+#: keymap_alldefs.h:198 -+msgid "make decrypted copy" -+msgstr "déan cóip dhíchriptithe" -+ -+#: keymap_alldefs.h:199 -+msgid "wipe passphrase(s) from memory" -+msgstr "bánaigh frása(í) faire as cuimhne" -+ -+#: keymap_alldefs.h:200 -+msgid "extract supported public keys" -+msgstr "bain na heochracha poiblí le tacaíocht amach" -+ -+#: keymap_alldefs.h:201 -+msgid "show S/MIME options" -+msgstr "taispeáin roghanna S/MIME" -+ -+#: lib.c:126 -+msgid "Integer overflow -- can't allocate memory!" -+msgstr "Slánuimhir thar maoil -- ní féidir cuimhne a dháileadh" -+ -+#: lib.c:133 lib.c:148 lib.c:180 -+msgid "Out of memory!" -+msgstr "Cuimhne ídithe!" -+ -+#: main.c:59 -+msgid "" -+"To contact the developers, please mail to .\n" -+"To report a bug, please use the flea(1) utility.\n" -+msgstr "" -+"Chun teagmháil a dhéanamh leis na forbróirí, seol ríomhphost\n" -+"chuig le do thoil. Úsáid an uirlis flea(1)\n" -+"chun tuairiscí fabhtanna a sheoladh, le do thoil.\n" -+ -+#: main.c:63 -+msgid "" -+"Copyright (C) 1996-2002 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 © 1996-2002 Michael R. Elkins agus daoine eile.\n" -+"Níl baránta AR BITH le Mutt; iontráil `mutt -vv' chun tuilleadh\n" -+"eolais a fháil. Is saorbhogearra é Mutt: is féidir leat é\n" -+"a athdháileadh, agus fáilte, ach de réir coinníollacha áirithe.\n" -+"Iontráil `mutt -vv' chun tuilleadh eolais a fháil.\n" -+ -+#: main.c:69 -+msgid "" -+"Copyright (C) 1996-2004 Michael R. Elkins \n" -+"Copyright (C) 1996-2002 Brandon Long \n" -+"Copyright (C) 1997-2005 Thomas Roessler \n" -+"Copyright (C) 1998-2005 Werner Koch \n" -+"Copyright (C) 1999-2005 Brendan Cully \n" -+"Copyright (C) 1999-2002 Tommi Komulainen \n" -+"Copyright (C) 2000-2002 Edmund Grimley Evans \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" -+msgstr "" -+"Copyright © 1996-2004 Michael R. Elkins \n" -+"Copyright © 1996-2002 Brandon Long \n" -+"Copyright © 1997-2005 Thomas Roessler \n" -+"Copyright © 1998-2005 Werner Koch \n" -+"Copyright © 1999-2005 Brendan Cully \n" -+"Copyright © 1999-2002 Tommi Komulainen \n" -+"Copyright © 2000-2002 Edmund Grimley Evans \n" -+"\n" -+"Thug go leor daoine eile cód, ceartúcháin, agus comhairle go leor dúinn.\n" -+"\n" -+"Is saorbhogearra é an ríomhchlár seo; is féidir leat é a scaipeadh agus/nó\n" -+"a athrú de réir na gcoinníollacha den GNU General Public License mar atá\n" -+"foilsithe ag an Free Software Foundation; faoi leagan 2 den cheadúnas,\n" -+"nó (más mian leat) aon leagan níos déanaí.\n" -+"\n" -+"Scaiptear an ríomhchlár seo le súil go mbeidh sé áisiúil,\n" -+"ach GAN AON BARÁNTA; go fiú gan an barántas intuigthe\n" -+"d'INDÍOLTACHT nó FEILIÚNACHT D'FHEIDHM AR LEITH. Féach ar an\n" -+"GNU General Public License chun níos mó sonraí a fháil.\n" -+"\n" -+"Ba chóir go mbeifeá tar éis cóip den GNU General Public License a fháil in\n" -+"éineacht leis an ríomhchlár seo; mura bhfuair, scríobh chuig an Free " -+"Software\n" -+"Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" -+ -+#: main.c:107 -+msgid "" -+"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " -+" ]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " -+"[...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " -+"[...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -D\n" -+" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -" -+"i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" -+" mutt [ -n ] [ -e ] [ -F ] -p\n" -+" mutt -v[v]\n" -+"\n" -+"options:\n" -+" -A \texpand the given alias\n" -+" -a \tattach a file to the message\n" -+" -b
\tspecify a blind carbon-copy (BCC) address\n" -+" -c
\tspecify a carbon-copy (CC) address\n" -+" -D\t\tprint the value of all variables to stdout" -+msgstr "" -+"úsáid: mutt [-nRyzZ] [-e ] [-F ] [-m ] [-f ]\n" -+" mutt [-nR] [-e ] [-F ] -Q [-Q ] [...]\n" -+" mutt [-nR] [-e ] [-F ] -A [-A ] [...]\n" -+" mutt [-nR] [-e ] [-F ] -D\n" -+" mutt [-nx] [-e ] [-a ] [-F ] [-H ] [-i " -+"] [-s <ábhar>] [-b ] [-c ] [...]\n" -+" mutt [-n] [-e ] [-F ] -p\n" -+" mutt -v[v]\n" -+"\n" -+"roghanna:\n" -+" -A \tleathnaigh an t-ailias sonraithe\n" -+" -a \tcuir iatán leis an teachtaireacht\n" -+" -b \tsonraigh seoladh BCC\n" -+" -c \tsonraigh seoladh CC\n" -+" -D\t\tpriontáil luach gach athróige go stdout" -+ -+#: main.c:122 -+msgid " -d \tlog debugging output to ~/.muttdebug0" -+msgstr " -d \tscríobh aschur dífhabhtaithe i ~/.muttdebug0" -+ -+#: main.c:125 -+msgid "" -+" -e \tspecify a command to be executed after initialization\n" -+" -f \tspecify which mailbox to read\n" -+" -F \tspecify an alternate muttrc file\n" -+" -H \tspecify a draft file to read header and body from\n" -+" -i \tspecify a file which Mutt should include in the body\n" -+" -m \tspecify a default mailbox type\n" -+" -n\t\tcauses Mutt not to read the system Muttrc\n" -+" -p\t\trecall a postponed message\n" -+" -Q \tquery a configuration variable\n" -+" -R\t\topen mailbox in read-only mode\n" -+" -s \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 "" -+" -e \tsonraigh ordú le rith i ndiaidh an túsaithe\n" -+" -f \tsonraigh an bosca poist le léamh\n" -+" -F \tsonraigh comhad muttrc mar mhalairt\n" -+" -H \tsonraigh comhad dréachta óna léitear an ceanntásc\n" -+" -i \tsonraigh comhad le cur sa fhreagra\n" -+" -m \tréamhshocraigh cineál bosca poist\n" -+" -n\t\tná léigh Muttrc an chórais\n" -+" -p\t\tathghair teachtaireacht atá ar athlá\n" -+" -Q \tiarratas ar athróg chumraíochta\n" -+" -R\t\toscail bosca poist sa mhód léimh-amháin\n" -+" -s <ábhar>\tsonraigh an t-ábhar (le comharthaí athfhriotail má tá spás " -+"ann)\n" -+" -v\t\ttaispeáin an leagan agus athróga ag an am tiomsaithe\n" -+" -x\t\tinsamhail an mód seolta mailx\n" -+" -y\t\troghnaigh bosca poist as do liosta\n" -+" -z\t\tscoir lom láithreach mura bhfuil aon teachtaireacht sa bhosca\n" -+" -Z\t\toscail an chéad fhillteán le tcht nua, scoir mura bhfuil ceann ann\n" -+" -h\t\tan chabhair seo" -+ -+#: main.c:181 -+msgid "" -+"\n" -+"Compile options:" -+msgstr "" -+"\n" -+"Roghanna tiomsaithe:" -+ -+#: main.c:487 -+msgid "Error initializing terminal." -+msgstr "Earráid agus teirminéal á thúsú" -+ -+#: main.c:597 -+#, c-format -+msgid "Debugging at level %d.\n" -+msgstr "Leibhéal dífhabhtaithe = %d.\n" -+ -+#: main.c:599 -+msgid "DEBUG was not defined during compilation. Ignored.\n" -+msgstr "" -+"Níor sonraíodh an athróg DEBUG le linn tiomsaithe. Rinneadh neamhshuim air.\n" -+ -+#: main.c:749 -+#, c-format -+msgid "%s does not exist. Create it?" -+msgstr "Níl a leithéid de %s ann. Cruthaigh?" -+ -+#: main.c:753 -+#, c-format -+msgid "Can't create %s: %s." -+msgstr "Ní féidir %s a chruthú: %s." -+ -+#: main.c:798 -+msgid "No recipients specified.\n" -+msgstr "Níor sonraíodh aon fhaighteoir.\n" -+ -+#: main.c:884 -+#, c-format -+msgid "%s: unable to attach file.\n" -+msgstr "%s: ní féidir an comhad a cheangal.\n" -+ -+#: main.c:904 -+msgid "No mailbox with new mail." -+msgstr "Níl aon bhosca le ríomhphost nua." -+ -+#: main.c:913 -+msgid "No incoming mailboxes defined." -+msgstr "Níl aon bhosca isteach socraithe agat." -+ -+#: main.c:941 -+msgid "Mailbox is empty." -+msgstr "Is folamh an bosca poist." -+ -+#: mbox.c:129 mbox.c:288 -+#, c-format -+msgid "Reading %s... %d (%d%%)" -+msgstr "%s á léamh... %d (%d%%)" -+ -+#: mbox.c:153 mbox.c:210 -+msgid "Mailbox is corrupt!" -+msgstr "Is truaillithe an bosca poist!" -+ -+#: mbox.c:662 -+msgid "Mailbox was corrupted!" -+msgstr "Truaillíodh an bosca poist!" -+ -+#: mbox.c:701 mbox.c:952 -+msgid "Fatal error! Could not reopen mailbox!" -+msgstr "Earráid mharfach! Ní féidir an bosca poist a athoscailt!" -+ -+#: mbox.c:710 -+msgid "Unable to lock mailbox!" -+msgstr "Ní féidir an bosca poist a chur faoi ghlas!" -+ -+#. * 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: mionathraíodh mbox, ach níor mionathraíodh aon teachtaireacht! (seol " -+"tuairisc fhabht)" -+ -+#: mbox.c:792 -+#, c-format -+msgid "Writing messages... %d (%d%%)" -+msgstr "Teachtaireachtaí á scríobh... %d (%d%%)" -+ -+#. * change/deleted message -+#: mbox.c:905 -+msgid "Committing changes..." -+msgstr "Athruithe á gcur i bhfeidhm..." -+ -+#: mbox.c:936 -+#, c-format -+msgid "Write failed! Saved partial mailbox to %s" -+msgstr "Theip ar scríobh! Sábháladh bosca poist neamhiomlán i %s" -+ -+#: mbox.c:1000 -+msgid "Could not reopen mailbox!" -+msgstr "Níorbh fhéidir an bosca poist a athoscailt!" -+ -+#: mbox.c:1035 -+msgid "Reopening mailbox..." -+msgstr "Bosca poist á athoscailt..." -+ -+#: menu.c:419 -+msgid "Jump to: " -+msgstr "Téigh go: " -+ -+#: menu.c:428 -+msgid "Invalid index number." -+msgstr "Uimhir innéacs neamhbhailí." -+ -+#: 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 "Níl aon iontráil ann." -+ -+#: menu.c:450 -+msgid "You cannot scroll down farther." -+msgstr "Ní féidir leat scrollú síos níos mó." -+ -+#: menu.c:468 -+msgid "You cannot scroll up farther." -+msgstr "Ní féidir leat scrollú suas níos mó." -+ -+#: menu.c:511 -+msgid "You are on the first page." -+msgstr "Ar an chéad leathanach." -+ -+#: menu.c:512 -+msgid "You are on the last page." -+msgstr "Ar an leathanach deireanach." -+ -+#: menu.c:647 -+msgid "You are on the last entry." -+msgstr "Ar an iontráil dheireanach." -+ -+#: menu.c:658 -+msgid "You are on the first entry." -+msgstr "Ar an chéad iontráil." -+ -+#: menu.c:718 pattern.c:1303 -+msgid "Search for: " -+msgstr "Déan cuardach ar: " -+ -+#: menu.c:719 pattern.c:1304 -+msgid "Reverse search for: " -+msgstr "Déan cuardach droim ar ais ar: " -+ -+#: menu.c:729 pattern.c:1336 -+msgid "No search pattern." -+msgstr "Gan patrún cuardaigh." -+ -+#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1405 -+msgid "Not found." -+msgstr "Ar iarraidh." -+ -+#: menu.c:889 -+msgid "No tagged entries." -+msgstr "Níl aon iontráil chlibeáilte." -+ -+#: menu.c:994 -+msgid "Search is not implemented for this menu." -+msgstr "Níl cuardach le fáil sa roghchlár seo." -+ -+#: menu.c:999 -+msgid "Jumping is not implemented for dialogs." -+msgstr "Ní féidir a léim i ndialóga." -+ -+#: menu.c:1040 -+msgid "Tagging is not supported." -+msgstr "Níl clibeáil le fáil." -+ -+#: mh.c:667 mh.c:923 -+#, c-format -+msgid "Reading %s... %d" -+msgstr "%s á léamh... %d" -+ -+#: mh.c:1203 -+msgid "maildir_commit_message(): unable to set time on file" -+msgstr "maildir_commit_message(): ní féidir an t-am a shocrú ar chomhad" -+ -+#: mutt_socket.c:91 mutt_socket.c:147 -+#, c-format -+msgid "Connection to %s closed" -+msgstr "Nasc le %s dúnta" -+ -+#: mutt_socket.c:269 -+msgid "SSL is unavailable." -+msgstr "Níl SSL ar fáil." -+ -+#: mutt_socket.c:300 -+msgid "Preconnect command failed." -+msgstr "Theip ar ordú réamhnaisc." -+ -+#: mutt_socket.c:371 mutt_socket.c:385 -+#, c-format -+msgid "Error talking to %s (%s)" -+msgstr "Earráid i rith déanamh teagmháil le %s (%s)" -+ -+#: mutt_socket.c:424 mutt_socket.c:482 -+#, c-format -+msgid "Bad IDN \"%s\"." -+msgstr "DrochIDN \"%s\"." -+ -+#: mutt_socket.c:431 mutt_socket.c:489 -+#, c-format -+msgid "Looking up %s..." -+msgstr "%s á chuardach..." -+ -+#: mutt_socket.c:442 mutt_socket.c:496 -+#, c-format -+msgid "Could not find the host \"%s\"" -+msgstr "Níorbh fhéidir dul i dteagmháil leis an óstríomhaire \"%s\"" -+ -+#: mutt_socket.c:447 mutt_socket.c:505 -+#, c-format -+msgid "Connecting to %s..." -+msgstr "Ag dul i dteagmháil le %s..." -+ -+#: mutt_socket.c:529 -+#, c-format -+msgid "Could not connect to %s (%s)." -+msgstr "Níorbh fhéidir dul i dteagmháil le %s (%s)." -+ -+#: mutt_ssl.c:175 -+msgid "Failed to find enough entropy on your system" -+msgstr "Níl go leor eantrópacht ar fáil ar do chóras-sa" -+ -+#: mutt_ssl.c:199 -+#, c-format -+msgid "Filling entropy pool: %s...\n" -+msgstr "Linn eantrópachta á líonadh: %s...\n" -+ -+#: mutt_ssl.c:207 -+#, c-format -+msgid "%s has insecure permissions!" -+msgstr "Ceadanna neamhdhaingne ar %s!" -+ -+#: mutt_ssl.c:226 -+msgid "SSL disabled due the lack of entropy" -+msgstr "Díchumasaíodh SSL de bharr easpa eantrópachta" -+ -+#: mutt_ssl.c:322 -+msgid "I/O error" -+msgstr "Earráid I/A" -+ -+#: mutt_ssl.c:331 -+#, c-format -+msgid "SSL failed: %s" -+msgstr "Theip ar SSL: %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 "Níorbh fhéidir an teastas a fháil ón gcomhghleacaí" -+ -+#: mutt_ssl.c:348 -+#, c-format -+msgid "SSL connection using %s (%s)" -+msgstr "Nasc SSL le %s (%s)" -+ -+#: mutt_ssl.c:392 -+msgid "Unknown" -+msgstr "Anaithnid" -+ -+#: mutt_ssl.c:417 mutt_ssl_gnutls.c:381 -+#, c-format -+msgid "[unable to calculate]" -+msgstr "[ní féidir a ríomh]" -+ -+#: mutt_ssl.c:435 mutt_ssl_gnutls.c:404 -+msgid "[invalid date]" -+msgstr "[dáta neamhbhailí]" -+ -+#: mutt_ssl.c:556 -+msgid "Server certificate is not yet valid" -+msgstr "Tá an teastas neamhbhailí fós" -+ -+#: mutt_ssl.c:563 -+msgid "Server certificate has expired" -+msgstr "Tá an teastas as feidhm" -+ -+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:634 -+msgid "This certificate belongs to:" -+msgstr "Tá an teastas seo ag:" -+ -+#: mutt_ssl.c:640 mutt_ssl_gnutls.c:673 -+msgid "This certificate was issued by:" -+msgstr "Bhí an teastas seo eisithe ag:" -+ -+#: mutt_ssl.c:651 mutt_ssl_gnutls.c:712 -+#, c-format -+msgid "This certificate is valid" -+msgstr "Tá an teastas bailí" -+ -+#: mutt_ssl.c:652 mutt_ssl_gnutls.c:715 -+#, c-format -+msgid " from %s" -+msgstr " ó %s" -+ -+#: mutt_ssl.c:654 mutt_ssl_gnutls.c:719 -+#, c-format -+msgid " to %s" -+msgstr " go %s" -+ -+#: mutt_ssl.c:660 -+#, c-format -+msgid "Fingerprint: %s" -+msgstr "Méarlorg: %s" -+ -+#: mutt_ssl.c:662 -+msgid "SSL Certificate check" -+msgstr "Seiceáil Teastais SSL" -+ -+#: mutt_ssl.c:666 mutt_ssl_gnutls.c:760 -+msgid "(r)eject, accept (o)nce, (a)ccept always" -+msgstr "(d)iúltaigh, glac leis (u)air amháin, gl(a)c leis i gcónaí" -+ -+#: mutt_ssl.c:667 mutt_ssl_gnutls.c:761 -+msgid "roa" -+msgstr "dua" -+ -+#: mutt_ssl.c:671 mutt_ssl_gnutls.c:765 -+msgid "(r)eject, accept (o)nce" -+msgstr "(d)iúltaigh, glac leis (u)air amháin" -+ -+#: mutt_ssl.c:672 mutt_ssl_gnutls.c:766 -+msgid "ro" -+msgstr "du" -+ -+#: mutt_ssl.c:703 mutt_ssl_gnutls.c:815 -+msgid "Warning: Couldn't save certificate" -+msgstr "Rabhadh: Ní féidir an teastas a shábháil" -+ -+#: mutt_ssl.c:708 mutt_ssl_gnutls.c:820 -+msgid "Certificate saved" -+msgstr "Sábháladh an teastas" -+ -+#: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117 -+msgid "Error: no TLS socket open" -+msgstr "Earráid: níl aon soicéad oscailte TLS" -+ -+#: mutt_ssl_gnutls.c:204 -+msgid "All available protocols for TLS/SSL connection disabled" -+msgstr "Díchumasaíodh gach prótacal atá le fáil le haghaidh naisc TLS/SSL" -+ -+#: mutt_ssl_gnutls.c:265 -+#, c-format -+msgid "SSL/TLS connection using %s (%s/%s/%s)" -+msgstr "Nasc SSL/TLS le %s (%s/%s/%s)" -+ -+#: mutt_ssl_gnutls.c:508 -+#, c-format -+msgid "Certificate verification error (%s)" -+msgstr "Earráid agus teastas á fhíorú (%s)" -+ -+#: mutt_ssl_gnutls.c:516 -+msgid "Certificate is not X.509" -+msgstr "Ní X.509 é an teastas" -+ -+#: mutt_ssl_gnutls.c:523 -+msgid "Error initialising gnutls certificate data" -+msgstr "Earráid agus sonraí teastais gnutls á dtúsú" -+ -+#: mutt_ssl_gnutls.c:539 -+msgid "Error processing certificate data" -+msgstr "Earráid agus sonraí an teastais á bpróiseáil" -+ -+#: mutt_ssl_gnutls.c:724 -+#, c-format -+msgid "SHA1 Fingerprint: %s" -+msgstr "Méarlorg SHA1: %s" -+ -+#: mutt_ssl_gnutls.c:727 -+#, c-format -+msgid "MD5 Fingerprint: %s" -+msgstr "Méarlorg MD5: %s" -+ -+#: mutt_ssl_gnutls.c:732 -+msgid "WARNING: Server certificate is not yet valid" -+msgstr "RABHADH: Níl teastas an fhreastalaí bailí fós" -+ -+#: mutt_ssl_gnutls.c:737 -+msgid "WARNING: Server certificate has expired" -+msgstr "RABHADH: Tá teastas an fhreastalaí as feidhm" -+ -+#: mutt_ssl_gnutls.c:742 -+msgid "WARNING: Server certificate has been revoked" -+msgstr "RABHADH: Aisghaireadh an teastas freastalaí" -+ -+#: mutt_ssl_gnutls.c:747 -+msgid "WARNING: Server hostname does not match certificate" -+msgstr "RABHADH: Níl óstainm an fhreastalaí comhoiriúnach leis an teastas." -+ -+#: mutt_ssl_gnutls.c:752 -+msgid "WARNING: Signer of server certificate is not a CA" -+msgstr "RABHADH: Ní CA é sínitheoir an teastais" -+ -+#: mutt_ssl_gnutls.c:755 -+msgid "TLS/SSL Certificate check" -+msgstr "Seiceáil Teastais TLS/SSL" -+ -+#: mutt_tunnel.c:70 -+#, c-format -+msgid "Connecting with \"%s\"..." -+msgstr "Ag dul i dteagmháil le \"%s\"..." -+ -+#: mutt_tunnel.c:137 -+#, c-format -+msgid "Tunnel to %s returned error %d (%s)" -+msgstr "D'fhill tollán %s earráid %d (%s)" -+ -+#: mutt_tunnel.c:155 mutt_tunnel.c:171 -+#, c-format -+msgid "Tunnel error talking to %s: %s" -+msgstr "Earráid tolláin i rith déanamh teagmháil le %s: %s" -+ -+#: muttlib.c:910 -+msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" -+msgstr "" -+"Is comhadlann é an comhad seo, sábháil fúithi? [(s)ábháil, (n)á sábháil, (u)" -+"ile]" -+ -+#: muttlib.c:910 -+msgid "yna" -+msgstr "snu" -+ -+#: muttlib.c:926 -+msgid "File is a directory, save under it?" -+msgstr "Is comhadlann í an comhad seo, sábháil fúithi?" -+ -+#: muttlib.c:932 -+msgid "File under directory: " -+msgstr "Comhad faoin chomhadlann: " -+ -+#: muttlib.c:944 -+msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?" -+msgstr "Tá an comhad ann cheana, (f)orscríobh, c(u)ir leis, nó (c)ealaigh?" -+ -+#: muttlib.c:944 -+msgid "oac" -+msgstr "fuc" -+ -+#: muttlib.c:1263 -+msgid "Can't save message to POP mailbox." -+msgstr "Ní féidir teachtaireacht a shábháil i mbosca poist POP." -+ -+#: muttlib.c:1272 -+#, c-format -+msgid "Append messages to %s?" -+msgstr "Iarcheangail teachtaireachtaí le %s?" -+ -+#: muttlib.c:1284 -+#, c-format -+msgid "%s is not a mailbox!" -+msgstr "Ní bosca poist %s!" -+ -+#: mx.c:120 -+#, c-format -+msgid "Lock count exceeded, remove lock for %s?" -+msgstr "Sáraíodh líon na nglas, bain glas do %s?" -+ -+#: mx.c:132 -+#, c-format -+msgid "Can't dotlock %s.\n" -+msgstr "Ní féidir %s a phoncghlasáil.\n" -+ -+#: mx.c:190 -+msgid "Timeout exceeded while attempting fcntl lock!" -+msgstr "Thar am agus glas fcntl á dhéanamh!" -+ -+#: mx.c:196 -+#, c-format -+msgid "Waiting for fcntl lock... %d" -+msgstr "Ag feitheamh le glas fcntl... %d" -+ -+#: mx.c:224 -+msgid "Timeout exceeded while attempting flock lock!" -+msgstr "Thar am agus glas flock á dhéanamh!" -+ -+#: mx.c:231 -+#, c-format -+msgid "Waiting for flock attempt... %d" -+msgstr "Ag feitheamh le hiarracht flock... %d" -+ -+#: mx.c:595 -+#, c-format -+msgid "Couldn't lock %s\n" -+msgstr "Níorbh fhéidir %s a ghlasáil\n" -+ -+#: mx.c:679 -+#, c-format -+msgid "Reading %s..." -+msgstr "%s á léamh..." -+ -+#: mx.c:779 -+#, c-format -+msgid "Writing %s..." -+msgstr "%s á scríobh..." -+ -+#: mx.c:812 -+#, c-format -+msgid "Could not synchronize mailbox %s!" -+msgstr "Níorbh fhéidir an bosca poist %s a shioncrónú!" -+ -+#: mx.c:878 -+#, c-format -+msgid "Move read messages to %s?" -+msgstr "Bog na teachtaireachtaí léite go %s?" -+ -+#: mx.c:894 mx.c:1150 -+#, c-format -+msgid "Purge %d deleted message?" -+msgstr "Glan %d teachtaireacht scriosta?" -+ -+#: mx.c:894 mx.c:1150 -+#, c-format -+msgid "Purge %d deleted messages?" -+msgstr "Glan %d teachtaireacht scriosta?" -+ -+#: mx.c:918 -+#, c-format -+msgid "Moving read messages to %s..." -+msgstr "Teachtaireachtaí léite á mbogadh go %s..." -+ -+#: mx.c:977 mx.c:1141 -+msgid "Mailbox is unchanged." -+msgstr "Bosca poist gan athrú." -+ -+#: mx.c:1013 -+#, c-format -+msgid "%d kept, %d moved, %d deleted." -+msgstr "%d coinnithe, %d aistrithe, %d scriosta." -+ -+#: mx.c:1016 mx.c:1190 -+#, c-format -+msgid "%d kept, %d deleted." -+msgstr "%d coinnithe, %d scriosta." -+ -+#: mx.c:1126 -+#, c-format -+msgid " Press '%s' to toggle write" -+msgstr " Brúigh '%s' chun mód scríofa a scoránú" -+ -+#: mx.c:1128 -+msgid "Use 'toggle-write' to re-enable write!" -+msgstr "Bain úsáid as 'toggle-write' chun an mód scríofa a athchumasú!" -+ -+#: mx.c:1130 -+#, c-format -+msgid "Mailbox is marked unwritable. %s" -+msgstr "Tá an bosca poist marcáilte \"neamh-inscríofa\". %s" -+ -+#: mx.c:1187 -+msgid "Mailbox checkpointed." -+msgstr "Seicphointeáladh an bosca poist." -+ -+#: mx.c:1499 -+msgid "Can't write message" -+msgstr "Ní féidir teachtaireacht a scríobh " -+ -+#: mx.c:1544 -+msgid "Integer overflow -- can't allocate memory." -+msgstr "Slánuimhir thar maoil -- ní féidir cuimhne a dháileadh." -+ -+#: pager.c:57 -+msgid "Not available in this menu." -+msgstr "Ní ar fáil sa roghchlár seo." -+ -+#: pager.c:1484 -+msgid "PrevPg" -+msgstr "Suas " -+ -+#: pager.c:1485 -+msgid "NextPg" -+msgstr "Síos " -+ -+#: pager.c:1489 -+msgid "View Attachm." -+msgstr "Iatáin" -+ -+#: pager.c:1492 -+msgid "Next" -+msgstr "Ar Aghaidh" -+ -+#. 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 "Is bun na teachtaireachta é seo." -+ -+#: pager.c:1904 pager.c:1926 pager.c:1933 pager.c:1940 -+msgid "Top of message is shown." -+msgstr "Is barr na teachtaireachta é seo." -+ -+#: pager.c:2009 -+msgid "Reverse search: " -+msgstr "Cuardach droim ar ais: " -+ -+#: pager.c:2010 -+msgid "Search: " -+msgstr "Cuardaigh: " -+ -+#: pager.c:2130 -+msgid "Help is currently being shown." -+msgstr "Cabhair á taispeáint faoi láthair." -+ -+#: pager.c:2159 -+msgid "No more quoted text." -+msgstr "Níl a thuilleadh téacs athfhriotail ann." -+ -+#: pager.c:2172 -+msgid "No more unquoted text after quoted text." -+msgstr "Níl a thuilleadh téacs gan athfhriotal tar éis téacs athfhriotail." -+ -+#: parse.c:602 -+msgid "multipart message has no boundary parameter!" -+msgstr "teachtaireacht ilchodach gan paraiméadar teoranta!" -+ -+#: pattern.c:263 -+#, c-format -+msgid "Error in expression: %s" -+msgstr "Earráid i slonn: %s" -+ -+#: pattern.c:389 -+#, c-format -+msgid "Invalid day of month: %s" -+msgstr "Lá neamhbhailí na míosa: %s" -+ -+#: pattern.c:403 -+#, c-format -+msgid "Invalid month: %s" -+msgstr "Mí neamhbhailí: %s" -+ -+#. getDate has its own error message, don't overwrite it here -+#: pattern.c:555 -+#, c-format -+msgid "Invalid relative date: %s" -+msgstr "Dáta coibhneasta neamhbhailí: %s" -+ -+#: pattern.c:569 -+msgid "error in expression" -+msgstr "earráid i slonn" -+ -+#: pattern.c:784 pattern.c:894 -+#, c-format -+msgid "error in pattern at: %s" -+msgstr "earráid i slonn ag: %s" -+ -+#: pattern.c:834 -+#, c-format -+msgid "%c: invalid command" -+msgstr "%c: ordú neamhbhailí" -+ -+#: pattern.c:840 -+#, c-format -+msgid "%c: not supported in this mode" -+msgstr "%c: níl sé ar fáil sa mhód seo" -+ -+#: pattern.c:853 -+#, c-format -+msgid "missing parameter" -+msgstr "paraiméadar ar iarraidh" -+ -+#: pattern.c:869 -+#, c-format -+msgid "mismatched parenthesis: %s" -+msgstr "lúibín gan meaitseáil: %s" -+ -+#: pattern.c:901 -+msgid "empty pattern" -+msgstr "slonn folamh" -+ -+#: pattern.c:1117 -+#, c-format -+msgid "error: unknown op %d (report this error)." -+msgstr "earráid: op anaithnid %d (seol tuairisc fhabht)." -+ -+#: pattern.c:1193 pattern.c:1322 -+msgid "Compiling search pattern..." -+msgstr "Patrún cuardaigh á thiomsú..." -+ -+#: pattern.c:1212 -+msgid "Executing command on matching messages..." -+msgstr "Ordú á rith ar theachtaireachtaí comhoiriúnacha..." -+ -+#: pattern.c:1275 -+msgid "No messages matched criteria." -+msgstr "Ní raibh aon teachtaireacht chomhoiriúnach." -+ -+#: pattern.c:1364 -+msgid "Search hit bottom without finding match" -+msgstr "Bhuail an cuardach an bun gan teaghrán comhoiriúnach" -+ -+#: pattern.c:1375 -+msgid "Search hit top without finding match" -+msgstr "Bhuail an cuardach an barr gan teaghrán comhoiriúnach" -+ -+#: pattern.c:1397 -+msgid "Search interrupted." -+msgstr "Idirbhriseadh an cuardach." -+ -+#: pgp.c:90 -+msgid "Enter PGP passphrase:" -+msgstr "Iontráil frása faire PGP:" -+ -+#: pgp.c:104 -+msgid "PGP passphrase forgotten." -+msgstr "Rinneadh dearmad ar an bhfrása faire PGP." -+ -+#: pgp.c:345 -+msgid "[-- Error: unable to create PGP subprocess! --]\n" -+msgstr "[-- Earráid: ní féidir fo-phróiseas PGP a chruthú! --]\n" -+ -+#: pgp.c:379 pgp.c:620 pgp.c:824 -+msgid "" -+"[-- End of PGP output --]\n" -+"\n" -+msgstr "" -+"[-- Deireadh an aschuir PGP --]\n" -+"\n" -+ -+#: pgp.c:392 pgp.c:956 -+msgid "Could not decrypt PGP message" -+msgstr "Níorbh fhéidir an teachtaireacht PGP a dhíchriptiú" -+ -+#. clear 'Invoking...' message, since there's no error -+#: pgp.c:441 pgp.c:952 -+msgid "PGP message successfully decrypted." -+msgstr "D'éirigh le díchriptiú na teachtaireachta PGP." -+ -+#: pgp.c:728 -+msgid "Internal error. Inform ." -+msgstr "Earráid inmheánach. Cuir in iúl do ." -+ -+#: pgp.c:789 -+msgid "" -+"[-- Error: could not create a PGP subprocess! --]\n" -+"\n" -+msgstr "" -+"[-- Earráid: ní féidir fo-phróiseas PGP a chruthú! --]\n" -+"\n" -+ -+#: pgp.c:833 -+msgid "Decryption failed" -+msgstr "Theip ar dhíchriptiú" -+ -+#: pgp.c:1008 -+msgid "Can't open PGP subprocess!" -+msgstr "Ní féidir fo-phróiseas PGP a oscailt!" -+ -+#: pgp.c:1444 -+msgid "Can't invoke PGP" -+msgstr "Ní féidir PGP a thosú" -+ -+#: pgp.c:1545 -+#, c-format -+msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " -+msgstr "PGP (c)ript, (s)ínigh, sínigh (m)ar, (a)raon, %s, nó (n)á déan? " -+ -+#: pgp.c:1546 -+msgid "PGP/M(i)ME" -+msgstr "PGP/M(i)ME" -+ -+#: pgp.c:1546 -+msgid "(i)nline" -+msgstr "(i)nlíne" -+ -+#: pgp.c:1548 -+msgid "esabifc" -+msgstr "csmaifn" -+ -+#: pgpinvoke.c:307 -+msgid "Fetching PGP key..." -+msgstr "Eochair PGP á fáil..." -+ -+#: pgpkey.c:490 -+msgid "All matching keys are expired, revoked, or disabled." -+msgstr "" -+"Is as feidhm, aisghairthe, nó díchumasaithe gach eochair chomhoiriúnach." -+ -+#: pgpkey.c:532 -+#, c-format -+msgid "PGP keys matching <%s>." -+msgstr "Eochracha PGP atá comhoiriúnach le <%s>." -+ -+#: pgpkey.c:534 -+#, c-format -+msgid "PGP keys matching \"%s\"." -+msgstr "Eochracha PGP atá comhoiriúnach le \"%s\"." -+ -+#: pgpkey.c:553 pgpkey.c:745 -+msgid "Can't open /dev/null" -+msgstr "Ní féidir /dev/null a oscailt" -+ -+#: pgpkey.c:724 -+msgid "Please enter the key ID: " -+msgstr "Iontráil an keyID, le do thoil: " -+ -+#: pgpkey.c:752 -+msgid "Invoking pgp..." -+msgstr "PGP á thosú..." -+ -+#: pgpkey.c:777 -+#, c-format -+msgid "PGP Key %s." -+msgstr "Eochair PGP %s." -+ -+#: pop.c:91 pop_lib.c:201 -+#, c-format -+msgid "Command TOP is not supported by server." -+msgstr "Ní ghlacann an freastalaí leis an ordú TOP." -+ -+#: pop.c:118 -+msgid "Can't write header to temporary file!" -+msgstr "ní féidir ceanntásc a scríobh chuig comhad sealadach" -+ -+#: pop.c:199 pop_lib.c:203 -+#, c-format -+msgid "Command UIDL is not supported by server." -+msgstr "Ní ghlacann an freastalaí leis an ordú UIDL." -+ -+#: pop.c:248 pop.c:565 -+#, c-format -+msgid "%s is an invalid POP path" -+msgstr "%s: is conair POP neamhbhailí" -+ -+#: pop.c:279 -+msgid "Fetching list of messages..." -+msgstr "Liosta teachtaireachtaí á fháil..." -+ -+#: pop.c:418 -+msgid "Can't write message to temporary file!" -+msgstr "ní féidir teachtaireacht a scríobh i gcomhad sealadach!" -+ -+#: pop.c:520 pop.c:585 -+msgid "Checking for new messages..." -+msgstr "Ag seiceáil do theachtaireachtaí nua..." -+ -+#: pop.c:549 -+msgid "POP host is not defined." -+msgstr "ní bhfuarthas an t-óstríomhaire POP." -+ -+#: pop.c:613 -+msgid "No new mail in POP mailbox." -+msgstr "Níl aon phost nua sa bhosca POP." -+ -+#: pop.c:620 -+msgid "Delete messages from server?" -+msgstr "Scrios teachtaireachtaí ón fhreastalaí?" -+ -+#: pop.c:622 -+#, c-format -+msgid "Reading new messages (%d bytes)..." -+msgstr "Teachtaireachtaí nua á léamh (%d beart)..." -+ -+#: pop.c:664 -+msgid "Error while writing mailbox!" -+msgstr "Earráid agus bosca poist á scríobh!" -+ -+#: pop.c:668 -+#, c-format -+msgid "%s [%d of %d messages read]" -+msgstr "%s [léadh %d as %d teachtaireacht]" -+ -+#: pop.c:691 pop_lib.c:373 -+msgid "Server closed connection!" -+msgstr "Dhún an freastalaí an nasc!" -+ -+#: pop_auth.c:79 -+msgid "Authenticating (SASL)..." -+msgstr "Á fhíordheimhniú (SASL)..." -+ -+#: pop_auth.c:184 -+msgid "Authenticating (APOP)..." -+msgstr "Á fhíordheimhniú (APOP)..." -+ -+#: pop_auth.c:208 -+msgid "APOP authentication failed." -+msgstr "Theip ar fhíordheimhniú APOP." -+ -+#: pop_auth.c:243 -+#, c-format -+msgid "Command USER is not supported by server." -+msgstr "Ní ghlacann an freastalaí leis an ordú USER." -+ -+#: pop_lib.c:199 -+msgid "Unable to leave messages on server." -+msgstr "Ní féidir teachtaireachtaí a fhágáil ar an bhfreastalaí." -+ -+#: pop_lib.c:229 -+#, c-format -+msgid "Error connecting to server: %s" -+msgstr "Earráid ag nascadh leis an bhfreastalaí: %s" -+ -+#: pop_lib.c:387 -+msgid "Closing connection to POP server..." -+msgstr "Nasc leis an bhfreastalaí POP á dhúnadh..." -+ -+#: pop_lib.c:557 -+msgid "Verifying message indexes..." -+msgstr "Innéacsanna na dteachtaireachtaí á bhfíorú..." -+ -+#: pop_lib.c:580 -+msgid "Connection lost. Reconnect to POP server?" -+msgstr "Cailleadh an nasc. Athnasc leis an bhfreastalaí POP?" -+ -+#: postpone.c:167 -+msgid "Postponed Messages" -+msgstr "Teachtaireachtaí Ar Athlá" -+ -+#: postpone.c:247 postpone.c:256 -+msgid "No postponed messages." -+msgstr "Níl aon teachtaireacht ar athlá." -+ -+#: postpone.c:442 postpone.c:463 postpone.c:497 -+msgid "Illegal PGP header" -+msgstr "Ceanntásc neamhcheadaithe PGP" -+ -+#: postpone.c:483 -+msgid "Illegal S/MIME header" -+msgstr "Ceanntásc neamhcheadaithe S/MIME" -+ -+#: postpone.c:556 -+msgid "Decrypting message..." -+msgstr "Teachtaireacht á díchriptiú..." -+ -+#: postpone.c:565 -+msgid "Decryption failed." -+msgstr "Theip ar dhíchriptiú." -+ -+#: query.c:50 -+msgid "New Query" -+msgstr "Iarratas Nua" -+ -+#: query.c:51 -+msgid "Make Alias" -+msgstr "Déan Ailias" -+ -+#: query.c:52 -+msgid "Search" -+msgstr "Cuardaigh" -+ -+#: query.c:99 -+msgid "Waiting for response..." -+msgstr "Ag feitheamh le freagra..." -+ -+#: query.c:235 query.c:263 -+msgid "Query command not defined." -+msgstr "Níl aon ordú iarratais sainmhínithe." -+ -+#: query.c:290 -+#, c-format -+msgid "Query" -+msgstr "Iarratas" -+ -+#. Prompt for Query -+#: query.c:303 query.c:328 -+msgid "Query: " -+msgstr "Iarratas: " -+ -+#: query.c:311 query.c:337 -+#, c-format -+msgid "Query '%s'" -+msgstr "Iarratas '%s'" -+ -+#: recvattach.c:56 -+msgid "Pipe" -+msgstr "Píopa" -+ -+#: recvattach.c:57 -+msgid "Print" -+msgstr "Priontáil" -+ -+#: recvattach.c:435 -+msgid "Saving..." -+msgstr "Á Shábháil..." -+ -+#: recvattach.c:438 recvattach.c:527 -+msgid "Attachment saved." -+msgstr "Sábháladh an t-iatán." -+ -+#: recvattach.c:539 -+#, c-format -+msgid "WARNING! You are about to overwrite %s, continue?" -+msgstr "RABHADH! Tá tú ar tí %s a fhorscríobh, lean ar aghaidh?" -+ -+#: recvattach.c:557 -+msgid "Attachment filtered." -+msgstr "Scagadh an t-iatán." -+ -+#: recvattach.c:624 -+msgid "Filter through: " -+msgstr "Scagaire: " -+ -+#: recvattach.c:624 -+msgid "Pipe to: " -+msgstr "Píopa go: " -+ -+#: recvattach.c:659 -+#, c-format -+msgid "I dont know how to print %s attachments!" -+msgstr "Ní eol dom conas a phriontáil iatáin %s!" -+ -+#: recvattach.c:724 -+msgid "Print tagged attachment(s)?" -+msgstr "Priontáil iatá(i)n c(h)libeáilte?" -+ -+#: recvattach.c:724 -+msgid "Print attachment?" -+msgstr "Priontáil iatán?" -+ -+#: recvattach.c:957 -+msgid "Can't decrypt encrypted message!" -+msgstr "Ní féidir teachtaireacht chriptithe a dhíchriptiú!" -+ -+#: recvattach.c:970 -+msgid "Attachments" -+msgstr "Iatáin" -+ -+#: recvattach.c:1006 -+msgid "There are no subparts to show!" -+msgstr "Níl aon fopháirt le taispeáint!" -+ -+#: recvattach.c:1067 -+msgid "Can't delete attachment from POP server." -+msgstr "Ní féidir an t-iatán a scriosadh ón fhreastalaí POP." -+ -+#: recvattach.c:1075 -+msgid "Deletion of attachments from encrypted messages is unsupported." -+msgstr "Ní cheadaítear iatáin a bheith scriosta ó theachtaireachtaí criptithe." -+ -+#: recvattach.c:1094 recvattach.c:1111 -+msgid "Only deletion of multipart attachments is supported." -+msgstr "Ní cheadaítear ach iatáin ilpháirt a bheith scriosta." -+ -+#: recvcmd.c:47 -+msgid "You may only bounce message/rfc822 parts." -+msgstr "Ní cheadaítear ach páirteanna message/rfc822 a scinneadh." -+ -+#: recvcmd.c:217 -+msgid "Error bouncing message!" -+msgstr "Earráid agus teachtaireacht á scinneadh!" -+ -+#: recvcmd.c:217 -+msgid "Error bouncing messages!" -+msgstr "Earráid agus teachtaireachtaí á scinneadh!" -+ -+#: recvcmd.c:417 -+#, c-format -+msgid "Can't open temporary file %s." -+msgstr "Ní féidir an comhad sealadach %s a oscailt." -+ -+#: recvcmd.c:448 -+msgid "Forward as attachments?" -+msgstr "Seol iad ar aghaidh mar iatáin?" -+ -+#: recvcmd.c:462 -+msgid "Can't decode all tagged attachments. MIME-forward the others?" -+msgstr "" -+"Ní féidir gach iatán clibeáilte a dhíchódú. Cuir na cinn eile ar aghaidh mar " -+"MIME?" -+ -+#: recvcmd.c:587 -+msgid "Forward MIME encapsulated?" -+msgstr "Cuir ar aghaidh, cuachta mar MIME?" -+ -+#: recvcmd.c:595 recvcmd.c:845 -+#, c-format -+msgid "Can't create %s." -+msgstr "Ní féidir %s a chruthú." -+ -+#: recvcmd.c:728 -+msgid "Can't find any tagged messages." -+msgstr "Ní féidir aon teachtaireacht chlibeáilte a aimsiú." -+ -+#: recvcmd.c:749 send.c:715 -+msgid "No mailing lists found!" -+msgstr "Níor aimsíodh aon liosta postála!" -+ -+#: recvcmd.c:824 -+msgid "Can't decode all tagged attachments. MIME-encapsulate the others?" -+msgstr "" -+"Ní féidir gach iatán clibeáilte a dhíchódú. Cuach na cinn eile mar MIME?" -+ -+#: remailer.c:484 -+msgid "Append" -+msgstr "Iarcheangail" -+ -+#: remailer.c:485 -+msgid "Insert" -+msgstr "Ionsáigh" -+ -+#: remailer.c:486 -+msgid "Delete" -+msgstr "Scrios" -+ -+#: remailer.c:488 -+msgid "OK" -+msgstr "OK" -+ -+#: remailer.c:516 -+msgid "Can't get mixmaster's type2.list!" -+msgstr "Ní féidir type2.list ag mixmaster a fháil!" -+ -+#: remailer.c:542 -+msgid "Select a remailer chain." -+msgstr "Roghnaigh slabhra athphostóirí." -+ -+#: remailer.c:602 -+#, c-format -+msgid "Error: %s can't be used as the final remailer of a chain." -+msgstr "Earráid: ní féidir %s a úsáid mar an t-athphostóir deiridh i slabhra." -+ -+#: remailer.c:632 -+#, c-format -+msgid "Mixmaster chains are limited to %d elements." -+msgstr "Ní cheadaítear ach %d ball i slabhra \"mixmaster\"." -+ -+#: remailer.c:655 -+msgid "The remailer chain is already empty." -+msgstr "Tá an slabhra athphostóirí folamh cheana féin." -+ -+#: remailer.c:665 -+msgid "You already have the first chain element selected." -+msgstr "Tá an chéad bhall slabhra roghnaithe agat cheana." -+ -+#: remailer.c:675 -+msgid "You already have the last chain element selected." -+msgstr "Tá ball deiridh an slabhra roghnaithe agat cheana." -+ -+#: remailer.c:714 -+msgid "Mixmaster doesn't accept Cc or Bcc headers." -+msgstr "Ní ghlacann \"mixmaster\" le ceanntásca Cc nó Bcc." -+ -+#: remailer.c:738 -+msgid "Please set the hostname variable to a proper value when using mixmaster!" -+msgstr "" -+"Socraigh an athróg óstainm go cuí le do thoil le linn úsáid \"mixmaster\"!" -+ -+#: remailer.c:772 -+#, c-format -+msgid "Error sending message, child exited %d.\n" -+msgstr "" -+"Earráid agus teachtaireacht á seoladh, scoir an macphróiseas le stádas %d.\n" -+ -+#: remailer.c:776 -+msgid "Error sending message." -+msgstr "Earráid agus teachtaireacht á seoladh." -+ -+#: rfc1524.c:163 -+#, c-format -+msgid "Improperly formated entry for type %s in \"%s\" line %d" -+msgstr "Iontráil mhíchumtha don chineál %s i \"%s\", líne %d" -+ -+#: rfc1524.c:395 -+msgid "No mailcap path specified" -+msgstr "Níor sonraíodh conair mailcap" -+ -+#: rfc1524.c:423 -+#, c-format -+msgid "mailcap entry for type %s not found" -+msgstr "níor aimsíodh iontráil mailcap don chineál %s" -+ -+#: score.c:75 -+msgid "score: too few arguments" -+msgstr "score: níl go leor argóintí ann" -+ -+#: score.c:84 -+msgid "score: too many arguments" -+msgstr "score: an iomarca argóintí" -+ -+#: send.c:252 -+msgid "No subject, abort?" -+msgstr "Níor sonraíodh aon ábhar, tobscoir?" -+ -+#: send.c:254 -+msgid "No subject, aborting." -+msgstr "Gan ábhar, á thobscor." -+ -+#. * provides a way to do that. -+#: send.c:488 -+#, c-format -+msgid "Reply to %s%s?" -+msgstr "Tabhair freagra ar %s%s?" -+ -+#: send.c:522 -+#, c-format -+msgid "Follow-up to %s%s?" -+msgstr "Teachtaireacht leantach go %s%s" -+ -+#. * a limit such that none of the tagged message are visible. -+#: send.c:690 -+msgid "No tagged messages are visible!" -+msgstr "Níl aon teachtaireacht chlibeáilte le feiceáil!" -+ -+#: send.c:741 -+msgid "Include message in reply?" -+msgstr "Cuir an teachtaireacht isteach sa fhreagra?" -+ -+#: send.c:746 -+msgid "Including quoted message..." -+msgstr "Teachtaireacht athfhriotail san áireamh..." -+ -+#: send.c:756 -+msgid "Could not include all requested messages!" -+msgstr "Níorbh fhéidir gach teachtaireacht iarrtha a chur sa fhreagra!" -+ -+#: send.c:770 -+msgid "Forward as attachment?" -+msgstr "Seol é ar aghaidh mar iatán?" -+ -+#: send.c:774 -+msgid "Preparing forwarded message..." -+msgstr "Teachtaireacht curtha ar aghaidh á hullmhú..." -+ -+#. * are any postponed messages first. -+#: send.c:1071 -+msgid "Recall postponed message?" -+msgstr "Athghlaoigh teachtaireacht a bhí curtha ar athlá?" -+ -+#: send.c:1372 -+msgid "Edit forwarded message?" -+msgstr "Cuir teachtaireacht in eagar roimh é a chur ar aghaidh?" -+ -+#: send.c:1400 -+msgid "Abort unmodified message?" -+msgstr "Tobscoir an teachtaireacht seo (gan athrú)?" -+ -+#: send.c:1402 -+msgid "Aborted unmodified message." -+msgstr "Tobscoireadh teachtaireacht gan athrú." -+ -+#: send.c:1471 -+msgid "Message postponed." -+msgstr "Cuireadh an teachtaireacht ar athlá." -+ -+#: send.c:1480 -+msgid "No recipients are specified!" -+msgstr "Níl aon fhaighteoir ann!" -+ -+#: send.c:1485 -+msgid "No recipients were specified." -+msgstr "Níor sonraíodh aon fhaighteoir." -+ -+#: send.c:1501 -+msgid "No subject, abort sending?" -+msgstr "Níor sonraíodh aon ábhar, tobscoir?" -+ -+#: send.c:1505 -+msgid "No subject specified." -+msgstr "Níor sonraíodh aon ábhar." -+ -+#: send.c:1567 -+msgid "Sending message..." -+msgstr "Teachtaireacht á seoladh..." -+ -+#: send.c:1708 -+msgid "Could not send the message." -+msgstr "Níorbh fhéidir an teachtaireacht a sheoladh." -+ -+#: send.c:1713 -+msgid "Mail sent." -+msgstr "Seoladh an teachtaireacht." -+ -+#: send.c:1713 -+msgid "Sending in background." -+msgstr "Á seoladh sa chúlra." -+ -+#: sendlib.c:410 -+msgid "No boundary parameter found! [report this error]" -+msgstr "Níor aimsíodh paraiméadar teorann! [seol tuairisc fhabht]" -+ -+#: sendlib.c:440 -+#, c-format -+msgid "%s no longer exists!" -+msgstr "Níl %s ann níos mó!" -+ -+#: sendlib.c:862 -+#, c-format -+msgid "%s isn't a regular file." -+msgstr "Ní gnáthchomhad %s." -+ -+#: sendlib.c:1031 -+#, c-format -+msgid "Could not open %s" -+msgstr "Níorbh fhéidir %s a oscailt" -+ -+#: sendlib.c:1996 -+#, c-format -+msgid "Error sending message, child exited %d (%s)." -+msgstr "" -+"Earráid agus teachtaireacht á seoladh, scoir an macphróiseas le stádas %d (%" -+"s)." -+ -+#: sendlib.c:2002 -+msgid "Output of the delivery process" -+msgstr "Aschur an phróisis seolta" -+ -+#: sendlib.c:2208 -+#, c-format -+msgid "Bad IDN %s while preparing resent-from." -+msgstr "DrochIDN %s agus resent-from á ullmhú." -+ -+#: signal.c:43 -+#, c-format -+msgid "%s... Exiting.\n" -+msgstr "%s... Ag scor.\n" -+ -+#: signal.c:46 signal.c:49 -+#, c-format -+msgid "Caught %s... Exiting.\n" -+msgstr "Fuarthas %s... Ag scor.\n" -+ -+#: signal.c:51 -+#, c-format -+msgid "Caught signal %d... Exiting.\n" -+msgstr "Fuarthas comhartha %d... Ag scor.\n" -+ -+#: smime.c:111 -+msgid "Enter S/MIME passphrase:" -+msgstr "Iontráil frása faire S/MIME:" -+ -+#: smime.c:321 -+msgid "Trusted " -+msgstr "Iontaofa " -+ -+#: smime.c:324 -+msgid "Verified " -+msgstr "Fíoraithe " -+ -+#: smime.c:327 -+msgid "Unverified" -+msgstr "Gan fíorú " -+ -+#: smime.c:330 -+msgid "Expired " -+msgstr "As Feidhm " -+ -+#: smime.c:333 -+msgid "Revoked " -+msgstr "Aisghairthe " -+ -+#: smime.c:336 -+msgid "Invalid " -+msgstr "Neamhbhailí " -+ -+#: smime.c:339 -+msgid "Unknown " -+msgstr "Anaithnid " -+ -+#: smime.c:368 -+msgid "Enter keyID: " -+msgstr "Iontráil keyID: " -+ -+#: smime.c:391 -+#, c-format -+msgid "S/MIME certificates matching \"%s\"." -+msgstr "Teastais S/MIME atá comhoiriúnach le \"%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 "ID %s gan fíorú. An mian leat é a úsáid le haghaidh %s?" -+ -+#: smime.c:545 smime.c:615 -+#, c-format -+msgid "Use (untrusted!) ID %s for %s ?" -+msgstr "Bain úsáid as ID (neamhiontaofa!) %s le haghaidh %s?" -+ -+#: smime.c:548 smime.c:618 -+#, c-format -+msgid "Use ID %s for %s ?" -+msgstr "Bain úsáid as ID %s le haghaidh %s ?" -+ -+#: smime.c:637 -+#, c-format -+msgid "Warning: You have not yet decided to trust ID %s. (any key to continue)" -+msgstr "" -+"Rabhadh: Go dtí seo níor chuir tú muinín san ID %s. (eochair ar bith le " -+"leanúint ar aghaidh)" -+ -+#: smime.c:796 -+#, c-format -+msgid "No (valid) certificate found for %s." -+msgstr "Níor aimsíodh aon teastas (bailí) do %s." -+ -+#: 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 "Earráid: ní féidir fo-phróiseas OpenSSL a chruthú!" -+ -+#: smime.c:1206 -+msgid "no certfile" -+msgstr "gan comhad teastais" -+ -+#: smime.c:1209 -+msgid "no mbox" -+msgstr "gan mbox" -+ -+#. fatal error while trying to encrypt message -+#: smime.c:1352 -+msgid "No output from OpenSSL.." -+msgstr "Gan aschur ó OpenSSL.." -+ -+#: smime.c:1390 -+msgid "Warning: Intermediate certificate not found." -+msgstr "Rabhadh: Teastas idirmheánach gan aimsiú." -+ -+#: smime.c:1433 -+msgid "Can't open OpenSSL subprocess!" -+msgstr "Ní féidir fo-phróiseas OpenSSL a oscailt!" -+ -+#: smime.c:1471 -+msgid "No output from OpenSSL..." -+msgstr "Gan aschur ó OpenSSL..." -+ -+#: smime.c:1636 smime.c:1760 -+msgid "" -+"[-- End of OpenSSL output --]\n" -+"\n" -+msgstr "" -+"[-- Deireadh an aschuir OpenSSL --]\n" -+"\n" -+ -+#: smime.c:1720 smime.c:1731 -+msgid "[-- Error: unable to create OpenSSL subprocess! --]\n" -+msgstr "[-- Earráid: ní féidir fo-phróiseas OpenSSL a chruthú! --]\n" -+ -+#: smime.c:1764 -+msgid "[-- The following data is S/MIME encrypted --]\n" -+msgstr "[-- Is criptithe mar S/MIME iad na sonraí a leanas --]\n" -+ -+#: smime.c:1767 -+msgid "[-- The following data is S/MIME signed --]\n" -+msgstr "" -+"[-- Is sínithe mar S/MIME iad na sonraí a leanas --]\n" -+"\n" -+ -+#: smime.c:1831 -+msgid "" -+"\n" -+"[-- End of S/MIME encrypted data. --]\n" -+msgstr "" -+"\n" -+"[-- Deireadh na sonraí criptithe mar S/MIME. --]\n" -+ -+#: smime.c:1833 -+msgid "" -+"\n" -+"[-- End of S/MIME signed data. --]\n" -+msgstr "" -+"\n" -+"[-- Deireadh na sonraí sínithe mar S/MIME. --]\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 (c)riptigh, (s)ínigh, criptigh (l)e, sínigh (m)ar, (a)raon, (n)á déan? " -+ -+#: smime.c:1945 -+msgid "eswabfc" -+msgstr "cslmafn" -+ -+#: 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, nó (n)á déan? " -+ -+#: smime.c:1956 -+msgid "12345f" -+msgstr "12345n" -+ -+#: smime.c:1980 -+msgid "Can't sign: No key specified. Use Sign As." -+msgstr "Ní féidir é a shíniú: Níor sonraíodh eochair. Úsáid \"Sínigh Mar\"." -+ -+#: sort.c:259 -+msgid "Sorting mailbox..." -+msgstr "Bosca poist á shórtáil..." -+ -+#: sort.c:296 -+msgid "Could not find sorting function! [report this bug]" -+msgstr "Níorbh fhéidir feidhm shórtála a aimsiú! [seol tuairisc fhabht]" -+ -+#: status.c:106 -+msgid "(no mailbox)" -+msgstr "(gan bosca poist)" -+ -+#: thread.c:1089 -+msgid "Parent message is not visible in this limited view." -+msgstr "Níl an mháthair-theachtaireacht infheicthe san amharc srianta seo." -+ -+#: thread.c:1095 -+msgid "Parent message is not available." -+msgstr "Níl an mháthair-theachtaireacht ar fáil." -+ -+#~ msgid "Unexpected response received from server: %s" -+#~ msgstr "Fuarthas freagra gan choinne ón fhreastalaí: %s" -+ -+#~ msgid "Unable to append to IMAP mailboxes at this server" -+#~ msgstr "Ní féidir a chur le boscaí IMAP ag an fhreastalaí seo" -+ -+#~ msgid "First entry is shown." -+#~ msgstr "An chéad iontráil." -+ -+#~ msgid "Last entry is shown." -+#~ msgstr "An iontráil dheireanach." -Index: mutt/po/gl.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/gl.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/gl.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/gl.po 17 Sep 2005 20:46:13 -0000 3.21 -@@ -3243,7 +3243,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2001 Michael R. Elkins \n" - "Copyright (C) 1996-2001 Brandon Long \n" -@@ -3268,7 +3268,7 @@ msgstr "" - "\n" - " Debería haber recibido unha copia da Licencia Pública Xeral de GNU\n" - " xunto deste programa; se non foi así, escriba á Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/hu.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/hu.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/hu.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/hu.po 17 Sep 2005 20:46:13 -0000 3.21 -@@ -3193,7 +3193,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3217,7 +3217,7 @@ msgstr "" - "\n" - " Ezzel a programmal meg kellett kapnod a GNU General Public License\n" - " másolatát; ha nem, írj a Szabad Szoftver Alapítványnak: Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/id.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/id.po,v -retrieving revision 3.27 -retrieving revision 3.30 -diff -u -p -u -a -r3.27 -r3.30 ---- mutt/po/id.po 15 Sep 2005 14:24:38 -0000 3.27 -+++ mutt/po/id.po 17 Sep 2005 20:46:13 -0000 3.30 -@@ -4,10 +4,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: 1.5.10i\n" -+"Project-Id-Version: 1.5.11i\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-08-16 16:05+1000\n" -+"PO-Revision-Date: 2005-09-16 23:45+1000\n" - "Last-Translator: Ronny Haryanto \n" - "Language-Team: Indonesia \n" - "MIME-Version: 1.0\n" -@@ -1368,9 +1368,8 @@ msgid "\"crypt_use_gpgme\" set but not b - msgstr "\"crypt_use_gpgme\" diset tapi tidak ada dukungan GPGME" - - #: cryptglue.c:112 --#, fuzzy - msgid "Invoking S/MIME..." --msgstr "Memanggil SMIME..." -+msgstr "Memanggil S/MIME..." - - #: curs_lib.c:188 - msgid "yes" -@@ -2077,7 +2076,7 @@ msgstr "CLOSE (penutupan) gagal." - #: imap/imap.c:1388 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "Pencarian header tanpa nama header: %s" - - #: imap/imap.c:1536 - msgid "Bad mailbox name" -@@ -2122,7 +2121,6 @@ msgid "The message index is incorrect. T - msgstr "Index dari surat tidak benar. Cobalah membuka kembali kotak surat tsb." - - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." - msgstr "Meletakkan surat ..." - -@@ -3166,7 +3164,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Hak Cipta (C) 1996-2004 Michael R. Elkins \n" - "Hak Cipta (C) 1996-2002 Brandon Long \n" -@@ -3192,11 +3190,10 @@ msgstr "" - "\n" - " Anda seharusnya sudah menerima salinan dari GNU General Public License\n" - " bersama dengan program ini; jika tidak, silakan bersurat kepada\n" --" Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA " --"02111, USA.\n" -+" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -+"02110-1301, USA.\n" - - #: main.c:107 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3235,7 +3232,7 @@ msgstr "" - " -a \tlampirkan file ke surat\n" - " -b \talamat blind carbon-copy (BCC)\n" - " -c \talamat carbon-copy (CC)\n" --" -D\t\ttampilkan semua nilai variabel ke stderr" -+" -D\t\ttampilkan semua nilai variabel ke stdout" - - #: main.c:122 - msgid " -d \tlog debugging output to ~/.muttdebug0" -Index: mutt/po/it.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/it.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/it.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/it.po 17 Sep 2005 20:46:13 -0000 3.21 -@@ -1,7 +1,7 @@ - # Translation for mutt. - # Copyright (C) 1998-2001 Marco d'Itri - # Marco d'Itri , 2000. --# $Id: it.po,v 3.18 2005/09/08 07:09:45 brendan Exp $ -+# $Id: it.po,v 3.21 2005/09/17 20:46:13 brendan Exp $ - # - # - msgid "" -@@ -3183,7 +3183,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3208,7 +3208,7 @@ msgstr "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/ja.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ja.po,v -retrieving revision 3.31 -retrieving revision 3.34 -diff -u -p -u -a -r3.31 -r3.34 ---- mutt/po/ja.po 15 Sep 2005 14:24:38 -0000 3.31 -+++ mutt/po/ja.po 17 Sep 2005 20:46:13 -0000 3.34 -@@ -2073,7 +2073,7 @@ msgstr "¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤¿" - #: imap/imap.c:1388 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "¸¡º÷¤¹¤ë¥Ø¥Ã¥À̾¤Î»ØÄ꤬¤Ê¤¤: %s" - - #: imap/imap.c:1536 - msgid "Bad mailbox name" -@@ -2119,7 +2119,6 @@ msgid "The message index is incorrect. T - msgstr "¥á¥Ã¥»¡¼¥¸º÷°ú¤¬ÉÔÀµ¡£¥á¡¼¥ë¥Ü¥Ã¥¯¥¹ºÆ¥ª¡¼¥×¥ó¤ò»î¤ß¤ë¡£" - - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." - msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¢¥Ã¥×¥í¡¼¥ÉÃæ..." - -@@ -3162,11 +3161,10 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - - #: main.c:107 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3205,7 +3203,7 @@ msgstr "" - " -a <¥Õ¥¡¥¤¥ë>\t¥á¥Ã¥»¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ\n" - " -b <¥¢¥É¥ì¥¹>\tblind carbon-copy (BCC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n" - " -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n" --" -D\t\tÊÑ¿ô¤ò¤¹¤Ù¤Æɸ½à¥¨¥é¡¼½ÐÎϤØɽ¼¨" -+" -D\t\tÊÑ¿ô¤ò¤¹¤Ù¤Æɸ½à½ÐÎϤØɽ¼¨" - - #: main.c:122 - msgid " -d \tlog debugging output to ~/.muttdebug0" -Index: mutt/po/ko.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ko.po,v -retrieving revision 3.24 -retrieving revision 3.26 -diff -u -p -u -a -r3.24 -r3.26 ---- mutt/po/ko.po 15 Sep 2005 14:24:38 -0000 3.24 -+++ mutt/po/ko.po 17 Sep 2005 20:46:13 -0000 3.26 -@@ -3184,7 +3184,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3209,8 +3209,8 @@ msgstr "" - "\n" - " º» ÇÁ·Î±×·¥¿¡´Â GNU General Public License º¹»çº»ÀÌ Æ÷ÇÔ µÇ¾îÀÖ½À´Ï´Ù;\n" - " Æ÷ÇԵǾî ÀÖÁö ¾ÊÀ» °æ¿ì ¾Æ·¡ÀÇ ÁÖ¼Ò·Î ¿¬¶ôÇϽñ⠹ٶø´Ï´Ù.\n" --" Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA " --"02111, USA.\n" -+" Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA " -+"02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/lt.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/lt.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/lt.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/lt.po 17 Sep 2005 20:46:13 -0000 3.21 -@@ -3241,7 +3241,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2000 Michael R. Elkins \n" - "Copyright (C) 1996-2000 Brandon Long \n" -@@ -3267,7 +3267,7 @@ msgstr "" - "\n" - " Tu turëjai gauti GNU General Public License kopijà\n" - " kartu su ðia programa; jeigu ne, paraðyk á Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/nl.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/nl.po,v -retrieving revision 3.26 -retrieving revision 3.29 -diff -u -p -u -a -r3.26 -r3.29 ---- mutt/po/nl.po 15 Sep 2005 14:24:38 -0000 3.26 -+++ mutt/po/nl.po 17 Sep 2005 20:46:13 -0000 3.29 -@@ -1,10 +1,10 @@ --# $Id: nl.po,v 3.25 2005/09/08 07:09:45 brendan Exp $ -+# $Id: nl.po,v 3.29 2005/09/17 20:46:13 brendan Exp $ - msgid "" - msgstr "" --"Project-Id-Version: Mutt 1.5.9\n" -+"Project-Id-Version: Mutt 1.5.11\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-03-20 15:17+0100\n" -+"PO-Revision-Date: 2005-09-15 23:17+0100\n" - "Last-Translator: René Clerc \n" - "Language-Team: René Clerc \n" - "MIME-Version: 1.0\n" -@@ -714,128 +714,128 @@ msgid "PGP already selected. Clear & con - msgstr "PGP al geselecteerd. Wissen & doorgaan ? " - - #: crypt-gpgme.c:335 --#, fuzzy, c-format -+#, c-format - msgid "error creating gpgme context: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het creëren van gpgme context: %s\n" - - #: crypt-gpgme.c:345 - #, c-format - msgid "error enabling CMS protocol: %s\n" --msgstr "" -+msgstr "fout bij het inschakelen van CMS protocol: %s\n" - - #: crypt-gpgme.c:365 --#, fuzzy, c-format -+#, c-format - msgid "error creating gpgme data object: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het creëren van gpgme gegevensobject: %s\n" - - #: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327 --#, fuzzy, c-format -+#, c-format - msgid "error allocating data object: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het alloceren van gegevensobject: %s\n" - - #: crypt-gpgme.c:467 --#, fuzzy, c-format -+#, c-format - msgid "error rewinding data object: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het terugwinden van het gegevensobject: %s\n" - - #: crypt-gpgme.c:489 crypt-gpgme.c:536 --#, fuzzy, c-format -+#, c-format - msgid "error reading data object: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het lezen van het gegevensobject: %s\n" - - #: crypt-gpgme.c:597 --#, fuzzy, c-format -+#, c-format - msgid "error adding recipient `%s': %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het toevoegen van ontvanger `%s': %s\n" - - #: crypt-gpgme.c:635 - #, c-format - msgid "secret key `%s' not found: %s\n" --msgstr "" -+msgstr "geheime sleutel `%s' niet gevonden: %s\n" - - #: crypt-gpgme.c:645 - #, c-format - msgid "ambiguous specification of secret key `%s'\n" --msgstr "" -+msgstr "dubbelzinnige specificatie van geheime sleutel `%s'\n" - - #: crypt-gpgme.c:657 - #, c-format - msgid "error setting secret key `%s': %s\n" --msgstr "" -+msgstr "fout bij het instellen van geheime sleutel `%s': %s\n" - - #: crypt-gpgme.c:701 --#, fuzzy, c-format -+#, c-format - msgid "error encrypting data: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het versleutelen van gegevens: %s\n" - - #: crypt-gpgme.c:798 --#, fuzzy, c-format -+#, c-format - msgid "error signing data: %s\n" --msgstr "Fout in expressie bij: %s" -+msgstr "fout bij het ondertekenen van gegevens: %s\n" - - #: crypt-gpgme.c:993 --#, fuzzy - msgid "Warning: One of the keys has been revoked\n" --msgstr "Waarschuwing: Een deel van dit bericht is niet ondertekend." -+msgstr "Waarschuwing: Een van de sleutels is herroepen\n" - - #: crypt-gpgme.c:1002 - msgid "Warning: The key used to create the signature expired at: " --msgstr "" -+msgstr "Waarschuwing: De sleutel waarmee is ondertekend is verlopen op: " - - #: crypt-gpgme.c:1008 --#, fuzzy - msgid "Warning: At least one certification key has expired\n" --msgstr "Certificaat van de server is verlopen" -+msgstr "Waarschuwing: Tenminste een certificeringssleutel is verlopen\n" - - #: crypt-gpgme.c:1024 - msgid "Warning: The signature expired at: " --msgstr "" -+msgstr "Waarschuwing: De ondertekening is verlopen op: " - - #: crypt-gpgme.c:1030 - msgid "Can't verify due to a missing key or certificate\n" --msgstr "" -+msgstr "Kan niet verifiëren vanwege ontbrekende sleutel of certificaat\n" - - #: crypt-gpgme.c:1035 --#, fuzzy - msgid "The CRL is not available\n" --msgstr "SSL is niet beschikbaar." -+msgstr "De CRL is niet beschikbaar\n" - - #: crypt-gpgme.c:1041 - msgid "Available CRL is too old\n" --msgstr "" -+msgstr "De beschikbare CRL is te oud\n" - - #: crypt-gpgme.c:1046 - msgid "A policy requirement was not met\n" --msgstr "" -+msgstr "Aan een beleidsvereiste is niet voldaan\n" - - #: crypt-gpgme.c:1055 - msgid "A system error occurred" --msgstr "" -+msgstr "Er is een systeemfout opgetreden" - - #: crypt-gpgme.c:1092 crypt-gpgme.c:3036 --#, fuzzy - msgid "Fingerprint: " --msgstr "Handtekening: %s" -+msgstr "Handtekening: " - - #: crypt-gpgme.c:1152 - msgid "" - "WARNING: We have NO indication whether the key belongs to the person named " - "as shown above\n" - msgstr "" -+"WAARSCHUWING: We hebben GEEN indicatie of de sleutel toebehoort aan de " -+"persoon zoals hierboven aangegeven\n" - - #: crypt-gpgme.c:1159 - msgid "WARNING: The key does NOT BELONG to the person named as shown above\n" --msgstr "" -+msgstr "WAARSCHUWING: De sleutel BEHOORT NIET TOE aan bovengenoemde persoon\n" - - #: crypt-gpgme.c:1163 - msgid "" - "WARNING: It is NOT certain that the key belongs to the person named as shown " - "above\n" - msgstr "" -+"WAARSCHUWING: Het is NIET zeker dat de sleutel toebehoort aan de persoon " -+"zoals hierboven aangegeven\n" - - #: crypt-gpgme.c:1238 - msgid "Error getting key information: " --msgstr "" -+msgstr "Fout bij het ophalen van sleutelinformatie: " - - #. 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, -@@ -843,70 +843,68 @@ msgstr "" - #. ultimate). - #: crypt-gpgme.c:1245 crypt-gpgme.c:1278 - msgid "Good signature from: " --msgstr "" -+msgstr "Goede handtekening van: " - - #: crypt-gpgme.c:1255 - msgid " aka: " --msgstr "" -+msgstr " ook bekend als: " - - #: crypt-gpgme.c:1259 crypt-gpgme.c:1281 - msgid " created: " --msgstr "" -+msgstr " aangemaakt op: " - - #: crypt-gpgme.c:1268 - msgid "*BAD* signature claimed to be from: " --msgstr "" -+msgstr "*SLECHTE* handtekening gepretendeerd af te komen van: " - - #: crypt-gpgme.c:1291 --#, fuzzy - msgid "Error checking signature" --msgstr "Fout opgetreden tijdens het verzenden van het bericht." -+msgstr "Fout bij het controleren van handtekening" - - #. 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 "" -+msgstr "[-- Begin handtekeninginformatie --]\n" - - #: crypt-gpgme.c:1344 --#, fuzzy, c-format -+#, c-format - msgid "Error: verification failed: %s\n" --msgstr "Fout in opdrachtregel: %s\n" -+msgstr "Fout: verificatie gefaald: %s\n" - - #: crypt-gpgme.c:1386 - #, c-format - msgid "*** Begin Notation (signature by: %s) ***\n" --msgstr "" -+msgstr "*** Begin Notatie (ondertekening van: %s) ***\n" - - #: crypt-gpgme.c:1405 - msgid "*** End Notation ***\n" --msgstr "" -+msgstr "*** Einde Notatie ***\n" - - #: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046 --#, fuzzy - msgid "" - "[-- End signature information --]\n" - "\n" - msgstr "" --"\n" - "[-- Einde van ondertekende gegevens --]\n" -+"\n" - - #: crypt-gpgme.c:1507 --#, fuzzy, c-format -+#, c-format - msgid "" - "[-- Error: decryption failed: %s --]\n" - "\n" --msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n" -+msgstr "[-- Fout: ontsleuteling gefaald: %s --]\n" - - #: crypt-gpgme.c:2006 - #, c-format - msgid "Error: decryption/verification failed: %s\n" --msgstr "" -+msgstr "Fout: ontsleuteling/verificatie is gefaald: %s\n" - - #: crypt-gpgme.c:2054 - msgid "Error: copy data failed\n" --msgstr "" -+msgstr "Fout: kopiëren van gegevens is gefaald\n" - - #: crypt-gpgme.c:2074 pgp.c:410 - msgid "" -@@ -961,12 +959,11 @@ msgid "[-- Error: could not create tempo - msgstr "[-- Fout: Kon geen tijdelijk bestand aanmaken! --]\n" - - #: crypt-gpgme.c:2186 --#, fuzzy - msgid "" - "[-- The following data is PGP/MIME signed and encrypted --]\n" - "\n" - msgstr "" --"[-- De volgende gegevens zijn PGP/MIME versleuteld --]\n" -+"[-- De volgende gegevens zijn PGP/MIME ondertekend en versleuteld --]\n" - "\n" - - #: crypt-gpgme.c:2187 pgp.c:927 -@@ -978,16 +975,14 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2209 --#, fuzzy - msgid "[-- End of PGP/MIME signed and encrypted data --]\n" --msgstr "[-- Einde van PGP/MIME versleutelde data --]\n" -+msgstr "[-- Einde van PGP/MIME ondertekende en versleutelde data --]\n" - - #: crypt-gpgme.c:2210 pgp.c:947 - msgid "[-- End of PGP/MIME encrypted data --]\n" - msgstr "[-- Einde van PGP/MIME versleutelde data --]\n" - - #: crypt-gpgme.c:2252 --#, fuzzy - msgid "" - "[-- The following data is S/MIME signed --]\n" - "\n" -@@ -996,7 +991,6 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2253 --#, fuzzy - msgid "" - "[-- The following data is S/MIME encrypted --]\n" - "\n" -@@ -1005,130 +999,118 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2283 --#, fuzzy - msgid "[-- End of S/MIME signed data --]\n" --msgstr "" --"\n" --"[-- Einde van S/MIME ondertekende gegevens --]\n" -+msgstr "[-- Einde van S/MIME ondertekende gegevens --]\n" - - #: crypt-gpgme.c:2284 --#, fuzzy - msgid "[-- End of S/MIME encrypted data --]\n" --msgstr "" --"\n" --"[-- Einde van S/MIME versleutelde data --]\n" -+msgstr "[-- Einde van S/MIME versleutelde data --]\n" - - #: crypt-gpgme.c:2876 - msgid "[Can't display this user ID (unknown encoding)]" --msgstr "" -+msgstr "[Kan dit user ID niet weergeven (onbekende codering)]" - - #: crypt-gpgme.c:2878 - msgid "[Can't display this user ID (invalid encoding)]" --msgstr "" -+msgstr "[Kan dit user ID niet weergeven (onbekende codering)]" - - #: crypt-gpgme.c:2883 - msgid "[Can't display this user ID (invalid DN)]" --msgstr "" -+msgstr "[Kan dit user ID niet weergeven (ongeldige DN)]" - - #: crypt-gpgme.c:2962 - msgid " aka ......: " --msgstr "" -+msgstr " alias ....: " - - #: crypt-gpgme.c:2962 - msgid "Name ......: " --msgstr "" -+msgstr "Naam ......: " - - #: crypt-gpgme.c:2965 crypt-gpgme.c:3104 --#, fuzzy - msgid "[Invalid]" --msgstr "Ongeldig " -+msgstr "[Ongeldig]" - - #: crypt-gpgme.c:2985 crypt-gpgme.c:3128 --#, fuzzy, c-format -+#, c-format - msgid "Valid From : %s\n" --msgstr "Ongeldige maand: %s" -+msgstr "Geldig Van : %s\n" - - #: crypt-gpgme.c:2998 crypt-gpgme.c:3141 --#, fuzzy, c-format -+#, c-format - msgid "Valid To ..: %s\n" --msgstr "Ongeldige maand: %s" -+msgstr "Geldig Tot : %s\n" - - #: crypt-gpgme.c:3011 crypt-gpgme.c:3154 - #, c-format - msgid "Key Type ..: %s, %lu bit %s\n" --msgstr "" -+msgstr "Slt. Type .: %s, %lu bit %s\n" - - #: crypt-gpgme.c:3013 crypt-gpgme.c:3156 - #, c-format - msgid "Key Usage .: " --msgstr "" -+msgstr "Sl. Gebr ..: " - - #: crypt-gpgme.c:3018 crypt-gpgme.c:3161 --#, fuzzy - msgid "encryption" --msgstr "Versleutelen" -+msgstr "versleuteling " - - #: 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 "" -+msgstr ", " - - #: crypt-gpgme.c:3023 crypt-gpgme.c:3166 - msgid "signing" --msgstr "" -+msgstr "ondertekening" - - #: crypt-gpgme.c:3028 crypt-gpgme.c:3171 --#, fuzzy - msgid "certification" --msgstr "Certificaat wordt bewaard" -+msgstr "certificering" - - #: crypt-gpgme.c:3068 - #, c-format - msgid "Serial-No .: 0x%s\n" --msgstr "" -+msgstr "Serie-Nr ..: 0x%s\n" - - #: crypt-gpgme.c:3076 - #, c-format - msgid "Issued By .: " --msgstr "" -+msgstr "Uitg. Door : " - - #. display only the short keyID - #: crypt-gpgme.c:3095 --#, fuzzy, c-format -+#, c-format - msgid "Subkey ....: 0x%s" --msgstr "Sleutel ID: 0x%s" -+msgstr "Subsleutel : 0x%s" - - #: crypt-gpgme.c:3099 --#, fuzzy - msgid "[Revoked]" --msgstr "Herroepen " -+msgstr "[Herroepen]" - - #: crypt-gpgme.c:3109 --#, fuzzy - msgid "[Expired]" --msgstr "Verlopen " -+msgstr "[Verlopen]" - - #: crypt-gpgme.c:3114 - msgid "[Disabled]" --msgstr "" -+msgstr "[Uitgeschakeld]" - - #: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739 - msgid "Can't create temporary file" - msgstr "Kan tijdelijk bestand niet aanmaken" - - #: crypt-gpgme.c:3201 --#, fuzzy - msgid "Collecting data..." --msgstr "Bezig met verbinden met %s..." -+msgstr "Data aan het vergaren..." - - #: crypt-gpgme.c:3227 --#, fuzzy, c-format -+#, c-format - msgid "Error finding issuer key: %s\n" --msgstr "Fout tijdens verbinden met server: %s" -+msgstr "Fout bij het vinden van uitgever van sleutel: %s\n" - - #: crypt-gpgme.c:3237 - msgid "Error: certification chain to long - stopping here\n" --msgstr "" -+msgstr "Fout: certificeringsketen te lang - stop hier\n" - - #: crypt-gpgme.c:3248 pgpkey.c:580 - #, c-format -@@ -1136,22 +1118,21 @@ msgid "Key ID: 0x%s" - msgstr "Sleutel ID: 0x%s" - - #: crypt-gpgme.c:3331 --#, fuzzy, c-format -+#, c-format - msgid "gpgme_new failed: %s" --msgstr "Hernoemen mislukt: %s" -+msgstr "gpgme_new gefaald: %s" - - #: crypt-gpgme.c:3370 crypt-gpgme.c:3433 - #, c-format - msgid "gpgme_op_keylist_start failed: %s" --msgstr "" -+msgstr "gpgme_op_keylist_start gefaald: %s" - - #: crypt-gpgme.c:3420 crypt-gpgme.c:3461 - #, c-format - msgid "gpgme_op_keylist_next failed: %s" --msgstr "" -+msgstr "gpgme_op_keylist_next gefaald: %s" - - #: crypt-gpgme.c:3532 --#, fuzzy - msgid "All matching keys are marked expired/revoked." - msgstr "Alle overeenkomende sleutels zijn verlopen/ingetrokken." - -@@ -1171,34 +1152,30 @@ msgid "Check key " - msgstr "Controleer sleutel " - - #: crypt-gpgme.c:3583 --#, fuzzy - msgid "PGP and S/MIME keys matching" --msgstr "PGP-sleutels voor \"%s\"." -+msgstr "PGP- en S/MIME-sleutels voor" - - #: crypt-gpgme.c:3585 --#, fuzzy - msgid "PGP keys matching" --msgstr "PGP-sleutels voor \"%s\"." -+msgstr "PGP-sleutels voor" - - #: crypt-gpgme.c:3587 --#, fuzzy - msgid "S/MIME keys matching" --msgstr "S/MIME certficiaten voor \"%s\"." -+msgstr "S/MIME-certficaten voor" - - #: crypt-gpgme.c:3589 --#, fuzzy - msgid "keys matching" --msgstr "PGP-sleutels voor \"%s\"." -+msgstr "sleutels voor" - - #: crypt-gpgme.c:3592 - #, c-format - msgid "%s <%s>." --msgstr "" -+msgstr "%s <%s>." - - #: crypt-gpgme.c:3594 - #, c-format - msgid "%s \"%s\"." --msgstr "" -+msgstr "%s \"%s\"." - - #: crypt-gpgme.c:3621 pgpkey.c:600 - msgid "This key can't be used: expired/disabled/revoked." -@@ -1245,28 +1222,26 @@ msgid "" - "\n" - "Using GPGME backend, although no gpg-agent is running" - msgstr "" -+"\n" -+"Gebruik GPGME achterkant, hoewel er geen gpg-agent draait" - - #: crypt-gpgme.c:4131 --#, fuzzy - msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?" - msgstr "" --"S/MIME (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? " -+"S/MIME (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, (p)gp of (g)een?" - - #: crypt-gpgme.c:4132 --#, fuzzy - msgid "esabpfc" --msgstr "vomabgg" -+msgstr "vomabpg" - - #: crypt-gpgme.c:4135 --#, fuzzy - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?" - msgstr "" --"PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (b)eiden, %s, of (g)een? " -+"PGP (v)ersleutel, (o)ndertekenen, ondert. (a)ls, (s)/mime of (g)een?" - - #: crypt-gpgme.c:4136 --#, fuzzy - msgid "esabmfc" --msgstr "vomabgg" -+msgstr "vomabsg" - - #. sign (a)s - #. unset_option(OPTCRYPTCHECKTRUST); -@@ -1277,12 +1252,11 @@ msgstr "Ondertekenen als: " - - #: crypt-gpgme.c:4249 - msgid "Failed to verify sender" --msgstr "" -+msgstr "Verifiëren van afzener gefaald" - - #: crypt-gpgme.c:4252 --#, fuzzy - msgid "Failed to figure out sender" --msgstr "Kan bestand niet openen om header te lezen." -+msgstr "Kan verzender niet bepalen" - - #: crypt.c:69 - #, c-format -@@ -1379,10 +1353,9 @@ msgstr "" - - #: cryptglue.c:89 - msgid "\"crypt_use_gpgme\" set but not build with GPGME support." --msgstr "" -+msgstr "\"crypt_use_gpgme\" aan, maar niet gebouwd met GPGME-ondersteuning." - - #: cryptglue.c:112 --#, fuzzy - msgid "Invoking S/MIME..." - msgstr "S/MIME wordt aangeroepen..." - -@@ -1558,24 +1531,23 @@ msgstr "Het weergeven van threads is nie - - #: curs_main.c:1210 - msgid "Thread broken" --msgstr "" -+msgstr "Thread gebroken" - - #: curs_main.c:1232 - msgid "No Message-ID: header available to link thread" --msgstr "" -+msgstr "Geen Message-ID: header beschikbaar om thread te koppelen" - - #: curs_main.c:1234 --#, fuzzy - msgid "First, please tag a message to be linked here" --msgstr "sla dit bericht op om later te verzenden" -+msgstr "Markeer eerst een bericht om hieraan te koppelen" - - #: curs_main.c:1246 - msgid "Threads linked" --msgstr "" -+msgstr "Threads gekoppeld" - - #: curs_main.c:1249 - msgid "No thread linked" --msgstr "" -+msgstr "Geen thread gekoppeld" - - #: curs_main.c:1285 curs_main.c:1310 - msgid "You are on the last message." -@@ -2033,7 +2005,7 @@ msgstr "Mutt kan niet overweg met deze a - - #: imap/imap.c:422 - msgid "Checking mailbox subscriptions" --msgstr "" -+msgstr "Mailfolder-abonnementen worden gecontroleerd" - - #: imap/imap.c:460 pop_lib.c:286 - msgid "Secure connection with TLS?" -@@ -2045,7 +2017,7 @@ msgstr "Kon TLS connectie niet onderhand - - #: imap/imap.c:489 pop_lib.c:331 - msgid "Encrypted connection unavailable" --msgstr "" -+msgstr "Versleutelde verbinding niet beschikbaar" - - #: imap/imap.c:618 - #, c-format -@@ -2090,7 +2062,7 @@ msgstr "CLOSE mislukt" - #: imap/imap.c:1388 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "Zoeken op header zonder headernaam: %s" - - #: imap/imap.c:1536 - msgid "Bad mailbox name" -@@ -2135,9 +2107,8 @@ msgid "The message index is incorrect. T - msgstr "De berichtenindex is niet correct. Probeer mailfolder te heropenen." - - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." --msgstr "Bericht wordt verstuurd ..." -+msgstr "Bericht wordt ge-upload..." - - #: imap/message.c:708 - #, c-format -@@ -2732,7 +2703,7 @@ msgstr "maak nieuw bericht aan" - - #: keymap_alldefs.h:103 - msgid "break the thread in two" --msgstr "" -+msgstr "splits de thread in tweeën" - - #: keymap_alldefs.h:104 - msgid "open a different folder" -@@ -2771,9 +2742,8 @@ msgid "show only messages matching a pat - msgstr "geef alleen berichten weer volgens patroon" - - #: keymap_alldefs.h:113 --#, fuzzy - msgid "link tagged message to the current one" --msgstr "Gemarkeerde berichten doorsturen naar: " -+msgstr "koppel gemarkeerd bericht met het huidige" - - #: keymap_alldefs.h:114 - msgid "jump to the next new message" -@@ -3156,7 +3126,6 @@ msgstr "" - "onder bepaalde voorwaarden; type `mutt -vv' voor meer informatie.\n" - - #: main.c:69 --#, fuzzy - msgid "" - "Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3181,9 +3150,9 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" --"Copyright (C) 1996-2002 Michael R. Elkins \n" -+"Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" - "Copyright (C) 1997-2002 Thomas Roessler \n" - "Copyright (C) 1998-2002 Werner Koch \n" -@@ -3206,11 +3175,10 @@ msgstr "" - "\n" - " U zou een kopie van de GNU Algemene Publieke Licentie ontvangen moeten\n" - " hebben samen met dit Programma; zoniet, schrijf naar de Free Software\n" --" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 " -+" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02110-1301 " - "USA.\n" - - #: main.c:107 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3242,37 +3210,18 @@ msgstr "" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" - "\n" -+"opties:\n" - " -A \tgebruik een afkorting\n" - " -a \tvoeg een bestand bij het bericht\n" - " -b
\tspecificeer een blind carbon-copy (BCC) adres\n" - " -c
\tspecificeer een carbon-copy (CC) adres\n" --" -e \tspecificeer een uit te voeren opdracht na initialisatie\n" --" -f \tspecificeer de te lezen mailfolder\n" --" -F \tspecificeer een alternatieve muttrc\n" --" -H \tspecificeer een bestand om de headers uit te lezen\n" --" -i \tspecificeer een bestand dat Mutt moet bijsluiten in het " --"bericht\n" --" -m \tspecificeer een standaard mailfolder type\n" --" -n\t\tzorgt dat Mutt de systeem Muttrc niet inleest\n" --" -p\t\troept een uitgesteld bericht op\n" --" -Q \tvraagt de waarde van een configuratievariabele op\n" --" -R\t\topent de mailfolder met alleen-lezen rechten\n" --" -s \tspecificeer een onderwerp (tussen aanhalingstekens i.g.v. " --"spaties)\n" --" -v\t\ttoont het versienummer en opties tijdens het compileren\n" --" -x\t\tsimuleert de mailx verzendmodus\n" --" -y\t\tselecteert een mailfolder gespecificeerd in de `mailboxes' lijst\n" --" -z\t\tbeëindigt meteen als er geen berichten in de mailfolder staan\n" --" -Z\t\topent de eerste mailfolder met nieuwe berichten, eindigt indien " --"geen\n" --" -h\t\tdit hulp bericht" -+" -D\t\tdruk de waardes van alle variabelen af op stdout" - - #: main.c:122 - msgid " -d \tlog debugging output to ~/.muttdebug0" --msgstr "" -+msgstr " -d \tlog debug-output naar ~/.muttdebug0" - - #: main.c:125 --#, fuzzy - msgid "" - " -e \tspecify a command to be executed after initialization\n" - " -f \tspecify which mailbox to read\n" -@@ -3292,21 +3241,6 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --"gebruik: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " --" ]\n" --" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " --"[...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " --"[...]\n" --" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " --"[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" --" mutt [ -n ] [ -e ] [ -F ] -p\n" --" mutt -v[v]\n" --"\n" --" -A \tgebruik een afkorting\n" --" -a \tvoeg een bestand bij het bericht\n" --" -b
\tspecificeer een blind carbon-copy (BCC) adres\n" --" -c
\tspecificeer een carbon-copy (CC) adres\n" - " -e \tspecificeer een uit te voeren opdracht na initialisatie\n" - " -f \tspecificeer de te lezen mailfolder\n" - " -F \tspecificeer een alternatieve muttrc\n" -@@ -3671,89 +3605,82 @@ msgstr "Certificaat wordt bewaard" - - #: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117 - msgid "Error: no TLS socket open" --msgstr "" -+msgstr "Fout: geen TLS socket open" - - #: mutt_ssl_gnutls.c:204 - msgid "All available protocols for TLS/SSL connection disabled" --msgstr "" -+msgstr "Alle beschikbare protocollen voor TLS/SSL-verbinding uitgeschakeld" - - #: mutt_ssl_gnutls.c:265 --#, fuzzy, c-format -+#, c-format - msgid "SSL/TLS connection using %s (%s/%s/%s)" --msgstr "SSL verbinding via %s (%s)" -+msgstr "SSL/TLS verbinding via %s (%s/%s/%s)" - - #: mutt_ssl_gnutls.c:508 - #, c-format - msgid "Certificate verification error (%s)" --msgstr "" -+msgstr "Fout bij verifiëren van certificaat (%s)" - - #: mutt_ssl_gnutls.c:516 --#, fuzzy - msgid "Certificate is not X.509" --msgstr "Certificaat wordt bewaard" -+msgstr "Certificaat is niet in X.509-formaat" - - #: mutt_ssl_gnutls.c:523 --#, fuzzy - msgid "Error initialising gnutls certificate data" --msgstr "Kan terminal niet initialiseren." -+msgstr "Kan gnutls certificaatgegevens niet initializeren" - - #: mutt_ssl_gnutls.c:539 - msgid "Error processing certificate data" --msgstr "" -+msgstr "Fout bij het verwerken van certificaatgegevens" - - #: mutt_ssl_gnutls.c:724 --#, fuzzy, c-format -+#, c-format - msgid "SHA1 Fingerprint: %s" --msgstr "Handtekening: %s" -+msgstr "SHA1 Handtekening: %s" - - #: mutt_ssl_gnutls.c:727 --#, fuzzy, c-format -+#, c-format - msgid "MD5 Fingerprint: %s" --msgstr "Handtekening: %s" -+msgstr "MD5 Handtekening: %s" - - #: mutt_ssl_gnutls.c:732 --#, fuzzy - msgid "WARNING: Server certificate is not yet valid" --msgstr "Certificaat van de server is nog niet geldig" -+msgstr "WAARSCHUWING: Certificaat van de server is nog niet geldig" - - #: mutt_ssl_gnutls.c:737 --#, fuzzy - msgid "WARNING: Server certificate has expired" --msgstr "Certificaat van de server is verlopen" -+msgstr "WAARSCHUWING: Certificaat van de server is verlopen" - - #: mutt_ssl_gnutls.c:742 --#, fuzzy - msgid "WARNING: Server certificate has been revoked" --msgstr "Certificaat van de server is verlopen" -+msgstr "WAARSCHUWING: Certificaat van de server is herroepen" - - #: mutt_ssl_gnutls.c:747 - msgid "WARNING: Server hostname does not match certificate" --msgstr "" -+msgstr "WAARSCHUWING: naam van de server komt niet overeen met certificaat" - - #: mutt_ssl_gnutls.c:752 --#, fuzzy - msgid "WARNING: Signer of server certificate is not a CA" --msgstr "Certificaat van de server is nog niet geldig" -+msgstr "WAARSCHUWING: Ondertekenaar van servercertificaat is geen CA" - - #: mutt_ssl_gnutls.c:755 --#, fuzzy - msgid "TLS/SSL Certificate check" --msgstr "SSL certificaat controle" -+msgstr "TLS/SSL certificaat controle" - - #: mutt_tunnel.c:70 --#, fuzzy, c-format -+#, c-format - msgid "Connecting with \"%s\"..." --msgstr "Bezig met verbinden met %s..." -+msgstr "Bezig met verbinden met \"%s\"..." - - #: mutt_tunnel.c:137 - #, c-format - msgid "Tunnel to %s returned error %d (%s)" --msgstr "" -+msgstr "Tunnel naar %s leverde fout %d op (%s)" - - #: mutt_tunnel.c:155 mutt_tunnel.c:171 --#, fuzzy, c-format -+#, c-format - msgid "Tunnel error talking to %s: %s" --msgstr "Verbinding met %s mislukt (%s)" -+msgstr "Fout in tunnel in communicatie met %s: %s" - - #: muttlib.c:910 - msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" -@@ -4058,15 +3985,13 @@ msgstr "" - "\n" - - #: pgp.c:392 pgp.c:956 --#, fuzzy - msgid "Could not decrypt PGP message" --msgstr "Bericht kon niet gekopiëerd worden." -+msgstr "Kon PGP-gericht niet ontsleutelen" - - #. clear 'Invoking...' message, since there's no error - #: pgp.c:441 pgp.c:952 --#, fuzzy - msgid "PGP message successfully decrypted." --msgstr "PGP handtekening is correct bevonden." -+msgstr "PGP-bericht succesvol ontsleuteld." - - #: pgp.c:728 - msgid "Internal error. Inform ." -@@ -4081,9 +4006,8 @@ msgstr "" - "\n" - - #: pgp.c:833 --#, fuzzy - msgid "Decryption failed" --msgstr "Ontsleuteling mislukt." -+msgstr "Ontsleuteling mislukt" - - #: pgp.c:1008 - msgid "Can't open PGP subprocess!" -Index: mutt/po/pl.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/pl.po,v -retrieving revision 3.28 -retrieving revision 3.30 -diff -u -p -u -a -r3.28 -r3.30 ---- mutt/po/pl.po 15 Sep 2005 14:24:38 -0000 3.28 -+++ mutt/po/pl.po 17 Sep 2005 20:46:13 -0000 3.30 -@@ -3185,7 +3185,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2002 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3211,7 +3211,7 @@ msgstr "" - "\n" - " W dokumentacji tego programu powinna znajdowaæ siê kopia Powszechnej\n" - " Licencji Publicznej GNU. Je¶li tak nie jest, napisz do Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/pt_BR.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/pt_BR.po,v -retrieving revision 3.20 -retrieving revision 3.22 -diff -u -p -u -a -r3.20 -r3.22 ---- mutt/po/pt_BR.po 15 Sep 2005 14:24:38 -0000 3.20 -+++ mutt/po/pt_BR.po 17 Sep 2005 20:46:14 -0000 3.22 -@@ -3260,7 +3260,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2000 Michael R. Elkins \n" - "Copyright (C) 1996-2000 Brandon Long \n" -Index: mutt/po/ru.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ru.po,v -retrieving revision 3.31 -retrieving revision 3.34 -diff -u -p -u -a -r3.31 -r3.34 ---- mutt/po/ru.po 15 Sep 2005 14:24:38 -0000 3.31 -+++ mutt/po/ru.po 18 Sep 2005 08:22:49 -0000 3.34 -@@ -10,10 +10,10 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: mutt-1.5.10i\n" -+"Project-Id-Version: mutt-1.5.11\n" - "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-08-13 14:11:38+0300\n" -+"PO-Revision-Date: 2005-09-17 18:56+0300\n" - "Last-Translator: mutt-ru@woe.spb.ru\n" - "Language-Team: RUSSIAN \n" - "MIME-Version: 1.0\n" -@@ -1371,9 +1371,8 @@ msgid "\"crypt_use_gpgme\" set but not b - msgstr "ïÐÃÉÑ \"crypt_use_gpgme\" ×ËÌÀÞÅÎÁ, ÎÏ ÐÏÄÄÅÒÖËÁ GPGME ÎÅ ÓÏÂÒÁÎÁ." - - #: cryptglue.c:112 --#, fuzzy - msgid "Invoking S/MIME..." --msgstr "÷ÙÚÙ×ÁÅÔÓÑ SMIME..." -+msgstr "÷ÙÚÙ×ÁÅÔÓÑ S/MIME..." - - #: curs_lib.c:188 - msgid "yes" -@@ -2083,7 +2082,7 @@ msgstr "ïÛÉÂËÁ ×ÙÐÏÌÎÅÎÉÑ ËÏÍÁÎÄÙ CLOSE" - #: imap/imap.c:1388 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "îÅ ÕËÁÚÁÎÏ ÉÍÑ ÚÁÇÏÌÏ×ËÁ ÐÒÉ ÐÏÉÓËÅ ÚÁÇÏÌÏ×ËÁ: %s" - - #: imap/imap.c:1536 - msgid "Bad mailbox name" -@@ -2130,7 +2129,6 @@ msgstr "" - - # ÉÌÉ "ÎÁ ÓÅÒ×ÅÒ" ÕÂÒÁÔØ?? - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." - msgstr "óÏÏÂÝÅÎÉÅ ÚÁÇÒÕÖÁÅÔÓÑ ÎÁ ÓÅÒ×ÅÒ..." - -@@ -3181,7 +3179,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3206,10 +3204,9 @@ msgstr "" - "\n" - " ÷Ù ÄÏÌÖÎÙ ÂÙÌÉ ÐÏÌÕÞÉÔØ ËÏÐÉÀ GNU General Public License ×ÍÅÓÔÅ Ó\n" - " ÜÔÏÊ ÐÒÏÇÒÁÍÍÏÊ. åÓÌÉ ×Ù ÅÅ ÎÅ ÐÏÌÕÞÉÌÉ, ÏÂÒÁÔÉÔÅÓØ ×Ï Free Software\n" --" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 --#, fuzzy - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3247,7 +3244,7 @@ msgstr "" - " -a \t×ÌÏÖÉÔØ ÆÁÊÌ × ÓÏÏÂÝÅÎÉÅ\n" - " -b
\tÕËÁÚÁÔØ blind carbon-copy (BCC) ÁÄÒÅÓ\n" - " -c
\tÕËÁÚÁÔØ carbon-copy (CC) ÁÄÒÅÓ\n" --" -D\t\t×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÑ ×ÓÅÈ ÐÅÒÅÍÅÎÎÙÈ ÎÁ stderr" -+" -D\t\t×Ù×ÅÓÔÉ ÚÎÁÞÅÎÉÑ ×ÓÅÈ ÐÅÒÅÍÅÎÎÙÈ ÎÁ stdout" - - #: main.c:122 - msgid " -d \tlog debugging output to ~/.muttdebug0" -@@ -4792,9 +4789,3 @@ msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅ ×ÉÄÉÍÏ - #: thread.c:1095 - msgid "Parent message is not available." - msgstr "òÏÄÉÔÅÌØÓËÏÅ ÓÏÏÂÝÅÎÉÅ ÎÅÄÏÓÔÕÐÎÏ." -- --#~ msgid "First entry is shown." --#~ msgstr "ðÅÒ×ÁÑ ÚÁÐÉÓØ ÕÖÅ ÎÁ ÜËÒÁÎÅ." -- --#~ msgid "Last entry is shown." --#~ msgstr "ðÏÓÌÅÄÎÑÑ ÚÁÐÉÓØ ÕÖÅ ÎÁ ÜËÒÁÎÅ." -Index: mutt/po/sk.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/sk.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/sk.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/sk.po 17 Sep 2005 20:46:14 -0000 3.21 -@@ -3267,7 +3267,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-8 Michael R. Elkins \n" - "Copyright (C) 1997-8 Thomas Roessler \n" -@@ -3289,7 +3289,7 @@ msgstr "" - "\n" - " Mali by ste obdr¾a» kópiu GNU General Public License spolu s týmto\n" - " programom; ak nie, napí¹te do Free Software Foundation, Inc.,\n" --" 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/sv.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/sv.po,v -retrieving revision 3.23 -retrieving revision 3.25 -diff -u -p -u -a -r3.23 -r3.25 ---- mutt/po/sv.po 15 Sep 2005 14:24:38 -0000 3.23 -+++ mutt/po/sv.po 17 Sep 2005 20:46:14 -0000 3.25 -@@ -3179,7 +3179,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Upphovsrätt (C) 1996-2002 Michael R. Elkins \n" - "Upphovsrätt (C) 1996-2002 Brandon Long \n" -@@ -3206,7 +3206,7 @@ msgstr "" - " General Public License för ytterligare information.\n" - " Du bör ha fått en kopia av GNU General Public License\n" - " tillsammans med detta program. Om inte, skriv till Free Software \n" --" Foundation,Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, " -+" Foundation,Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " - "USA.\n" - - #: main.c:107 -Index: mutt/po/tr.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/tr.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/tr.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/tr.po 17 Sep 2005 20:46:14 -0000 3.21 -@@ -3244,7 +3244,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - - #: main.c:107 -Index: mutt/po/uk.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/uk.po,v -retrieving revision 3.20 -retrieving revision 3.22 -diff -u -p -u -a -r3.20 -r3.22 ---- mutt/po/uk.po 15 Sep 2005 14:24:38 -0000 3.20 -+++ mutt/po/uk.po 17 Sep 2005 20:46:14 -0000 3.22 -@@ -3182,7 +3182,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - - #: main.c:107 -Index: mutt/po/zh_CN.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/zh_CN.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/zh_CN.po 15 Sep 2005 14:24:38 -0000 3.19 -+++ mutt/po/zh_CN.po 17 Sep 2005 20:46:14 -0000 3.21 -@@ -3271,7 +3271,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "Copyright (C) 1996-2000 Michael R. Elkins \n" - "Copyright (C) 1996-2000 Brandon Long \n" -@@ -3291,8 +3291,8 @@ msgstr "" - " Öн«»á»ñµÃ¸ü¶à×ÊÁÏ¡£\n" - "\n" - " ÄúÓ¦ÒÑÁ¬Í¬Ó¦ÓóÌÐòÊÕµ½Ò»·Ý GNU Ò»°ã¹«¹²ÊÚȨÊ飻Èç¹ûûÓУ¬ÇëдÐÅ\n" --" ÖÁ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, " --"MA 02111, USA.\n" -+" ÖÁ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " -+"MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy -Index: mutt/po/zh_TW.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/zh_TW.po,v -retrieving revision 3.19 -retrieving revision 3.21 -diff -u -p -u -a -r3.19 -r3.21 ---- mutt/po/zh_TW.po 15 Sep 2005 14:24:39 -0000 3.19 -+++ mutt/po/zh_TW.po 17 Sep 2005 20:46:14 -0000 3.21 -@@ -3231,7 +3231,7 @@ msgid "" - "\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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.\n" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n" - msgstr "" - "版權所有 (C) 1996-2000 Michael R. Elkins \n" - "版權所有 (C) 1996-2000 Brandon Long \n" -@@ -3252,8 +3252,8 @@ msgstr "" - " 中將會獲得更多資料。\n" - "\n" - " 您應已連同應用程式收到一份 GNU 一般公共授權書；如果沒有，請寫信\n" --" 至 Free Software Foundation, Inc., 59 Temple Place - Suite 330,\n" --" Boston, MA 02111, USA.\n" -+" 至 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,\n" -+" Boston, MA 02110-1301, USA.\n" - - #: main.c:107 - #, fuzzy diff --git a/upstream/patches/cvs_2005-09-24 b/upstream/patches/cvs_2005-09-24 deleted file mode 100644 index 0355853..0000000 --- a/upstream/patches/cvs_2005-09-24 +++ /dev/null @@ -1,1407 +0,0 @@ -Index: mutt/ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.607 -retrieving revision 3.610 -diff -u -p -u -a -r3.607 -r3.610 ---- mutt/ChangeLog 22 Sep 2005 16:39:10 -0000 3.607 -+++ mutt/ChangeLog 24 Sep 2005 20:04:38 -0000 3.610 -@@ -1,3 +1,24 @@ -+2005-09-24 20:03:04 Brendan Cully (brendan) -+ -+ * edit.c: Inflict more needless pain on translators by splitting -+ EditorHelp to satisfy -pedantic. -+ -+ * mbox.c, mutt.h, configure.in: Use fseeko/ftello when available -+ while opening mbox/mmdf. Closes: #2084. -+ -+2005-09-24 19:36:35 Alain Bench (brendan) -+ -+ * copy.c, mutt.h, parse.c, sendlib.c, thread.c: Cosmetic fixes to -+ MIME headers. Closes: #2086. -+ -+2005-09-24 17:51:17 TAKAHASHI Tamotsu (brendan) -+ -+ * po/ja.po: Update to HEAD. -+ -+2005-09-23 18:38:36 TAKAHASHI Tamotsu (brendan) -+ -+ * configure.in: Quote an error message. -+ - 2005-09-22 16:38:08 Takahashi Tamotsu (brendan) - - * configure.in, globals.h, hcache.c, init.h: Update QDBM patch to -Index: mutt/configure.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/configure.in,v -retrieving revision 3.37 -retrieving revision 3.39 -diff -u -p -u -a -r3.37 -r3.39 ---- mutt/configure.in 22 Sep 2005 16:38:08 -0000 3.37 -+++ mutt/configure.in 24 Sep 2005 19:45:22 -0000 3.39 -@@ -41,6 +41,7 @@ AC_C_INLINE - AC_C_CONST - - AC_SYS_LARGEFILE -+AC_FUNC_FSEEKO - - AC_PATH_PROG(DBX, dbx, no) - AC_PATH_PROG(GDB, gdb, no) -@@ -82,6 +83,15 @@ AH_TEMPLATE([ICONV_NONTRANS], - [Define as 1 if iconv() only converts exactly and we should treat - all return values other than (size_t)(-1) as equivalent.]) - -+AH_BOTTOM([/* fseeko portability defines */ -+#ifdef HAVE_FSEEKO -+# define LOFF_T off_t -+#else -+# define LOFF_T long -+# define fseeko fseek -+# define ftello ftell -+#endif -+]) - MUTT_C99_INTTYPES - - ac_aux_path_sendmail=/usr/sbin:/usr/lib -@@ -825,7 +835,7 @@ AC_ARG_ENABLE(hcache, AC_HELP_STRING([-- - LIBS="$OLDLIBS -L$BDB_LIB_DIR -l$BDB_LIB" - AC_DEFINE(HAVE_DB4, 1, [Sleepycat DB4 Support]) - else -- AC_MSG_ERROR(You need QDBM, Sleepycat DB4 or GDBM for --enable-hcache) -+ AC_MSG_ERROR([You need QDBM, GDBM or Sleepycat DB4 for hcache]) - fi - fi]) - dnl -- end cache -- -Index: mutt/copy.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/copy.c,v -retrieving revision 3.24 -retrieving revision 3.25 -diff -u -p -u -a -r3.24 -r3.25 ---- mutt/copy.c 17 Sep 2005 20:46:10 -0000 3.24 -+++ mutt/copy.c 24 Sep 2005 19:36:35 -0000 3.25 -@@ -364,7 +364,7 @@ mutt_copy_header (FILE *in, HEADER *h, F - if (flags & CH_TXTPLAIN) - { - char chsbuf[SHORT_STRING]; -- fputs ("Mime-Version: 1.0\n", out); -+ fputs ("MIME-Version: 1.0\n", out); - fputs ("Content-Transfer-Encoding: 8bit\n", out); - fputs ("Content-Type: text/plain; charset=", out); - mutt_canonical_charset (chsbuf, sizeof (chsbuf), Charset ? Charset : "us-ascii"); -@@ -672,7 +672,7 @@ _mutt_copy_message (FILE *fpout, FILE *f - { - if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur)) - return (-1); -- fputs ("Mime-Version: 1.0\n", fpout); -+ fputs ("MIME-Version: 1.0\n", fpout); - } - - if ((WithCrypto & APPLICATION_SMIME) -Index: mutt/edit.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/edit.c,v -retrieving revision 3.7 -retrieving revision 3.8 -diff -u -p -u -a -r3.7 -r3.8 ---- mutt/edit.c 17 Sep 2005 20:46:10 -0000 3.7 -+++ mutt/edit.c 24 Sep 2005 20:03:04 -0000 3.8 -@@ -38,7 +38,7 @@ - * SLcurses_waddnstr() can't take a "const char *", so this is only - * declared "static" (sigh) - */ --static char* EditorHelp = N_("\ -+static char* EditorHelp1 = N_("\ - ~~ insert a line begining with a single ~\n\ - ~b users add users to the Bcc: field\n\ - ~c users add users to the Cc: field\n\ -@@ -47,7 +47,9 @@ static char* EditorHelp = N_("\ - ~h edit the message header\n\ - ~m messages include and quote messages\n\ - ~M messages same as ~m, except include headers\n\ --~p print the message\n\ -+~p print the message\n"); -+ -+static char* EditorHelp2 = N_("\ - ~q write file and quit editor\n\ - ~r file read a file into the editor\n\ - ~t users add users to the To: field\n\ -@@ -352,7 +354,8 @@ int mutt_builtin_editor (const char *pat - switch (tmp[1]) - { - case '?': -- addstr (_(EditorHelp)); -+ addstr (_(EditorHelp1)); -+ addstr (_(EditorHelp2)); - break; - case 'b': - msg->env->bcc = mutt_parse_adrlist (msg->env->bcc, p); -Index: mutt/mbox.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/mbox.c,v -retrieving revision 3.9 -retrieving revision 3.10 -diff -u -p -u -a -r3.9 -r3.10 ---- mutt/mbox.c 17 Sep 2005 20:46:10 -0000 3.9 -+++ mutt/mbox.c 24 Sep 2005 19:45:23 -0000 3.10 -@@ -85,7 +85,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) - int count = 0, oldmsgcount = ctx->msgcount; - int lines; - time_t t, tz; -- long loc, tmploc; -+ LOFF_T loc, tmploc; - HEADER *hdr; - struct stat sb; - #ifdef NFS_ATTRIBUTE_HACK -@@ -122,7 +122,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) - - if (mutt_strcmp (buf, MMDF_SEP) == 0) - { -- loc = ftell (ctx->fp); -+ loc = ftello (ctx->fp); - - count++; - if (!ctx->quiet && ReadInc && ((count % ReadInc == 0) || count == 1)) -@@ -159,7 +159,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) - - hdr->env = mutt_read_rfc822_header (ctx->fp, hdr, 0, 0); - -- loc = ftell (ctx->fp); -+ loc = ftello (ctx->fp); - - if (hdr->content->length > 0 && hdr->lines > 0) - { -@@ -186,7 +186,7 @@ int mmdf_parse_mailbox (CONTEXT *ctx) - { - lines = -1; - do { -- loc = ftell (ctx->fp); -+ loc = ftello (ctx->fp); - if (fgets (buf, sizeof (buf) - 1, ctx->fp) == NULL) - break; - lines++; -@@ -231,7 +231,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - HEADER *curhdr; - time_t t, tz; - int count = 0, lines = 0; -- long loc; -+ LOFF_T loc; - #ifdef NFS_ATTRIBUTE_HACK - struct utimbuf newtime; - #endif -@@ -262,7 +262,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - date received */ - tz = mutt_local_tz (0); - -- loc = ftell (ctx->fp); -+ loc = ftello (ctx->fp); - while (fgets (buf, sizeof (buf), ctx->fp) != NULL) - { - if (is_from (buf, return_path, sizeof (return_path), &t)) -@@ -304,9 +304,9 @@ int mbox_parse_mailbox (CONTEXT *ctx) - */ - if (curhdr->content->length > 0) - { -- long tmploc; -+ LOFF_T tmploc; - -- loc = ftell (ctx->fp); -+ loc = ftello (ctx->fp); - tmploc = loc + curhdr->content->length + 1; - - if (0 < tmploc && tmploc < ctx->size) -@@ -315,13 +315,13 @@ int mbox_parse_mailbox (CONTEXT *ctx) - * check to see if the content-length looks valid. we expect to - * to see a valid message separator at this point in the stream - */ -- if (fseek (ctx->fp, tmploc, SEEK_SET) != 0 || -+ if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0 || - 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, "\tLINE: %s", buf)); -- if (fseek (ctx->fp, loc, SEEK_SET) != 0) /* nope, return the previous position */ -+ if (fseeko (ctx->fp, loc, SEEK_SET) != 0) /* nope, return the previous position */ - { - dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n")); - } -@@ -346,7 +346,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - int cl = curhdr->content->length; - - /* count the number of lines in this message */ -- if (fseek (ctx->fp, loc, SEEK_SET) != 0) -+ if (fseeko (ctx->fp, loc, SEEK_SET) != 0) - dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n")); - while (cl-- > 0) - { -@@ -356,7 +356,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - } - - /* return to the offset of the next message separator */ -- if (fseek (ctx->fp, tmploc, SEEK_SET) != 0) -+ if (fseeko (ctx->fp, tmploc, SEEK_SET) != 0) - dprint (1, (debugfile, "mbox_parse_mailbox: fseek() failed\n")); - } - } -@@ -374,7 +374,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - else - lines++; - -- loc = ftell (ctx->fp); -+ loc = ftello (ctx->fp); - } - - /* -@@ -387,7 +387,7 @@ int mbox_parse_mailbox (CONTEXT *ctx) - { - if (PREV->content->length < 0) - { -- PREV->content->length = ftell (ctx->fp) - PREV->content->offset - 1; -+ PREV->content->length = ftello (ctx->fp) - PREV->content->offset - 1; - if (PREV->content->length < 0) - PREV->content->length = 0; - } -Index: mutt/mutt.h -=================================================================== -RCS file: /home/roessler/cvs/mutt/mutt.h,v -retrieving revision 3.57 -retrieving revision 3.59 -diff -u -p -u -a -r3.57 -r3.59 ---- mutt/mutt.h 21 Sep 2005 06:04:37 -0000 3.57 -+++ mutt/mutt.h 24 Sep 2005 19:45:23 -0000 3.59 -@@ -627,7 +627,7 @@ typedef struct body - * attachment - */ - long offset; /* offset where the actual data begins */ -- long length; /* length (in bytes) of attachment */ -+ LOFF_T length; /* length (in bytes) of attachment */ - char *filename; /* when sending a message, this is the file - * to which this structure refers - */ -@@ -692,7 +692,7 @@ typedef struct header - unsigned int security : 11; /* bit 0-6: flags, bit 7,8: application. - see: crypt.h pgplib.h, smime.h */ - -- unsigned int mime : 1; /* has a Mime-Version header? */ -+ unsigned int mime : 1; /* has a MIME-Version header? */ - unsigned int flagged : 1; /* marked important? */ - unsigned int tagged : 1; - unsigned int deleted : 1; -Index: mutt/parse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/parse.c,v -retrieving revision 3.18 -retrieving revision 3.19 -diff -u -p -u -a -r3.18 -r3.19 ---- mutt/parse.c 17 Sep 2005 20:46:10 -0000 3.18 -+++ mutt/parse.c 24 Sep 2005 19:36:35 -0000 3.19 -@@ -1105,7 +1105,7 @@ int mutt_parse_rfc822_line (ENVELOPE *e, - } - else if (!ascii_strcasecmp (line + 1, "essage-id")) - { -- /* We add a new "Message-Id:" when building a message */ -+ /* We add a new "Message-ID:" when building a message */ - FREE (&e->message_id); - e->message_id = extract_message_id (p); - matched = 1; -Index: mutt/sendlib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/sendlib.c,v -retrieving revision 3.34 -retrieving revision 3.35 -diff -u -p -u -a -r3.34 -r3.35 ---- mutt/sendlib.c 17 Sep 2005 20:46:11 -0000 3.34 -+++ mutt/sendlib.c 24 Sep 2005 19:36:35 -0000 3.35 -@@ -1057,7 +1057,7 @@ void mutt_message_to_7bit (BODY *a, FILE - mutt_copy_hdr (fpin, fpout, a->offset, a->offset + a->length, - CH_MIME | CH_NONEWLINE | CH_XMIT, NULL); - -- fputs ("Mime-Version: 1.0\n", fpout); -+ fputs ("MIME-Version: 1.0\n", fpout); - mutt_write_mime_header (a->parts, fpout); - fputc ('\n', fpout); - mutt_write_mime_body (a->parts, fpout); -@@ -1614,7 +1614,7 @@ int mutt_write_rfc822_header (FILE *fp, - } - - /* Add the MIME headers */ -- fputs ("Mime-Version: 1.0\n", fp); -+ fputs ("MIME-Version: 1.0\n", fp); - mutt_write_mime_header (attach, fp); - } - -Index: mutt/thread.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/thread.c,v -retrieving revision 3.15 -retrieving revision 3.16 -diff -u -p -u -a -r3.15 -r3.16 ---- mutt/thread.c 17 Sep 2005 20:46:11 -0000 3.15 -+++ mutt/thread.c 24 Sep 2005 19:36:35 -0000 3.16 -@@ -1374,7 +1374,7 @@ static void clean_references (THREAD *br - { - HEADER *h = cur->message; - -- /* clearing the References: header from obsolete Message-Id(s) */ -+ /* clearing the References: header from obsolete Message-ID(s) */ - mutt_free_list (&ref->next); - - h->env->refs_changed = h->changed = 1; -Index: mutt/po/ja.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/ja.po,v -retrieving revision 3.34 -retrieving revision 3.35 -diff -u -p -u -a -r3.34 -r3.35 ---- mutt/po/ja.po 17 Sep 2005 20:46:13 -0000 3.34 -+++ mutt/po/ja.po 24 Sep 2005 17:51:17 -0000 3.35 -@@ -6,15 +6,15 @@ - # - msgid "" - msgstr "" --"Project-Id-Version: 1.5.9\n" --"Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-08-12 19:00+0900\n" -+"Project-Id-Version: 1.5.11\n" -+"POT-Creation-Date: 2005-09-24 22:08+0900\n" -+"PO-Revision-Date: 2005-09-24 22:10+0900\n" - "Last-Translator: Tamotsu TAKAHASHI \n" - "Language-Team: mutt-j \n" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=euc-jp\n" - "Content-Transfer-Encoding: 8bit\n" -+"Report-Msgid-Bugs-To: Tamo \n" - - #: account.c:154 - #, c-format -@@ -610,7 +610,7 @@ msgstr "·Ù¹ð: '%s' ¤ÏÉÔÀµ¤Ê IDN." - msgid "You may not delete the only attachment." - msgstr "Í£°ì¤ÎźÉÕ¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Æ¤Ï¤¤¤±¤Ê¤¤¡£" - --#: compose.c:601 send.c:1492 -+#: compose.c:601 send.c:1499 - #, c-format - msgid "Bad IDN in \"%s\": '%s'" - msgstr "\"%s\" Ãæ¤ËÉÔÀµ¤Ê IDN: '%s'" -@@ -908,7 +908,7 @@ msgstr "¥¨¥é¡¼: Éü¹æ²½/¸¡¾Ú¤¬¼ºÇÔ¤·¤¿: % - msgid "Error: copy data failed\n" - msgstr "¥¨¥é¡¼: ¥Ç¡¼¥¿¤Î¥³¥Ô¡¼¤Ë¼ºÇÔ¤·¤¿\n" - --#: crypt-gpgme.c:2074 pgp.c:410 -+#: crypt-gpgme.c:2074 pgp.c:418 - msgid "" - "[-- BEGIN PGP MESSAGE --]\n" - "\n" -@@ -916,11 +916,11 @@ msgstr "" - "[-- PGP ¥á¥Ã¥»¡¼¥¸³«»Ï --]\n" - "\n" - --#: crypt-gpgme.c:2076 pgp.c:412 -+#: crypt-gpgme.c:2076 pgp.c:420 - msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯³«»Ï --]\n" - --#: crypt-gpgme.c:2079 pgp.c:414 -+#: crypt-gpgme.c:2079 pgp.c:422 - msgid "" - "[-- BEGIN PGP SIGNED MESSAGE --]\n" - "\n" -@@ -928,19 +928,19 @@ msgstr "" - "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸³«»Ï --]\n" - "\n" - --#: crypt-gpgme.c:2106 pgp.c:440 -+#: crypt-gpgme.c:2106 pgp.c:448 - msgid "[-- END PGP MESSAGE --]\n" - msgstr "[-- PGP¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n" - --#: crypt-gpgme.c:2108 pgp.c:444 -+#: crypt-gpgme.c:2108 pgp.c:452 - msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- PGP ¸ø³«¸°¥Ö¥í¥Ã¥¯½ªÎ» --]\n" - --#: crypt-gpgme.c:2110 pgp.c:446 -+#: crypt-gpgme.c:2110 pgp.c:454 - msgid "[-- END PGP SIGNED MESSAGE --]\n" - msgstr "[-- PGP ½ð̾¥á¥Ã¥»¡¼¥¸½ªÎ» --]\n" - --#: crypt-gpgme.c:2131 pgp.c:476 -+#: crypt-gpgme.c:2131 pgp.c:484 - msgid "" - "[-- Error: could not find beginning of PGP message! --]\n" - "\n" -@@ -948,7 +948,7 @@ msgstr "" - "[-- ¥¨¥é¡¼: PGP ¥á¥Ã¥»¡¼¥¸¤Î³«»ÏÅÀ¤òȯ¸«¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n" - "\n" - --#: crypt-gpgme.c:2162 pgp.c:905 -+#: crypt-gpgme.c:2162 pgp.c:913 - msgid "" - "[-- Error: malformed PGP/MIME message! --]\n" - "\n" -@@ -956,7 +956,7 @@ msgstr "" - "[-- ¥¨¥é¡¼: ÉÔÀµ¤Ê·Á¼°¤Î PGP/MIME ¥á¥Ã¥»¡¼¥¸! --]\n" - "\n" - --#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:918 -+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:926 - msgid "[-- Error: could not create temporary file! --]\n" - msgstr "[-- ¥¨¥é¡¼: °ì»þ¥Õ¥¡¥¤¥ë¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n" - -@@ -968,7 +968,7 @@ msgstr "" - "[-- °Ê²¼¤Î¥Ç¡¼¥¿¤Ï PGP/MIME ¤Ç½ð̾¤ª¤è¤Ó°Å¹æ²½¤µ¤ì¤Æ¤¤¤ë --]\n" - "\n" - --#: crypt-gpgme.c:2187 pgp.c:927 -+#: crypt-gpgme.c:2187 pgp.c:935 - msgid "" - "[-- The following data is PGP/MIME encrypted --]\n" - "\n" -@@ -980,7 +980,7 @@ msgstr "" - msgid "[-- End of PGP/MIME signed and encrypted data --]\n" - msgstr "[-- PGP/MIME ½ð̾¤ª¤è¤Ó°Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n" - --#: crypt-gpgme.c:2210 pgp.c:947 -+#: crypt-gpgme.c:2210 pgp.c:955 - msgid "[-- End of PGP/MIME encrypted data --]\n" - msgstr "[-- PGP/MIME °Å¹æ²½¥Ç¡¼¥¿½ªÎ» --]\n" - -@@ -1050,7 +1050,6 @@ msgid "Key Type ..: %s, %lu bit %s\n" - msgstr "¸°¼ïÊÌ ...........: %s, %lu ¥Ó¥Ã¥È %s\n" - - #: crypt-gpgme.c:3013 crypt-gpgme.c:3156 --#, c-format - msgid "Key Usage .: " - msgstr "¸°Ç½ÎÏ ...........: " - -@@ -1077,7 +1076,6 @@ msgid "Serial-No .: 0x%s\n" - msgstr "¥·¥ê¥¢¥ëÈÖ¹æ .....: 0x%s\n" - - #: crypt-gpgme.c:3076 --#, c-format - msgid "Issued By .: " - msgstr "ȯ¹Ô¼Ô ...........: " - -@@ -1212,12 +1210,12 @@ msgstr "%s ËÜÅö¤Ë¤³¤Î¸°¤ò»ÈÍÑ?" - msgid "Looking for keys matching \"%s\"..." - msgstr "\"%s\" ¤Ë°ìÃפ¹¤ë¸°¤ò¸¡º÷Ãæ..." - --#: crypt-gpgme.c:4002 pgp.c:1154 -+#: crypt-gpgme.c:4002 pgp.c:1162 - #, c-format - msgid "Use keyID = \"%s\" for %s?" - msgstr "¸° ID = \"%s\" ¤ò %s ¤Ë»È¤¦?" - --#: crypt-gpgme.c:4038 pgp.c:1188 smime.c:665 smime.c:790 -+#: crypt-gpgme.c:4038 pgp.c:1196 smime.c:665 smime.c:790 - #, c-format - msgid "Enter keyID for %s: " - msgstr "%s ¤Î¸° ID ÆþÎÏ: " -@@ -1248,8 +1246,7 @@ msgstr "esabmfc" - - #. 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:1571 smime.c:1990 - msgid "Sign as: " - msgstr "½ð̾¤Ë»È¤¦¸°: " - -@@ -1286,7 +1283,7 @@ msgid "Message can't be sent inline. Re - msgstr "¥á¥Ã¥»¡¼¥¸¤ò¥¤¥ó¥é¥¤¥ó¤ÇÁ÷¿®¤Ç¤­¤Ê¤¤¡£PGP/MIME ¤ò»È¤¦?" - - #. abort --#: crypt.c:158 send.c:1444 -+#: crypt.c:158 send.c:1451 - msgid "Mail not sent." - msgstr "¥á¡¼¥ë¤ÏÁ÷¿®¤µ¤ì¤Ê¤«¤Ã¤¿¡£" - -@@ -1518,90 +1515,90 @@ msgstr "Æɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥á¡¼¥ë¥Ü¥Ã¥¯ - msgid "Open mailbox" - msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤ò¥ª¡¼¥×¥ó" - --#: 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 ¤Ï¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ç¤Ï¤Ê¤¤¡£" - --#: curs_main.c:1180 -+#: curs_main.c:1188 - msgid "Exit Mutt without saving?" - msgstr "Êݸ¤·¤Ê¤¤¤Ç Mutt ¤òÈ´¤±¤ë?" - --#: 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 "¥¹¥ì¥Ã¥Éɽ¼¨¤¬Í­¸ú¤Ë¤Ê¤Ã¤Æ¤¤¤Ê¤¤¡£" - --#: curs_main.c:1210 -+#: curs_main.c:1218 - msgid "Thread broken" - msgstr "¥¹¥ì¥Ã¥É¤¬³°¤µ¤ì¤¿" - --#: curs_main.c:1232 -+#: curs_main.c:1240 - msgid "No Message-ID: header available to link thread" - msgstr "Message-ID ¥Ø¥Ã¥À¤¬ÍøÍѤǤ­¤Ê¤¤¤Î¤Ç¥¹¥ì¥Ã¥É¤ò¤Ä¤Ê¤²¤é¤ì¤Ê¤¤" - --#: curs_main.c:1234 -+#: curs_main.c:1242 - msgid "First, please tag a message to be linked here" - msgstr "¤½¤ÎÁ°¤Ë¡¢¤³¤³¤Ø¤Ä¤Ê¤²¤¿¤¤¥á¥Ã¥»¡¼¥¸¤Ë¥¿¥°¤òÉÕ¤±¤Æ¤ª¤¯¤³¤È" - --#: curs_main.c:1246 -+#: curs_main.c:1254 - msgid "Threads linked" - msgstr "¥¹¥ì¥Ã¥É¤¬¤Ä¤Ê¤¬¤Ã¤¿" - --#: curs_main.c:1249 -+#: curs_main.c:1257 - msgid "No thread linked" - msgstr "¥¹¥ì¥Ã¥É¤Ï¤Ä¤Ê¤¬¤é¤Ê¤«¤Ã¤¿" - --#: curs_main.c:1285 curs_main.c:1310 -+#: curs_main.c:1293 curs_main.c:1318 - msgid "You are on the last message." - msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥á¥Ã¥»¡¼¥¸¡£" - --#: curs_main.c:1292 curs_main.c:1336 -+#: curs_main.c:1300 curs_main.c:1344 - msgid "No undeleted messages." - msgstr "̤ºï½ü¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤¡£" - --#: curs_main.c:1329 curs_main.c:1353 -+#: curs_main.c:1337 curs_main.c:1361 - msgid "You are on the first message." - msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥á¥Ã¥»¡¼¥¸¡£" - --#: curs_main.c:1428 pattern.c:1361 -+#: curs_main.c:1436 pattern.c:1366 - msgid "Search wrapped to top." - msgstr "¸¡º÷¤Ï°ìÈÖ¾å¤ËÌá¤Ã¤¿¡£" - --#: curs_main.c:1437 pattern.c:1372 -+#: curs_main.c:1445 pattern.c:1377 - msgid "Search wrapped to bottom." - msgstr "¸¡º÷¤Ï°ìÈÖ²¼¤ËÌá¤Ã¤¿¡£" - --#: curs_main.c:1478 -+#: curs_main.c:1486 - msgid "No new messages" - msgstr "¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤" - --#: curs_main.c:1478 -+#: curs_main.c:1486 - msgid "No unread messages" - msgstr "̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤" - - # ÆüËܸì¤Ç¤Ï¸ì½ç¤¬°ã¤¦¤Î¤Ç¤¹ (T_T --#: curs_main.c:1479 -+#: curs_main.c:1487 - msgid " in this limited view" - msgstr " (¤³¤ÎÀ©¸Âɽ¼¨¾õÂ֤ǤÏ)" - --#: curs_main.c:1500 pager.c:2403 -+#: curs_main.c:1508 pager.c:2403 - msgid "Can't change 'important' flag on POP server." - msgstr "POP ¥µ¡¼¥Ð¾å¤Ç¤Ï¡Ö½ÅÍסץե饰¤òÊѹ¹¤Ç¤­¤Ê¤¤¡£" - --#: curs_main.c:1624 -+#: curs_main.c:1632 - msgid "No more threads." - msgstr "¤â¤¦¥¹¥ì¥Ã¥É¤¬¤Ê¤¤¡£" - --#: curs_main.c:1626 -+#: curs_main.c:1634 - msgid "You are on the first thread." - msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¹¥ì¥Ã¥É¡£" - --#: curs_main.c:1710 -+#: curs_main.c:1718 - msgid "Thread contains unread messages." - msgstr "¥¹¥ì¥Ã¥ÉÃæ¤Ë̤ÆÉ¥á¥Ã¥»¡¼¥¸¤¬¤¢¤ë¡£" - --#: curs_main.c:1897 -+#: curs_main.c:1905 - msgid "Can't edit message on POP server." - msgstr "POP ¥µ¡¼¥Ð¾å¤Ç¤Ï¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸¤Ç¤­¤Ê¤¤¡£" - -@@ -1886,7 +1883,6 @@ msgid "Help for %s" - msgstr "%s ¤Î¥Ø¥ë¥×" - - #: hook.c:246 --#, c-format - msgid "unhook: Can't do unhook * from within a hook." - msgstr "unhook: ¥Õ¥Ã¥¯Æ⤫¤é¤Ï unhook * ¤Ç¤­¤Ê¤¤" - -@@ -2070,21 +2066,21 @@ msgstr "imap_sync_mailbox: ºï½ü¤Ë¼ºÇÔ¤·¤ - msgid "CLOSE failed" - msgstr "¥¯¥í¡¼¥º¤Ë¼ºÇÔ¤·¤¿" - --#: imap/imap.c:1388 -+#: imap/imap.c:1387 - #, c-format - msgid "Header search without header name: %s" - msgstr "¸¡º÷¤¹¤ë¥Ø¥Ã¥À̾¤Î»ØÄ꤬¤Ê¤¤: %s" - --#: imap/imap.c:1536 -+#: imap/imap.c:1535 - msgid "Bad mailbox name" - msgstr "ÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹Ì¾" - --#: imap/imap.c:1559 -+#: imap/imap.c:1558 - #, c-format - msgid "Subscribing to %s..." - msgstr "%s ¤Î¹ØÆɤò³«»ÏÃæ..." - --#: imap/imap.c:1561 -+#: imap/imap.c:1560 - #, c-format - msgid "Unsubscribing to %s..." - msgstr "%s ¤Î¹ØÆɤò¼è¤ê¾Ã¤·Ãæ..." -@@ -2136,127 +2132,129 @@ msgstr "¥á¥Ã¥»¡¼¥¸ %d ¤ò %s ¤Ë¥³¥Ô¡¼Ãæ.. - msgid "Continue?" - msgstr "·Ñ³?" - --#: init.c:427 -+#: init.c:57 init.c:1277 pager.c:57 -+msgid "Not available in this menu." -+msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤ÏÍøÍѤǤ­¤Ê¤¤¡£" -+ -+#: init.c:438 - #, c-format - msgid "Bad regexp: %s" - msgstr "ÉÔÀµ¤ÊÀµµ¬É½¸½: %s" - --#: init.c:686 -+#: init.c:697 - msgid "spam: no matching pattern" - msgstr "spam: °ìÃפ¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤" - --#: init.c:688 -+#: init.c:699 - msgid "nospam: no matching pattern" - msgstr "nospam: °ìÃפ¹¤ë¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤" - --#: init.c:891 -+#: init.c:902 - msgid "alias: no address" - msgstr "alias (ÊÌ̾): ¥¢¥É¥ì¥¹¤¬¤Ê¤¤" - --#: init.c:936 -+#: init.c:947 - #, c-format - msgid "Warning: Bad IDN '%s' in alias '%s'.\n" - msgstr "·Ù¹ð: ÉÔÀµ¤Ê IDN '%s' ¤¬¥¨¥¤¥ê¥¢¥¹ '%s' Ãæ¤Ë¤¢¤ë¡£\n" - --#: init.c:1014 -+#: init.c:1026 - msgid "invalid header field" - msgstr "ÉÔÀµ¤Ê¤Ø¥Ã¥À¥Õ¥£¡¼¥ë¥É" - --#: init.c:1067 -+#: init.c:1079 - #, c-format - msgid "%s: unknown sorting method" - msgstr "%s ¤ÏÉÔÌÀ¤ÊÀ°ÎóÊýË¡" - --#: init.c:1177 -+#: init.c:1189 - #, c-format - msgid "mutt_restore_default(%s): error in regexp: %s\n" - msgstr "mutt_restore_default(%s): Àµµ¬É½¸½¤Ç¥¨¥é¡¼: %s\n" - --#: init.c:1242 -+#: init.c:1254 - #, c-format - msgid "%s: unknown variable" - msgstr "%s ¤ÏÉÔÌÀ¤ÊÊÑ¿ô" - --#: init.c:1251 --#, c-format -+#: init.c:1263 - msgid "prefix is illegal with reset" - msgstr "reset ¤È¶¦¤Ë»È¤¦ÀÜƬ¼­¤¬ÉÔÀµ" - --#: init.c:1257 --#, c-format -+#: init.c:1269 - msgid "value is illegal with reset" - msgstr "reset ¤È¶¦¤Ë»È¤¦Ãͤ¬ÉÔÀµ" - --#: init.c:1296 -+#: init.c:1322 - #, c-format - msgid "%s is set" - msgstr "%s ¤ÏÀßÄꤵ¤ì¤Æ¤¤¤ë" - --#: init.c:1296 -+#: init.c:1322 - #, c-format - msgid "%s is unset" - msgstr "%s ¤Ï²ò½ü¤µ¤ì¤Æ¤¤¤ë" - --#: init.c:1486 -+#: init.c:1517 - #, c-format - msgid "%s: invalid mailbox type" - msgstr "%s ¤ÏÉÔÀµ¤Ê¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°" - --#: init.c:1511 init.c:1556 -+#: init.c:1543 init.c:1589 - #, c-format - msgid "%s: invalid value" - msgstr "%s ¤ÏÉÔÀµ¤ÊÃÍ" - --#: init.c:1597 -+#: init.c:1630 - #, c-format - msgid "%s: Unknown type." - msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×" - --#: init.c:1623 -+#: init.c:1657 - #, c-format - msgid "%s: unknown type" - msgstr "%s ¤ÏÉÔÌÀ¤Ê¥¿¥¤¥×" - --#: init.c:1682 -+#: init.c:1716 - #, c-format - msgid "Error in %s, line %d: %s" - msgstr "%s Ãæ¤Î %d ¹ÔÌܤǥ¨¥é¡¼: %s" - - #. the muttrc source keyword --#: init.c:1705 -+#: init.c:1739 - #, c-format - msgid "source: errors in %s" - msgstr "source: %s Ãæ¤Ç¥¨¥é¡¼" - --#: init.c:1706 -+#: init.c:1740 - #, c-format - msgid "source: reading aborted due too many errors in %s" - msgstr "source: %s Ãæ¤Ë¥¨¥é¡¼¤¬Â¿¤¹¤®¤ë¤Î¤ÇÆɤ߽Ф·Ãæ»ß" - --#: init.c:1720 -+#: init.c:1754 - #, c-format - msgid "source: error at %s" - msgstr "source: %s ¤Ç¥¨¥é¡¼" - --#: init.c:1725 -+#: init.c:1759 - msgid "source: too many arguments" - msgstr "source: °ú¿ô¤¬Â¿¤¹¤®¤ë" - --#: init.c:1776 -+#: init.c:1810 - #, c-format - msgid "%s: unknown command" - msgstr "%s: ÉÔÌÀ¤Ê¥³¥Þ¥ó¥É" - --#: init.c:2220 -+#: init.c:2258 - #, c-format - msgid "Error in command line: %s\n" - msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó¤Ç¥¨¥é¡¼: %s\n" - --#: init.c:2270 -+#: init.c:2308 - msgid "unable to determine home directory" - msgstr "¥Û¡¼¥à¥Ç¥£¥ì¥¯¥È¥ê¤ò¼±Ê̤Ǥ­¤Ê¤¤" - --#: init.c:2278 -+#: init.c:2316 - msgid "unable to determine username" - msgstr "¥æ¡¼¥¶Ì¾¤ò¼±Ê̤Ǥ­¤Ê¤¤" - -@@ -3122,15 +3120,15 @@ msgstr "¥á¥â¥êÉÔ­!" - #: main.c:59 - msgid "" - "To contact the developers, please mail to .\n" --"To report a bug, please use the flea(1) utility.\n" -+"To report a bug, please visit http://bugs.mutt.org/.\n" - msgstr "" - "³«È¯¼Ô(ËܲÈ)¤ËÏ¢Íí¤ò¤È¤ë¤Ë¤Ï ¤Ø¥á¡¼¥ë¤»¤è¡£\n" --"¥Ð¥°¤ò¥ì¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï flea (1) ¥æ¡¼¥Æ¥£¥ê¥Æ¥£¤ò»ÈÍѤ»¤è¡£\n" -+"¥Ð¥°¤ò¥ì¥Ý¡¼¥È¤¹¤ë¤Ë¤Ï http://bugs.mutt.org/ ¤ò»²¾È¤Î¤³¤È¡£\n" - "ÆüËܸìÈǤΥХ°¥ì¥Ý¡¼¥È¤ª¤è¤ÓÏ¢Íí¤Ï mutt-j-users ML ¤Ø¡£\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" -@@ -3146,9 +3144,12 @@ msgid "" - "Copyright (C) 1999-2002 Tommi Komulainen \n" - "Copyright (C) 2000-2002 Edmund Grimley Evans \n" - "\n" --"Lots of others not mentioned here contributed lots of code,\n" --"fixes, and suggestions.\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" -@@ -3158,13 +3159,17 @@ msgid "" - " 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" -+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" -+" Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-" -+"1301, USA.\n" - msgstr "" - --#: main.c:107 -+#: main.c:108 - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3177,13 +3182,6 @@ msgid "" - "[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" --"\n" --"options:\n" --" -A \texpand the given alias\n" --" -a \tattach a file to the message\n" --" -b
\tspecify a blind carbon-copy (BCC) address\n" --" -c
\tspecify a carbon-copy (CC) address\n" --" -D\t\tprint the value of all variables to stdout" - msgstr "" - "»ÈÍÑË¡: mutt [-nRyzZ] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] [-m <¥¿¥¤¥×>] \n" - " [-f <¥Õ¥¡¥¤¥ë>]\n" -@@ -3197,7 +3195,16 @@ msgstr "" - " [-c <¥¢¥É¥ì¥¹>] <¥¢¥É¥ì¥¹> [ ... ]\n" - " mutt [-n] [-e <¥³¥Þ¥ó¥É>] [-F <¥Õ¥¡¥¤¥ë>] -p\n" - " mutt -v[v]\n" --"\n" -+ -+#: main.c:116 -+msgid "" -+"options:\n" -+" -A \texpand the given alias\n" -+" -a \tattach a file to the message\n" -+" -b
\tspecify a blind carbon-copy (BCC) address\n" -+" -c
\tspecify a carbon-copy (CC) address\n" -+" -D\t\tprint the value of all variables to stdout" -+msgstr "" - "¥ª¥×¥·¥ç¥ó:\n" - " -A <ÊÌ̾>\t»ØÄꤷ¤¿ÊÌ̾¤ÎŸ³«\n" - " -a <¥Õ¥¡¥¤¥ë>\t¥á¥Ã¥»¡¼¥¸¤Ë¥Õ¥¡¥¤¥ë¤òźÉÕ\n" -@@ -3205,11 +3212,11 @@ msgstr "" - " -c <¥¢¥É¥ì¥¹>\tcarbon-copy (CC) ¥¢¥É¥ì¥¹¤Î»ØÄê\n" - " -D\t\tÊÑ¿ô¤ò¤¹¤Ù¤Æɸ½à½ÐÎϤØɽ¼¨" - --#: main.c:122 -+#: main.c:124 - msgid " -d \tlog debugging output to ~/.muttdebug0" - msgstr " -d <¥ì¥Ù¥ë>\t¥Ç¥Ð¥°½ÐÎϤò ~/.muttdebug0 ¤Ëµ­Ï¿" - --#: main.c:125 -+#: main.c:127 - msgid "" - " -e \tspecify a command to be executed after initialization\n" - " -f \tspecify which mailbox to read\n" -@@ -3218,7 +3225,19 @@ msgid "" - " -i \tspecify a file which Mutt should include in the body\n" - " -m \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 <¥³¥Þ¥ó¥É>\t½é´ü²½¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Î»ØÄê\n" -+" -f <¥Õ¥¡¥¤¥ë>\tÆɤ߽Ф·¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄê\n" -+" -F <¥Õ¥¡¥¤¥ë>\tÂåÂØ muttrc ¥Õ¥¡¥¤¥ë¤Î»ØÄê\n" -+" -H <¥Õ¥¡¥¤¥ë>\t¤Ø¥Ã¥À¤òÆɤि¤á¤Ë²¼½ñ¥Õ¥¡¥¤¥ë¤ò»ØÄê\n" -+" -i <¥Õ¥¡¥¤¥ë>\tÊÖ¿®»þ¤Ë Mutt ¤¬ÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î»ØÄê\n" -+" -m <¥¿¥¤¥×>\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°¤Î»ØÄê\n" -+" -n\t\t¥·¥¹¥Æ¥à´ûÄê¤Î Muttrc ¤òÆɤޤʤ¤¤³¤È¤Î»ØÄê\n" -+" -p\t\tÊݸ¤µ¤ì¤Æ¤¤¤ë (½ñ¤­¤«¤±) ¥á¥Ã¥»¡¼¥¸¤ÎºÆÆɤ߽Ф·¤Î»ØÄê" -+ -+#: main.c:136 -+msgid "" - " -Q \tquery a configuration variable\n" - " -R\t\topen mailbox in read-only mode\n" - " -s \tspecify a subject (must be in quotes if it has spaces)\n" -@@ -3229,15 +3248,7 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --" -e <¥³¥Þ¥ó¥É>\t½é´ü²½¸å¤Ë¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤Î»ØÄê\n" --" -f <¥Õ¥¡¥¤¥ë>\tÆɤ߽Ф·¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Î»ØÄê\n" --" -F <¥Õ¥¡¥¤¥ë>\tÂåÂØ muttrc ¥Õ¥¡¥¤¥ë¤Î»ØÄê\n" --" -H <¥Õ¥¡¥¤¥ë>\t¤Ø¥Ã¥À¤òÆɤि¤á¤Ë²¼½ñ¥Õ¥¡¥¤¥ë¤ò»ØÄê\n" --" -i <¥Õ¥¡¥¤¥ë>\tÊÖ¿®»þ¤Ë Mutt ¤¬ÁÞÆþ¤¹¤ë¥Õ¥¡¥¤¥ë¤Î»ØÄê\n" --" -m <¥¿¥¤¥×>\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹·Á¼°¤Î»ØÄê\n" --" -n\t\t¥·¥¹¥Æ¥à´ûÄê¤Î Muttrc ¤òÆɤޤʤ¤¤³¤È¤Î»ØÄê\n" --" -p\t\tÊݸ¤µ¤ì¤Æ¤¤¤ë (½ñ¤­¤«¤±) ¥á¥Ã¥»¡¼¥¸¤ÎºÆÆɤ߽Ф·¤Î»ØÄê\n" --" -Q \tÀßÄêÊÑ¿ô¤ÎÌ䤤¹ç¤ï¤»\n" -+" -Q <ÊÑ¿ô>\tÀßÄêÊÑ¿ô¤ÎÌ䤤¹ç¤ï¤»\n" - " -R\t\t¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤òÆɤ߽Ф·ÀìÍѥ⡼¥É¤Ç¥ª¡¼¥×¥ó¤¹¤ë¤³¤È¤Î»ØÄê\n" - " -s <Âê̾>\tÂê̾¤Î»ØÄê (¶õÇò¤¬¤¢¤ë¾ì¹ç¤Ë¤Ï°úÍÑÉä¤Ç¤¯¤¯¤ë¤³¤È)\n" - " -v\t\t¥Ð¡¼¥¸¥ç¥ó¤È¥³¥ó¥Ñ¥¤¥ë»þ»ØÄê¤Îɽ¼¨\n" -@@ -3247,7 +3258,7 @@ msgstr "" - " -Z\t\t¿·Ãå¥á¥Ã¥»¡¼¥¸¤¬Ìµ¤±¤ì¤Ð¤¹¤°¤Ë½ªÎ»\n" - " -h\t\t¤³¤Î¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸" - --#: main.c:181 -+#: main.c:185 - msgid "" - "\n" - "Compile options:" -@@ -3255,47 +3266,47 @@ msgstr "" - "\n" - "¥³¥ó¥Ñ¥¤¥ë»þ¥ª¥×¥·¥ç¥ó:" - --#: main.c:487 -+#: main.c:494 - msgid "Error initializing terminal." - msgstr "üËö½é´ü²½¥¨¥é¡¼" - --#: main.c:597 -+#: main.c:604 - #, c-format - msgid "Debugging at level %d.\n" - msgstr "¥ì¥Ù¥ë %d ¤Ç¥Ç¥Ð¥Ã¥°Ãæ¡£\n" - --#: main.c:599 -+#: main.c:606 - msgid "DEBUG was not defined during compilation. Ignored.\n" - msgstr "DEBUG ¤¬¥³¥ó¥Ñ¥¤¥ë»þ¤ËÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£Ìµ»ë¤¹¤ë¡£\n" - --#: main.c:749 -+#: main.c:758 - #, c-format - msgid "%s does not exist. Create it?" - msgstr "%s ¤¬Â¸ºß¤·¤Ê¤¤¡£ºîÀ®?" - --#: main.c:753 -+#: main.c:762 - #, c-format - msgid "Can't create %s: %s." - msgstr "%s ¤¬ %s ¤Î¤¿¤á¤ËºîÀ®¤Ç¤­¤Ê¤¤¡£" - --#: main.c:798 -+#: main.c:807 - msgid "No recipients specified.\n" - msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£\n" - --#: main.c:884 -+#: main.c:893 - #, c-format - msgid "%s: unable to attach file.\n" - msgstr "%s: ¥Õ¥¡¥¤¥ë¤òźÉդǤ­¤Ê¤¤¡£\n" - --#: main.c:904 -+#: main.c:913 - msgid "No mailbox with new mail." - msgstr "¿·Ãå¥á¡¼¥ë¤Î¤¢¤ë¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤Ï¤Ê¤¤¡£" - --#: main.c:913 -+#: main.c:922 - msgid "No incoming mailboxes defined." - msgstr "ÅþÃåÍѥ᡼¥ë¥Ü¥Ã¥¯¥¹¤¬Ì¤ÄêµÁ¡£" - --#: main.c:941 -+#: main.c:950 - msgid "Mailbox is empty." - msgstr "¥á¡¼¥ë¥Ü¥Ã¥¯¥¹¤¬¶õ¡£" - -@@ -3391,19 +3402,19 @@ msgstr "¤¹¤Ç¤ËºÇ¸å¤Î¥¨¥ó¥È¥ê¡£" - msgid "You are on the first entry." - msgstr "¤¹¤Ç¤ËºÇ½é¤Î¥¨¥ó¥È¥ê¡£" - --#: menu.c:718 pattern.c:1303 -+#: menu.c:718 pattern.c:1308 - msgid "Search for: " - msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó: " - --#: menu.c:719 pattern.c:1304 -+#: menu.c:719 pattern.c:1309 - msgid "Reverse search for: " - msgstr "µÕ½ç¸¡º÷¥Ñ¥¿¡¼¥ó: " - --#: menu.c:729 pattern.c:1336 -+#: menu.c:729 pattern.c:1341 - msgid "No search pattern." - msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤¬¤Ê¤¤¡£" - --#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1405 -+#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1410 - msgid "Not found." - msgstr "¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¡£" - -@@ -3517,7 +3528,6 @@ msgid "Unknown" - msgstr "ÉÔÌÀ" - - #: mutt_ssl.c:417 mutt_ssl_gnutls.c:381 --#, c-format - msgid "[unable to calculate]" - msgstr "[·×»»ÉÔǽ]" - -@@ -3542,7 +3552,6 @@ msgid "This certificate was issued by:" - msgstr "¤³¤Î¾ÚÌÀ½ñ¤Îȯ¹Ô¸µ:" - - #: mutt_ssl.c:651 mutt_ssl_gnutls.c:712 --#, c-format - msgid "This certificate is valid" - msgstr "¤³¤Î¾ÚÌÀ½ñ¤ÎÍ­¸ú´ü´Ö¤Ï" - -@@ -3816,10 +3825,6 @@ msgstr "¥á¥Ã¥»¡¼¥¸¤ò½ñ¤­¹þ¤á¤Ê¤¤" - msgid "Integer overflow -- can't allocate memory." - msgstr "·å¤¢¤Õ¤ì -- ¥á¥â¥ê¤ò³ä¤êÅö¤Æ¤é¤ì¤Ê¤¤¡£" - --#: pager.c:57 --msgid "Not available in this menu." --msgstr "¤³¤Î¥á¥Ë¥å¡¼¤Ç¤ÏÍøÍѤǤ­¤Ê¤¤¡£" -- - #: pager.c:1484 - msgid "PrevPg" - msgstr "Á°ÊÇ" -@@ -3874,81 +3879,84 @@ msgstr "¥Þ¥ë¥Á¥Ñ¡¼¥È¤Î¥á¥Ã¥»¡¼¥¸¤À¤¬ bou - msgid "Error in expression: %s" - msgstr "±¦µ­¤Î¼°Ãæ¤Ë¥¨¥é¡¼: %s" - --#: pattern.c:389 -+#: pattern.c:268 -+msgid "Empty expression" -+msgstr "¶õ¤ÎÀµµ¬É½¸½" -+ -+#: pattern.c:394 - #, c-format - msgid "Invalid day of month: %s" - msgstr "%s ¤ÏÉÔÀµ¤ÊÆüÉÕ" - --#: pattern.c:403 -+#: pattern.c:408 - #, c-format - msgid "Invalid month: %s" - msgstr "%s ¤ÏÉÔÀµ¤Ê·î" - - #. getDate has its own error message, don't overwrite it here --#: pattern.c:555 -+#: pattern.c:560 - #, c-format - msgid "Invalid relative date: %s" - msgstr "%s ¤ÏÉÔÀµ¤ÊÁêÂзîÆü" - --#: pattern.c:569 -+#: pattern.c:574 - msgid "error in expression" - msgstr "¼°Ãæ¤Ë¥¨¥é¡¼" - --#: pattern.c:784 pattern.c:894 -+#: pattern.c:789 pattern.c:899 - #, c-format - msgid "error in pattern at: %s" - msgstr "%s ¥Ñ¥¿¡¼¥óÃæ¤Ë¥¨¥é¡¼" - --#: pattern.c:834 -+#: pattern.c:839 - #, c-format - msgid "%c: invalid command" - msgstr "%c ¤ÏÉÔÀµ¤Ê¥³¥Þ¥ó¥É" - --#: pattern.c:840 -+#: pattern.c:845 - #, c-format - msgid "%c: not supported in this mode" - msgstr "%c ¤Ï¤³¤Î¥â¡¼¥É¤Ç¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤" - --#: pattern.c:853 --#, c-format -+#: pattern.c:858 - msgid "missing parameter" - msgstr "¥Ñ¥é¥á¡¼¥¿¤¬¤Ê¤¤" - --#: pattern.c:869 -+#: pattern.c:874 - #, c-format - msgid "mismatched parenthesis: %s" - msgstr "Âбþ¤¹¤ë³ç¸Ì¤¬¤Ê¤¤: %s" - --#: pattern.c:901 -+#: pattern.c:906 - msgid "empty pattern" - msgstr "¥Ñ¥¿¡¼¥ó¤¬¶õ" - --#: pattern.c:1117 -+#: pattern.c:1122 - #, c-format - msgid "error: unknown op %d (report this error)." - msgstr "¥¨¥é¡¼: ÉÔÌÀ¤Ê op %d (¤³¤Î¥¨¥é¡¼¤òÊó¹ð¤»¤è)¡£" - --#: pattern.c:1193 pattern.c:1322 -+#: pattern.c:1198 pattern.c:1327 - msgid "Compiling search pattern..." - msgstr "¸¡º÷¥Ñ¥¿¡¼¥ó¤ò¥³¥ó¥Ñ¥¤¥ëÃæ..." - --#: pattern.c:1212 -+#: pattern.c:1217 - msgid "Executing command on matching messages..." - msgstr "¥á¥Ã¥»¡¼¥¸¥Ñ¥¿¡¼¥ó¸¡º÷¤Î¤¿¤á¤Ë¥³¥Þ¥ó¥É¼Â¹ÔÃæ..." - --#: pattern.c:1275 -+#: pattern.c:1280 - msgid "No messages matched criteria." - msgstr "¥Ñ¥¿¡¼¥ó¤Ë°ìÃפ¹¤ë¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤«¤Ã¤¿¡£" - --#: pattern.c:1364 -+#: pattern.c:1369 - msgid "Search hit bottom without finding match" - msgstr "°ìÈÖ²¼¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£" - --#: pattern.c:1375 -+#: pattern.c:1380 - msgid "Search hit top without finding match" - msgstr "°ìÈÖ¾å¤Þ¤Ç¡¢²¿¤â¸¡º÷¤Ë°ìÃפ·¤Ê¤«¤Ã¤¿¡£" - --#: pattern.c:1397 -+#: pattern.c:1402 - msgid "Search interrupted." - msgstr "¸¡º÷¤¬ÃæÃǤµ¤ì¤¿¡£" - -@@ -3960,11 +3968,11 @@ msgstr "PGP ¥Ñ¥¹¥Õ¥ì¡¼¥ºÆþÎÏ:" - msgid "PGP passphrase forgotten." - msgstr "PGP ¥Ñ¥¹¥Õ¥ì¡¼¥º¤¬¥á¥â¥ê¤«¤é¾Ãµî¤µ¤ì¤¿¡£" - --#: pgp.c:345 -+#: pgp.c:353 - msgid "[-- Error: unable to create PGP subprocess! --]\n" - msgstr "[-- ¥¨¥é¡¼: PGP »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n" - --#: pgp.c:379 pgp.c:620 pgp.c:824 -+#: pgp.c:387 pgp.c:628 pgp.c:832 - msgid "" - "[-- End of PGP output --]\n" - "\n" -@@ -3972,20 +3980,20 @@ msgstr "" - "[-- PGP ½ÐÎϽªÎ» --]\n" - "\n" - --#: pgp.c:392 pgp.c:956 -+#: pgp.c:400 pgp.c:964 - msgid "Could not decrypt PGP message" - msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤òÉü¹æ²½¤Ç¤­¤Ê¤«¤Ã¤¿" - - #. clear 'Invoking...' message, since there's no error --#: pgp.c:441 pgp.c:952 -+#: pgp.c:449 pgp.c:960 - msgid "PGP message successfully decrypted." - msgstr "PGP ¥á¥Ã¥»¡¼¥¸¤ÎÉü¹æ²½¤ËÀ®¸ù¤·¤¿¡£" - --#: pgp.c:728 -+#: pgp.c:736 - msgid "Internal error. Inform ." - msgstr "ÆâÉô¥¨¥é¡¼¡£ ¤ËÊó¹ð¤»¤è¡£" - --#: pgp.c:789 -+#: pgp.c:797 - msgid "" - "[-- Error: could not create a PGP subprocess! --]\n" - "\n" -@@ -3993,32 +4001,32 @@ msgstr "" - "[-- ¥¨¥é¡¼: PGP »Ò¥×¥í¥»¥¹¤òºîÀ®¤Ç¤­¤Ê¤«¤Ã¤¿! --]\n" - "\n" - --#: pgp.c:833 -+#: pgp.c:841 - msgid "Decryption failed" - msgstr "Éü¹æ²½¤Ë¼ºÇÔ¤·¤¿" - --#: pgp.c:1008 -+#: pgp.c:1016 - msgid "Can't open PGP subprocess!" - msgstr "PGP »Ò¥×¥í¥»¥¹¤ò¥ª¡¼¥×¥ó¤Ç¤­¤Ê¤¤!" - --#: pgp.c:1444 -+#: pgp.c:1452 - msgid "Can't invoke PGP" - msgstr "PGP µ¯Æ°¤Ç¤­¤Ê¤¤" - --#: pgp.c:1545 -+#: pgp.c:1553 - #, c-format - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " - msgstr "PGP e:°Å¹æ²½, s:½ð̾, a:½ð̾¸°ÁªÂò, b:°Å¹æ+½ð̾, %s, c:¤Ê¤· " - --#: pgp.c:1546 -+#: pgp.c:1554 - msgid "PGP/M(i)ME" - msgstr "i:PGP/MIME" - --#: pgp.c:1546 -+#: pgp.c:1554 - msgid "(i)nline" - msgstr "i:¥¤¥ó¥é¥¤¥ó" - --#: pgp.c:1548 -+#: pgp.c:1556 - msgid "esabifc" - msgstr "esabifc" - -@@ -4058,7 +4066,6 @@ msgid "PGP Key %s." - msgstr "PGP ¸° %s" - - #: pop.c:91 pop_lib.c:201 --#, c-format - msgid "Command TOP is not supported by server." - msgstr "¥³¥Þ¥ó¥É TOP ¤ò¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£" - -@@ -4067,7 +4074,6 @@ msgid "Can't write header to temporary f - msgstr "¥Ø¥Ã¥À¤ò°ì»þ¥Õ¥¡¥¤¥ë¤Ë½ñ¤­¹þ¤á¤Ê¤¤!" - - #: pop.c:199 pop_lib.c:203 --#, c-format - msgid "Command UIDL is not supported by server." - msgstr "¥³¥Þ¥ó¥É UIDL ¤ò¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£" - -@@ -4131,7 +4137,6 @@ msgid "APOP authentication failed." - msgstr "APOP ǧ¾Ú¤Ë¼ºÇÔ¤·¤¿¡£" - - #: pop_auth.c:243 --#, c-format - msgid "Command USER is not supported by server." - msgstr "¥³¥Þ¥ó¥É USER ¤Ï¥µ¡¼¥Ð¤¬¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Ê¤¤¡£" - -@@ -4201,7 +4206,6 @@ msgid "Query command not defined." - msgstr "Ì䤤¹ç¤ï¤»¥³¥Þ¥ó¥É¤ÏÄêµÁ¤µ¤ì¤Æ¤¤¤Ê¤¤¡£" - - #: query.c:290 --#, c-format - msgid "Query" - msgstr "Ì䤤¹ç¤ï¤»" - -@@ -4323,7 +4327,7 @@ msgstr "%s ¤òºîÀ®¤Ç¤­¤Ê¤¤¡£" - msgid "Can't find any tagged messages." - msgstr "¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬°ì¤Ä¤â¸«¤Ä¤«¤é¤Ê¤¤¡£" - --#: recvcmd.c:749 send.c:715 -+#: recvcmd.c:749 send.c:721 - msgid "No mailing lists found!" - msgstr "¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤¬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿!" - -@@ -4444,82 +4448,82 @@ msgstr "%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 "²Ä»ë¤Ê¥¿¥°ÉÕ¤­¥á¥Ã¥»¡¼¥¸¤¬¤Ê¤¤!" - --#: send.c:741 -+#: send.c:747 - msgid "Include message in reply?" - msgstr "ÊÖ¿®¤Ë¥á¥Ã¥»¡¼¥¸¤ò´Þ¤á¤ë¤«?" - --#: send.c:746 -+#: send.c:752 - msgid "Including quoted message..." - msgstr "°úÍÑ¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê¹þ¤ßÃæ..." - --#: send.c:756 -+#: send.c:762 - msgid "Could not include all requested messages!" - msgstr "¤¹¤Ù¤Æ¤ÎÍ׵ᤵ¤ì¤¿¥á¥Ã¥»¡¼¥¸¤ò¼è¤ê¹þ¤á¤Ê¤«¤Ã¤¿!" - --#: send.c:770 -+#: send.c:776 - msgid "Forward as attachment?" - msgstr "źÉÕ¥Õ¥¡¥¤¥ë¤È¤·¤ÆžÁ÷?" - --#: send.c:774 -+#: send.c:780 - msgid "Preparing forwarded message..." - msgstr "žÁ÷¥á¥Ã¥»¡¼¥¸¤ò½àÈ÷Ãæ..." - - #. If the user is composing a new message, check to see if there - #. * are any postponed messages first. - #. --#: send.c:1071 -+#: send.c:1077 - msgid "Recall postponed message?" - msgstr "½ñ¤­¤«¤±¤Î¥á¥Ã¥»¡¼¥¸¤ò¸Æ¤Ó½Ð¤¹?" - --#: send.c:1372 -+#: send.c:1379 - msgid "Edit forwarded message?" - msgstr "žÁ÷¥á¥Ã¥»¡¼¥¸¤òÊÔ½¸?" - --#: send.c:1400 -+#: send.c:1407 - msgid "Abort unmodified message?" - msgstr "¥á¥Ã¥»¡¼¥¸¤Ï̤Êѹ¹¡£Ãæ»ß?" - --#: send.c:1402 -+#: send.c:1409 - msgid "Aborted unmodified message." - msgstr "̤Êѹ¹¤Î¥á¥Ã¥»¡¼¥¸¤òÃæ»ß¤·¤¿¡£" - --#: send.c:1471 -+#: send.c:1478 - msgid "Message postponed." - msgstr "¥á¥Ã¥»¡¼¥¸¤Ï½ñ¤­¤«¤±¤ÇÊÝᤵ¤ì¤¿¡£" - --#: send.c:1480 -+#: send.c:1487 - msgid "No recipients are specified!" - msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤!" - --#: send.c:1485 -+#: send.c:1492 - msgid "No recipients were specified." - msgstr "¼õ¿®¼Ô¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤«¤Ã¤¿¡£" - --#: send.c:1501 -+#: send.c:1508 - msgid "No subject, abort sending?" - msgstr "Âê̾¤¬¤Ê¤¤¡£Á÷¿®¤òÃæ»ß?" - --#: send.c:1505 -+#: send.c:1512 - msgid "No subject specified." - msgstr "Âê̾¤¬»ØÄꤵ¤ì¤Æ¤¤¤Ê¤¤¡£" - --#: send.c:1567 -+#: send.c:1574 - msgid "Sending message..." - msgstr "Á÷¿®Ãæ..." - --#: send.c:1708 -+#: send.c:1715 - msgid "Could not send the message." - msgstr "¥á¥Ã¥»¡¼¥¸¤òÁ÷¿®¤Ç¤­¤Ê¤«¤Ã¤¿¡£" - --#: send.c:1713 -+#: send.c:1720 - msgid "Mail sent." - msgstr "¥á¡¼¥ë¤òÁ÷¿®¤·¤¿¡£" - --#: send.c:1713 -+#: send.c:1720 - msgid "Sending in background." - msgstr "¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤ÇÁ÷¿®¡£" - diff --git a/upstream/patches/cvs_2005-09-29 b/upstream/patches/cvs_2005-09-29 deleted file mode 100644 index 99a43f9..0000000 --- a/upstream/patches/cvs_2005-09-29 +++ /dev/null @@ -1,2063 +0,0 @@ -Index: mutt/ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.610 -retrieving revision 3.612 -diff -u -p -r3.610 -r3.612 ---- mutt/ChangeLog 24 Sep 2005 20:04:38 -0000 3.610 -+++ mutt/ChangeLog 29 Sep 2005 23:06:56 -0000 3.612 -@@ -1,3 +1,14 @@ -+2005-09-29 23:02:49 Brendan Cully (brendan) -+ -+ * configure.in, copy.c, sendlib.c: Ensure that Content-Length -+ printf format specifier matches off_t size, to avoid mail-losing -+ Content-Length: 0 (bug introduced by large file patch a couple -+ of days ago). Closes: #2096. -+ -+2005-09-27 03:43:24 Johan Svedberg (brendan) -+ -+ * po/sv.po: Update. -+ - 2005-09-24 20:03:04 Brendan Cully (brendan) - - * edit.c: Inflict more needless pain on translators by splitting -Index: mutt/configure.in -=================================================================== -RCS file: /home/roessler/cvs/mutt/configure.in,v -retrieving revision 3.39 -retrieving revision 3.40 -diff -u -p -r3.39 -r3.40 ---- mutt/configure.in 24 Sep 2005 19:45:22 -0000 3.39 -+++ mutt/configure.in 29 Sep 2005 23:02:49 -0000 3.40 -@@ -42,6 +42,7 @@ AC_C_CONST - - AC_SYS_LARGEFILE - AC_FUNC_FSEEKO -+AC_CHECK_SIZEOF(off_t) - - AC_PATH_PROG(DBX, dbx, no) - AC_PATH_PROG(GDB, gdb, no) -@@ -86,10 +87,16 @@ AH_TEMPLATE([ICONV_NONTRANS], - AH_BOTTOM([/* fseeko portability defines */ - #ifdef HAVE_FSEEKO - # define LOFF_T off_t -+# if SIZEOF_OFF_T == 8 -+# define OFF_T_FMT "%lld" -+# else -+# define OFF_T_FMT "%ld" -+# endif - #else - # define LOFF_T long - # define fseeko fseek - # define ftello ftell -+# define OFF_T_FMT "%ld" - #endif - ]) - MUTT_C99_INTTYPES -Index: mutt/copy.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/copy.c,v -retrieving revision 3.25 -retrieving revision 3.26 -diff -u -p -r3.25 -r3.26 ---- mutt/copy.c 24 Sep 2005 19:36:35 -0000 3.25 -+++ mutt/copy.c 29 Sep 2005 23:02:49 -0000 3.26 -@@ -470,7 +470,7 @@ mutt_copy_header (FILE *in, HEADER *h, F - if (flags & CH_UPDATE_LEN && - (flags & CH_NOLEN) == 0) - { -- fprintf (out, "Content-Length: %ld\n", h->content->length); -+ fprintf (out, "Content-Length: " OFF_T_FMT "\n", h->content->length); - if (h->lines != 0 || h->content->length == 0) - fprintf (out, "Lines: %d\n", h->lines); - } -@@ -490,7 +490,7 @@ mutt_copy_header (FILE *in, HEADER *h, F - } - - /* Count the number of lines and bytes to be deleted in this body*/ --static int count_delete_lines (FILE *fp, BODY *b, long *length, size_t datelen) -+static int count_delete_lines (FILE *fp, BODY *b, LOFF_T *length, size_t datelen) - { - int dellines = 0; - long l; -@@ -498,7 +498,7 @@ static int count_delete_lines (FILE *fp, - - if (b->deleted) - { -- fseek (fp, b->offset, SEEK_SET); -+ fseeko (fp, b->offset, SEEK_SET); - for (l = b->length ; l ; l --) - { - ch = getc (fp); -@@ -545,7 +545,7 @@ _mutt_copy_message (FILE *fpout, FILE *f - { - char prefix[SHORT_STRING]; - STATE s; -- long new_offset = -1; -+ LOFF_T new_offset = -1; - int rc = 0; - - if (flags & M_CM_PREFIX) -@@ -564,7 +564,7 @@ _mutt_copy_message (FILE *fpout, FILE *f - else if (hdr->attach_del && (chflags & CH_UPDATE_LEN)) - { - int new_lines; -- long new_length = body->length; -+ LOFF_T new_length = body->length; - char date[SHORT_STRING]; - - mutt_make_date (date, sizeof (date)); -@@ -579,7 +579,7 @@ _mutt_copy_message (FILE *fpout, FILE *f - if (mutt_copy_header (fpin, hdr, fpout, - chflags | CH_NOLEN | CH_NONEWLINE, NULL)) - return -1; -- fprintf (fpout, "Content-Length: %ld\n", new_length); -+ fprintf (fpout, "Content-Length: " OFF_T_FMT "\n", new_length); - if (new_lines <= 0) - new_lines = 0; - else -@@ -595,7 +595,7 @@ _mutt_copy_message (FILE *fpout, FILE *f - - #ifdef DEBUG - { -- long fail = ((ftell (fpout) - new_offset) - new_length); -+ LOFF_T fail = ((ftello (fpout) - new_offset) - new_length); - - if (fail) - { -@@ -633,7 +633,7 @@ _mutt_copy_message (FILE *fpout, FILE *f - (chflags & CH_PREFIX) ? prefix : NULL) == -1) - return -1; - -- new_offset = ftell (fpout); -+ new_offset = ftello (fpout); - } - - if (flags & M_CM_DECODE) -@@ -821,7 +821,7 @@ static int copy_delete_attach (BODY *b, - { - fprintf (fpout, - "Content-Type: message/external-body; access-type=x-mutt-deleted;\n" -- "\texpiration=%s; length=%ld\n" -+ "\texpiration=%s; length=" OFF_T_FMT "\n" - "\n", date + 5, part->length); - if (ferror (fpout)) - return -1; -Index: mutt/sendlib.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/sendlib.c,v -retrieving revision 3.35 -retrieving revision 3.36 -diff -u -p -r3.35 -r3.36 ---- mutt/sendlib.c 24 Sep 2005 19:36:35 -0000 3.35 -+++ mutt/sendlib.c 29 Sep 2005 23:02:49 -0000 3.36 -@@ -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: %ld\n", (long) ftell (tempfp)); -+ fprintf (msg->fp, "Content-Length: " OFF_T_FMT "\n", (LOFF_T) ftell (tempfp)); - fprintf (msg->fp, "Lines: %d\n\n", lines); - - /* copy the body and clean up */ -Index: mutt/po/sv.po -=================================================================== -RCS file: /home/roessler/cvs/mutt/po/sv.po,v -retrieving revision 3.25 -retrieving revision 3.26 -diff -u -p -r3.25 -r3.26 ---- mutt/po/sv.po 17 Sep 2005 20:46:14 -0000 3.25 -+++ mutt/po/sv.po 27 Sep 2005 03:43:24 -0000 3.26 -@@ -2,10 +2,10 @@ - # Copyright (C) Johan Svedberg 2004-2005 - msgid "" - msgstr "" --"Project-Id-Version: Mutt 1.5.9\n" -+"Project-Id-Version: Mutt 1.5.11\n" - "Report-Msgid-Bugs-To: \n" --"POT-Creation-Date: 2005-09-15 16:23+0200\n" --"PO-Revision-Date: 2005-04-09 16:01+0200\n" -+"POT-Creation-Date: 2005-09-25 23:15+0200\n" -+"PO-Revision-Date: 2005-09-26 15:25+0200\n" - "Last-Translator: Johan Svedberg \n" - "Language-Team: Swedish \n" - "MIME-Version: 1.0\n" -@@ -607,7 +607,7 @@ msgstr "Varning: \"%s\" är ett dåligt ID - msgid "You may not delete the only attachment." - msgstr "Du får inte ta bort den enda bilagan." - --#: compose.c:601 send.c:1492 -+#: compose.c:601 send.c:1499 - #, c-format - msgid "Bad IDN in \"%s\": '%s'" - msgstr "Dåligt IDN i \"%s\": \"%s\"" -@@ -714,128 +714,128 @@ msgid "PGP already selected. Clear & con - msgstr "PGP redan valt. Rensa och fortsätt? " - - #: crypt-gpgme.c:335 --#, fuzzy, c-format -+#, c-format - msgid "error creating gpgme context: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid skapande av gpgme-kontext: %s\n" - - #: crypt-gpgme.c:345 - #, c-format - msgid "error enabling CMS protocol: %s\n" --msgstr "" -+msgstr "fel vid aktivering av CMS-protokoll: %s\n" - - #: crypt-gpgme.c:365 --#, fuzzy, c-format -+#, c-format - msgid "error creating gpgme data object: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid skapande av gpgme dataobjekt: %s\n" - - #: crypt-gpgme.c:431 crypt-gpgme.c:449 crypt-gpgme.c:1327 --#, fuzzy, c-format -+#, c-format - msgid "error allocating data object: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid allokering av dataobjekt: %s\n" - - #: crypt-gpgme.c:467 --#, fuzzy, c-format -+#, c-format - msgid "error rewinding data object: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid tillbakaspolning av dataobjekt: %s\n" - - #: crypt-gpgme.c:489 crypt-gpgme.c:536 --#, fuzzy, c-format -+#, c-format - msgid "error reading data object: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid läsning av dataobjekt: %s\n" - - #: crypt-gpgme.c:597 --#, fuzzy, c-format -+#, c-format - msgid "error adding recipient `%s': %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid tilläggning av mottagare `%s': %s\n" - - #: crypt-gpgme.c:635 - #, c-format - msgid "secret key `%s' not found: %s\n" --msgstr "" -+msgstr "hemlig nyckel `%s' hittades inte: %s\n" - - #: crypt-gpgme.c:645 - #, c-format - msgid "ambiguous specification of secret key `%s'\n" --msgstr "" -+msgstr "otydlig specifikation av hemlig nyckel `%s'\n" - - #: crypt-gpgme.c:657 - #, c-format - msgid "error setting secret key `%s': %s\n" --msgstr "" -+msgstr "fel vid sättning av hemlig nyckel `%s': %s\n" - - #: crypt-gpgme.c:701 --#, fuzzy, c-format -+#, c-format - msgid "error encrypting data: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid kryptering av data: %s\n" - - #: crypt-gpgme.c:798 --#, fuzzy, c-format -+#, c-format - msgid "error signing data: %s\n" --msgstr "fel i mönster vid: %s" -+msgstr "fel vid signering av data: %s\n" - - #: crypt-gpgme.c:993 --#, fuzzy - msgid "Warning: One of the keys has been revoked\n" --msgstr "Varning: En del av detta meddelande har inte blivit signerat." -+msgstr "Varning: En av nycklarna har blivit återkallad\n" - - #: crypt-gpgme.c:1002 - msgid "Warning: The key used to create the signature expired at: " --msgstr "" -+msgstr "Varning: Nyckeln som användes för att skapa signaturen utgick vid: " - - #: crypt-gpgme.c:1008 --#, fuzzy - msgid "Warning: At least one certification key has expired\n" --msgstr "Serverertifikat har utgått" -+msgstr "Varning: Åtminstone en certifikatsnyckel har utgått\n" - - #: crypt-gpgme.c:1024 - msgid "Warning: The signature expired at: " --msgstr "" -+msgstr "Varning: Signaturen utgick vid: " - - #: crypt-gpgme.c:1030 - msgid "Can't verify due to a missing key or certificate\n" --msgstr "" -+msgstr "Kan inte verifiera på grund av saknad nyckel eller certifikat\n" - - #: crypt-gpgme.c:1035 --#, fuzzy - msgid "The CRL is not available\n" --msgstr "SSL är otillgängligt." -+msgstr "CRL:en är inte tillgänglig\n" - - #: crypt-gpgme.c:1041 - msgid "Available CRL is too old\n" --msgstr "" -+msgstr "Tillgänglig CRL är för gammal\n" - - #: crypt-gpgme.c:1046 - msgid "A policy requirement was not met\n" --msgstr "" -+msgstr "Ett policykrav blev inte uppfyllt\n" - - #: crypt-gpgme.c:1055 - msgid "A system error occurred" --msgstr "" -+msgstr "Ett systemfel inträffade" - - #: crypt-gpgme.c:1092 crypt-gpgme.c:3036 --#, fuzzy - msgid "Fingerprint: " --msgstr "Fingeravtryck: %s" -+msgstr "Fingeravtryck: " - - #: crypt-gpgme.c:1152 - msgid "" - "WARNING: We have NO indication whether the key belongs to the person named " - "as shown above\n" - msgstr "" -+"VARNING: Vi har INGEN indikation hurvida nyckeln tillhör personen med namnet " -+"som visas ovanför\n" - - #: crypt-gpgme.c:1159 - msgid "WARNING: The key does NOT BELONG to the person named as shown above\n" --msgstr "" -+msgstr "VARNING: Nyckeln TILLHÖR INTE personen med namnet som visas ovanför\n" - - #: crypt-gpgme.c:1163 - msgid "" - "WARNING: It is NOT certain that the key belongs to the person named as shown " - "above\n" - msgstr "" -+"VARNING: Det är INTE säkert att nyckeln tillhör personen med namnet som visas " -+"ovanför\n" - - #: crypt-gpgme.c:1238 - msgid "Error getting key information: " --msgstr "" -+msgstr "Fel vid hämtning av nyckelinformation: " - - #. 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, -@@ -843,72 +843,71 @@ msgstr "" - #. ultimate). - #: crypt-gpgme.c:1245 crypt-gpgme.c:1278 - msgid "Good signature from: " --msgstr "" -+msgstr "Bra signatur från: " - - #: crypt-gpgme.c:1255 - msgid " aka: " --msgstr "" -+msgstr " aka: " - - #: crypt-gpgme.c:1259 crypt-gpgme.c:1281 - msgid " created: " --msgstr "" -+msgstr " skapad: " - - #: crypt-gpgme.c:1268 - msgid "*BAD* signature claimed to be from: " --msgstr "" -+msgstr "*DÅLIG* signatur påstående vara från: " - - #: crypt-gpgme.c:1291 --#, fuzzy - msgid "Error checking signature" --msgstr "Fel vid sändning av meddelande." -+msgstr "Fel vid kontroll av signatur" - - #. 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 "" -+msgstr "[-- Signaturinformation börjar --]\n" - - #: crypt-gpgme.c:1344 --#, fuzzy, c-format -+#, c-format - msgid "Error: verification failed: %s\n" --msgstr "Fel i kommandorad: %s\n" -+msgstr "Fel: verifiering misslyckades: %s\n" - - #: crypt-gpgme.c:1386 - #, c-format - msgid "*** Begin Notation (signature by: %s) ***\n" --msgstr "" -+msgstr "*** Notation börjar (signatur av: %s) ***\n" - - #: crypt-gpgme.c:1405 - msgid "*** End Notation ***\n" --msgstr "" -+msgstr "*** Notation slutar ***\n" - - #: crypt-gpgme.c:1413 crypt-gpgme.c:1552 crypt-gpgme.c:2046 --#, fuzzy - msgid "" - "[-- End signature information --]\n" - "\n" - msgstr "" -+"[-- Slut på signaturinformation --]\n" - "\n" --"[-- Slut på signerat data --]\n" - - #: crypt-gpgme.c:1507 --#, fuzzy, c-format -+#, c-format - msgid "" - "[-- Error: decryption failed: %s --]\n" - "\n" --msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n" -+msgstr "[-- Fel: avkryptering misslyckades: %s --]\n" -+"\n" - - #: crypt-gpgme.c:2006 - #, c-format - msgid "Error: decryption/verification failed: %s\n" --msgstr "" -+msgstr "Fel: avkryptering/verifiering misslyckades: %s\n" - - #: crypt-gpgme.c:2054 - msgid "Error: copy data failed\n" --msgstr "" -+msgstr "Fel: datakopiering misslyckades\n" - --#: crypt-gpgme.c:2074 pgp.c:410 -+#: crypt-gpgme.c:2074 pgp.c:418 - msgid "" - "[-- BEGIN PGP MESSAGE --]\n" - "\n" -@@ -916,11 +915,11 @@ msgstr "" - "[-- PGP-MEDDELANDE BÖRJAR --]\n" - "\n" - --#: crypt-gpgme.c:2076 pgp.c:412 -+#: crypt-gpgme.c:2076 pgp.c:420 - msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- START PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n" - --#: crypt-gpgme.c:2079 pgp.c:414 -+#: crypt-gpgme.c:2079 pgp.c:422 - msgid "" - "[-- BEGIN PGP SIGNED MESSAGE --]\n" - "\n" -@@ -928,19 +927,19 @@ msgstr "" - "[-- START PÅ PGP-SIGNERAT MEDDELANDE --]\n" - "\n" - --#: crypt-gpgme.c:2106 pgp.c:440 -+#: crypt-gpgme.c:2106 pgp.c:448 - msgid "[-- END PGP MESSAGE --]\n" - msgstr "[-- PGP-MEDDELANDE SLUTAR --]\n" - --#: crypt-gpgme.c:2108 pgp.c:444 -+#: crypt-gpgme.c:2108 pgp.c:452 - msgid "[-- END PGP PUBLIC KEY BLOCK --]\n" - msgstr "[-- SLUT PÅ BLOCK MED PUBLIK PGP-NYCKEL --]\n" - --#: crypt-gpgme.c:2110 pgp.c:446 -+#: crypt-gpgme.c:2110 pgp.c:454 - msgid "[-- END PGP SIGNED MESSAGE --]\n" - msgstr "[-- SLUT PÅ PGP-SIGNERAT MEDDELANDE --]\n" - --#: crypt-gpgme.c:2131 pgp.c:476 -+#: crypt-gpgme.c:2131 pgp.c:484 - msgid "" - "[-- Error: could not find beginning of PGP message! --]\n" - "\n" -@@ -948,7 +947,7 @@ msgstr "" - "[-- Fel: kunde inte hitta början av PGP-meddelande! --]\n" - "\n" - --#: crypt-gpgme.c:2162 pgp.c:905 -+#: crypt-gpgme.c:2162 pgp.c:913 - msgid "" - "[-- Error: malformed PGP/MIME message! --]\n" - "\n" -@@ -956,20 +955,19 @@ msgstr "" - "[-- Fel: missformat PGP/MIME-meddelande! --]\n" - "\n" - --#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:918 -+#: crypt-gpgme.c:2174 crypt-gpgme.c:2240 pgp.c:926 - msgid "[-- Error: could not create temporary file! --]\n" - msgstr "[-- Fel: kunde inte skapa tillfällig fil! --]\n" - - #: crypt-gpgme.c:2186 --#, fuzzy - msgid "" - "[-- The following data is PGP/MIME signed and encrypted --]\n" - "\n" - msgstr "" --"[-- Följande data är PGP/MIME-krypterad --]\n" -+"[-- Följande data är PGP/MIME-signerad och krypterad --]\n" - "\n" - --#: crypt-gpgme.c:2187 pgp.c:927 -+#: crypt-gpgme.c:2187 pgp.c:935 - msgid "" - "[-- The following data is PGP/MIME encrypted --]\n" - "\n" -@@ -978,16 +976,14 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2209 --#, fuzzy - msgid "[-- End of PGP/MIME signed and encrypted data --]\n" --msgstr "[-- Slut på PGP/MIME-krypterad data --]\n" -+msgstr "[-- Slut på PGP/MIME-signerad och krypterad data --]\n" - --#: crypt-gpgme.c:2210 pgp.c:947 -+#: crypt-gpgme.c:2210 pgp.c:955 - msgid "[-- End of PGP/MIME encrypted data --]\n" - msgstr "[-- Slut på PGP/MIME-krypterad data --]\n" - - #: crypt-gpgme.c:2252 --#, fuzzy - msgid "" - "[-- The following data is S/MIME signed --]\n" - "\n" -@@ -996,7 +992,6 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2253 --#, fuzzy - msgid "" - "[-- The following data is S/MIME encrypted --]\n" - "\n" -@@ -1005,130 +1000,118 @@ msgstr "" - "\n" - - #: crypt-gpgme.c:2283 --#, fuzzy - msgid "[-- End of S/MIME signed data --]\n" --msgstr "" --"\n" --"[-- Slut på S/MIME-signerad data. --]\n" -+msgstr "[-- Slut på S/MIME-signerad data --]\n" - - #: crypt-gpgme.c:2284 --#, fuzzy - msgid "[-- End of S/MIME encrypted data --]\n" --msgstr "" --"\n" --"[-- Slut på S/MIME-krypterad data. --]\n" -+msgstr "[-- Slut på S/MIME-krypterad data --]\n" - - #: crypt-gpgme.c:2876 - msgid "[Can't display this user ID (unknown encoding)]" --msgstr "" -+msgstr "[Kan inte visa det här användar-ID:t (okänd kodning)]" - - #: crypt-gpgme.c:2878 - msgid "[Can't display this user ID (invalid encoding)]" --msgstr "" -+msgstr "[Kan inte visa det här användar-ID:t (felaktig kodning)]" - - #: crypt-gpgme.c:2883 - msgid "[Can't display this user ID (invalid DN)]" --msgstr "" -+msgstr "[Kan inte visa det här användar-ID:t (felaktig DN)]" - - #: crypt-gpgme.c:2962 - msgid " aka ......: " --msgstr "" -+msgstr " aka ......: " - - #: crypt-gpgme.c:2962 - msgid "Name ......: " --msgstr "" -+msgstr "Namn ......: " - - #: crypt-gpgme.c:2965 crypt-gpgme.c:3104 --#, fuzzy - msgid "[Invalid]" --msgstr "Ogiltig " -+msgstr "[Ogiltig]" - - #: crypt-gpgme.c:2985 crypt-gpgme.c:3128 --#, fuzzy, c-format -+#, c-format - msgid "Valid From : %s\n" --msgstr "Ogiltig månad: %s" -+msgstr "Giltig From : %s\n" - - #: crypt-gpgme.c:2998 crypt-gpgme.c:3141 --#, fuzzy, c-format -+#, c-format - msgid "Valid To ..: %s\n" --msgstr "Ogiltig månad: %s" -+msgstr "Giltig To ..: %s\n" - - #: crypt-gpgme.c:3011 crypt-gpgme.c:3154 - #, c-format - msgid "Key Type ..: %s, %lu bit %s\n" --msgstr "" -+msgstr "Nyckel-typ ..: %s, %lu bit %s\n" - - #: crypt-gpgme.c:3013 crypt-gpgme.c:3156 - #, c-format - msgid "Key Usage .: " --msgstr "" -+msgstr "Nyckel-användning .: " - - #: crypt-gpgme.c:3018 crypt-gpgme.c:3161 --#, fuzzy - msgid "encryption" --msgstr "Kryptera" -+msgstr "kryptering" - - #: 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 "" -+msgstr ", " - - #: crypt-gpgme.c:3023 crypt-gpgme.c:3166 - msgid "signing" --msgstr "" -+msgstr "signering" - - #: crypt-gpgme.c:3028 crypt-gpgme.c:3171 --#, fuzzy - msgid "certification" --msgstr "Certifikat sparat" -+msgstr "certifikat" - - #: crypt-gpgme.c:3068 - #, c-format - msgid "Serial-No .: 0x%s\n" --msgstr "" -+msgstr "Serie-nr .: 0x%s\n" - - #: crypt-gpgme.c:3076 - #, c-format - msgid "Issued By .: " --msgstr "" -+msgstr "Utfärdad av .: " - - #. display only the short keyID - #: crypt-gpgme.c:3095 --#, fuzzy, c-format -+#, c-format - msgid "Subkey ....: 0x%s" --msgstr "Nyckel-ID: 0x%s" -+msgstr "Undernyckel ....: 0x%s" - - #: crypt-gpgme.c:3099 --#, fuzzy - msgid "[Revoked]" --msgstr "Återkallad " -+msgstr "[Återkallad]" - - #: crypt-gpgme.c:3109 --#, fuzzy - msgid "[Expired]" --msgstr "Utgången " -+msgstr "[Utgången]" - - #: crypt-gpgme.c:3114 - msgid "[Disabled]" --msgstr "" -+msgstr "[Inaktiverad]" - - #: crypt-gpgme.c:3198 pgpkey.c:559 pgpkey.c:739 - msgid "Can't create temporary file" - msgstr "Kan inte skapa tillfällig fil" - - #: crypt-gpgme.c:3201 --#, fuzzy - msgid "Collecting data..." --msgstr "Ansluter till %s..." -+msgstr "Samlar data..." - - #: crypt-gpgme.c:3227 --#, fuzzy, c-format -+#, c-format - msgid "Error finding issuer key: %s\n" --msgstr "Fel vid anslutning till server: %s" -+msgstr "Fel vid sökning av utfärdarnyckel: %s\n" - - #: crypt-gpgme.c:3237 - msgid "Error: certification chain to long - stopping here\n" --msgstr "" -+msgstr "Fel: certifikatskedje för lång - stannar här\n" - - #: crypt-gpgme.c:3248 pgpkey.c:580 - #, c-format -@@ -1136,24 +1119,23 @@ msgid "Key ID: 0x%s" - msgstr "Nyckel-ID: 0x%s" - - #: crypt-gpgme.c:3331 --#, fuzzy, c-format -+#, c-format - msgid "gpgme_new failed: %s" --msgstr "Kunde ej döpa om: %s" -+msgstr "gpgme_new misslyckades: %s" - - #: crypt-gpgme.c:3370 crypt-gpgme.c:3433 - #, c-format - msgid "gpgme_op_keylist_start failed: %s" --msgstr "" -+msgstr "gpgme_op_keylist_start misslyckades: %s" - - #: crypt-gpgme.c:3420 crypt-gpgme.c:3461 - #, c-format - msgid "gpgme_op_keylist_next failed: %s" --msgstr "" -+msgstr "gpgme_op_keylist_next misslyckades: %s" - - #: crypt-gpgme.c:3532 --#, fuzzy - msgid "All matching keys are marked expired/revoked." --msgstr "Alla matchande nycklar är utgångna, återkallade, eller inaktiverade." -+msgstr "Alla matchande nycklar är markerade utgångna/återkallade." - - #: crypt-gpgme.c:3561 mutt_ssl.c:676 mutt_ssl_gnutls.c:770 pgpkey.c:514 - #: smime.c:431 -@@ -1171,34 +1153,30 @@ msgid "Check key " - msgstr "Kontrollera nyckel " - - #: crypt-gpgme.c:3583 --#, fuzzy - msgid "PGP and S/MIME keys matching" --msgstr "PGP-nycklar som matchar \"%s\"." -+msgstr "PGP- och S/MIME-nycklar som matchar" - - #: crypt-gpgme.c:3585 --#, fuzzy - msgid "PGP keys matching" --msgstr "PGP-nycklar som matchar \"%s\"." -+msgstr "PGP-nycklar som matchar" - - #: crypt-gpgme.c:3587 --#, fuzzy - msgid "S/MIME keys matching" --msgstr "S/MIME-certifikat som matchar \"%s\"." -+msgstr "S/MIME-nycklar som matchar" - - #: crypt-gpgme.c:3589 --#, fuzzy - msgid "keys matching" --msgstr "PGP-nycklar som matchar \"%s\"." -+msgstr "nycklar som matchar" - - #: crypt-gpgme.c:3592 - #, c-format - msgid "%s <%s>." --msgstr "" -+msgstr "%s <%s>." - - #: crypt-gpgme.c:3594 - #, c-format - msgid "%s \"%s\"." --msgstr "" -+msgstr "%s \"%s\"." - - #: crypt-gpgme.c:3621 pgpkey.c:600 - msgid "This key can't be used: expired/disabled/revoked." -@@ -1230,12 +1208,12 @@ msgstr "%s Vill du verkligen använda nyc - msgid "Looking for keys matching \"%s\"..." - msgstr "Söker efter nycklar som matchar \"%s\"..." - --#: crypt-gpgme.c:4002 pgp.c:1154 -+#: crypt-gpgme.c:4002 pgp.c:1162 - #, c-format - msgid "Use keyID = \"%s\" for %s?" - msgstr "Använd nyckel-ID = \"%s\" för %s?" - --#: crypt-gpgme.c:4038 pgp.c:1188 smime.c:665 smime.c:790 -+#: crypt-gpgme.c:4038 pgp.c:1196 smime.c:665 smime.c:790 - #, c-format - msgid "Enter keyID for %s: " - msgstr "Ange nyckel-ID för %s: " -@@ -1245,43 +1223,41 @@ msgid "" - "\n" - "Using GPGME backend, although no gpg-agent is running" - msgstr "" -+"\n" -+"Använder GPGME-backend, dock körs ingen gpg-agent" - - #: crypt-gpgme.c:4131 --#, fuzzy - msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear?" --msgstr "" --"S/MIME (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? " -+msgstr "S/MIME (k)ryptera, (s)ignera, signera s(o)m, (b)ägge, (p)gp eller " -+"(r)ensa?" - - #: crypt-gpgme.c:4132 --#, fuzzy - msgid "esabpfc" --msgstr "ksmobr" -+msgstr "ksobpr" - - #: crypt-gpgme.c:4135 --#, fuzzy - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear?" --msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? " -+msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)ägge, s/(m)ime eller " -+"(r)ensa?" - - #: crypt-gpgme.c:4136 --#, fuzzy - msgid "esabmfc" --msgstr "ksmobr" -+msgstr "ksobmr" - - #. 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:1571 smime.c:1990 - msgid "Sign as: " - msgstr "Signera som: " - - #: crypt-gpgme.c:4249 - msgid "Failed to verify sender" --msgstr "" -+msgstr "Misslyckades att verifiera sändare" - - #: crypt-gpgme.c:4252 --#, fuzzy - msgid "Failed to figure out sender" --msgstr "Misslyckades med att öpppna fil för att tolka huvuden." -+msgstr "Misslyckades att ta reda på sändare" - - #: crypt.c:69 - #, c-format -@@ -1308,7 +1284,7 @@ msgid "Message can't be sent inline. Re - msgstr "Meddelande kan inte skickas infogat. Återgå till att använda PGP/MIME?" - - #. abort --#: crypt.c:158 send.c:1444 -+#: crypt.c:158 send.c:1451 - msgid "Mail not sent." - msgstr "Brevet skickades inte." - -@@ -1377,10 +1353,9 @@ msgstr "" - - #: cryptglue.c:89 - msgid "\"crypt_use_gpgme\" set but not build with GPGME support." --msgstr "" -+msgstr "\"crypt_use_gpgme\" satt men inte byggd med GPGME-stöd." - - #: cryptglue.c:112 --#, fuzzy - msgid "Invoking S/MIME..." - msgstr "Startar S/MIME..." - -@@ -1539,90 +1514,89 @@ msgstr "Öppna brevlåda i skrivskyddat lä - msgid "Open mailbox" - msgstr "Öppna brevlåda" - --#: 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 är inte en brevlåda." - --#: curs_main.c:1180 -+#: curs_main.c:1188 - msgid "Exit Mutt without saving?" - msgstr "Avsluta Mutt utan att spara?" - --#: 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 "Trådning ej aktiverat." - --#: curs_main.c:1210 -+#: curs_main.c:1218 - msgid "Thread broken" --msgstr "" -+msgstr "Tråd bruten" - --#: curs_main.c:1232 -+#: curs_main.c:1240 - msgid "No Message-ID: header available to link thread" --msgstr "" -+msgstr "Inget Message-ID: huvud tillgängligt för att länka tråd" - --#: curs_main.c:1234 --#, fuzzy -+#: curs_main.c:1242 - msgid "First, please tag a message to be linked here" --msgstr "spara det här meddelandet för att skicka senare" -+msgstr "Var vänlig att först markera ett meddelande som ska länkas här" - --#: curs_main.c:1246 -+#: curs_main.c:1254 - msgid "Threads linked" --msgstr "" -+msgstr "Trådar länkade" - --#: curs_main.c:1249 -+#: curs_main.c:1257 - msgid "No thread linked" --msgstr "" -+msgstr "Ingen tråd länkad" - --#: curs_main.c:1285 curs_main.c:1310 -+#: curs_main.c:1293 curs_main.c:1318 - msgid "You are on the last message." - msgstr "Du är på det sista meddelandet." - --#: curs_main.c:1292 curs_main.c:1336 -+#: curs_main.c:1300 curs_main.c:1344 - msgid "No undeleted messages." - msgstr "Inga återställda meddelanden." - --#: curs_main.c:1329 curs_main.c:1353 -+#: curs_main.c:1337 curs_main.c:1361 - msgid "You are on the first message." - msgstr "Du är på det första meddelandet." - --#: curs_main.c:1428 pattern.c:1361 -+#: curs_main.c:1436 pattern.c:1366 - msgid "Search wrapped to top." - msgstr "Sökning fortsatte från början." - --#: curs_main.c:1437 pattern.c:1372 -+#: curs_main.c:1445 pattern.c:1377 - msgid "Search wrapped to bottom." - msgstr "Sökning fortsatte från slutet." - --#: curs_main.c:1478 -+#: curs_main.c:1486 - msgid "No new messages" - msgstr "Inga nya meddelanden" - --#: curs_main.c:1478 -+#: curs_main.c:1486 - msgid "No unread messages" - msgstr "Inga olästa meddelanden" - --#: curs_main.c:1479 -+#: curs_main.c:1487 - msgid " in this limited view" - msgstr " i den här begränsade vyn" - --#: curs_main.c:1500 pager.c:2403 -+#: curs_main.c:1508 pager.c:2403 - msgid "Can't change 'important' flag on POP server." - msgstr "Kan inte ändra \"viktigt\"-flaggan på POP-servern." - --#: curs_main.c:1624 -+#: curs_main.c:1632 - msgid "No more threads." - msgstr "Inga fler trådar." - --#: curs_main.c:1626 -+#: curs_main.c:1634 - msgid "You are on the first thread." - msgstr "Du är på den första tråden." - --#: curs_main.c:1710 -+#: curs_main.c:1718 - msgid "Thread contains unread messages." - msgstr "Tråden innehåller olästa meddelanden." - --#: curs_main.c:1897 -+#: curs_main.c:1905 - msgid "Can't edit message on POP server." - msgstr "Kan inte redigera meddelande på POP-servern." - -@@ -1641,6 +1615,19 @@ msgid "" - "~m messages\tinclude and quote messages\n" - "~M messages\tsame as ~m, except include headers\n" - "~p\t\tprint the message\n" -+msgstr "" -+"~~\t\tinfoga en rad som börjar med ett ~\n" -+"~b adresser\tlägg till adresser till Bcc:-fältet\n" -+"~c adresser\tlägg till adresser till Cc:-fältet\n" -+"~f meddelanden\tbifoga meddelanden\n" -+"~F meddelanden\tsamma som ~f, fast inkludera även huvuden\n" -+"~h\t\tredigera meddelandehuvudet\n" -+"~m meddelanden\tinkludera och citera meddelanden\n" -+"~M meddelanden\tsamma som ~m, fast inkludera huvuden\n" -+"~p\t\tskriv ut meddelandet\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" -@@ -1651,15 +1638,6 @@ msgid "" - "~?\t\tthis message\n" - ".\t\ton a line by itself ends input\n" - msgstr "" --"~~\t\tinfoga en rad som börjar med ett ~\n" --"~b adresser\tlägg till adresser till Bcc:-fältet\n" --"~c adresser\tlägg till adresser till Cc:-fältet\n" --"~f meddelanden\tbifoga meddelanden\n" --"~F meddelanden\tsamma som ~f, fast även inkludera huvuden\n" --"~h\t\tredigera meddelandehuvudet\n" --"~m meddelanden\tinkludera och citera meddelanden\n" --"~M meddelanden\tsamma som ~m, fast inkludera huvuden\n" --"~p\t\tskriv ut meddelandet\n" - "~q\t\tskriv fil och avsluta redigerare\n" - "~r fil\tläs in en fil till redigeraren\n" - "~t adresser\tlägg till adresser till To:-fältet\n" -@@ -1670,41 +1648,41 @@ msgstr "" - "~?\t\tdet här meddelandet\n" - ".\t\tensam på en rad avslutar inmatning\n" - --#: edit.c:186 -+#: edit.c:188 - #, c-format - msgid "%d: invalid message number.\n" - msgstr "%d: ogiltigt meddelandenummer.\n" - --#: edit.c:328 -+#: edit.c:330 - msgid "(End message with a . on a line by itself)\n" - msgstr "(Avsluta meddelande med en . på en egen rad)\n" - --#: edit.c:386 -+#: edit.c:389 - msgid "No mailbox.\n" - msgstr "Ingen brevlåda.\n" - --#: edit.c:390 -+#: edit.c:393 - msgid "Message contains:\n" - msgstr "Meddelande innehåller:\n" - --#: edit.c:394 edit.c:451 -+#: edit.c:397 edit.c:454 - msgid "(continue)\n" - msgstr "(fortsätt)\n" - --#: edit.c:407 -+#: edit.c:410 - msgid "missing filename.\n" - msgstr "saknar filnamn.\n" - --#: edit.c:427 -+#: edit.c:430 - msgid "No lines in message.\n" - msgstr "Inga rader i meddelandet.\n" - --#: edit.c:444 -+#: edit.c:447 - #, c-format - msgid "Bad IDN in %s: '%s'\n" - msgstr "Dåligt IDN i %s: \"%s\"\n" - --#: edit.c:462 -+#: edit.c:465 - #, c-format - msgid "%s: unknown editor command (~? for help)\n" - msgstr "%s: okänt redigeringskommando (~? för hjälp)\n" -@@ -2030,7 +2008,7 @@ msgstr "Den här IMAP-servern är uråldrig - - #: imap/imap.c:422 - msgid "Checking mailbox subscriptions" --msgstr "" -+msgstr "Kollar brevlådepremunerationer" - - #: imap/imap.c:460 pop_lib.c:286 - msgid "Secure connection with TLS?" -@@ -2042,7 +2020,7 @@ msgstr "Kunde inte förhandla fram TLS-an - - #: imap/imap.c:489 pop_lib.c:331 - msgid "Encrypted connection unavailable" --msgstr "" -+msgstr "Krypterad anslutning otillgänglig" - - #: imap/imap.c:618 - #, c-format -@@ -2084,21 +2062,21 @@ msgstr "imap_sync_mailbox: EXPUNGE missl - msgid "CLOSE failed" - msgstr "CLOSE misslyckades" - --#: imap/imap.c:1388 -+#: imap/imap.c:1387 - #, c-format - msgid "Header search without header name: %s" --msgstr "" -+msgstr "Huvudsökning utan huvudnamn: %s" - --#: imap/imap.c:1536 -+#: imap/imap.c:1535 - msgid "Bad mailbox name" - msgstr "Dåligt namn på brevlåda" - --#: imap/imap.c:1559 -+#: imap/imap.c:1558 - #, c-format - msgid "Subscribing to %s..." - msgstr "Prenumererar på %s..." - --#: imap/imap.c:1561 -+#: imap/imap.c:1560 - #, c-format - msgid "Unsubscribing to %s..." - msgstr "Avslutar prenumeration på %s..." -@@ -2132,9 +2110,8 @@ msgid "The message index is incorrect. T - msgstr "Brevindexet är fel. Försök att öppna brevlådan igen." - - #: imap/message.c:548 --#, fuzzy - msgid "Uploading message..." --msgstr "Laddar upp meddelande ..." -+msgstr "Laddar upp meddelande..." - - #: imap/message.c:708 - #, c-format -@@ -2150,127 +2127,132 @@ msgstr "Kopierar meddelande %d till %s.. - msgid "Continue?" - msgstr "Fortsätt?" - --#: init.c:427 -+#: init.c:57 init.c:1277 pager.c:57 -+#, c-format -+msgid "Not available in this menu." -+msgstr "Inte tillgänglig i den här menyn." -+ -+#: init.c:438 - #, c-format - msgid "Bad regexp: %s" - msgstr "Dåligt reguljärt uttryck: %s" - --#: init.c:686 -+#: init.c:697 - msgid "spam: no matching pattern" - msgstr "spam: inget matchande mönster" - --#: init.c:688 -+#: init.c:699 - msgid "nospam: no matching pattern" - msgstr "nospam: inget matchande mönster" - --#: init.c:891 -+#: init.c:902 - msgid "alias: no address" - msgstr "alias: ingen adress" - --#: init.c:936 -+#: init.c:947 - #, c-format - msgid "Warning: Bad IDN '%s' in alias '%s'.\n" - msgstr "Varning: Dåligt IDN \"%s\" i alias \"%s\".\n" - --#: init.c:1014 -+#: init.c:1026 - msgid "invalid header field" - msgstr "ogiltigt huvudfält" - --#: init.c:1067 -+#: init.c:1079 - #, c-format - msgid "%s: unknown sorting method" - msgstr "%s: okänd sorteringsmetod" - --#: init.c:1177 -+#: init.c:1189 - #, c-format - msgid "mutt_restore_default(%s): error in regexp: %s\n" - msgstr "mutt_restore_default(%s): fel i reguljärt uttryck: %s\n" - --#: init.c:1242 -+#: init.c:1254 - #, c-format - msgid "%s: unknown variable" - msgstr "%s: okänd variabel" - --#: init.c:1251 -+#: init.c:1263 - #, c-format - msgid "prefix is illegal with reset" - msgstr "prefix är otillåtet med \"reset\"" - --#: init.c:1257 -+#: init.c:1269 - #, c-format - msgid "value is illegal with reset" - msgstr "värde är otillåtet med \"reset\"" - --#: init.c:1296 -+#: init.c:1322 - #, c-format - msgid "%s is set" - msgstr "%s är satt" - --#: init.c:1296 -+#: init.c:1322 - #, c-format - msgid "%s is unset" - msgstr "%s är inte satt" - --#: init.c:1486 -+#: init.c:1517 - #, c-format - msgid "%s: invalid mailbox type" - msgstr "%s: ogiltig typ av brevlåda" - --#: init.c:1511 init.c:1556 -+#: init.c:1543 init.c:1589 - #, c-format - msgid "%s: invalid value" - msgstr "%s: ogiltigt värde" - --#: init.c:1597 -+#: init.c:1630 - #, c-format - msgid "%s: Unknown type." - msgstr "%s: Okänd typ." - --#: init.c:1623 -+#: init.c:1657 - #, c-format - msgid "%s: unknown type" - msgstr "%s: okänd typ" - --#: init.c:1682 -+#: init.c:1716 - #, c-format - msgid "Error in %s, line %d: %s" - msgstr "Fel i %s, rad %d: %s" - - #. the muttrc source keyword --#: init.c:1705 -+#: init.c:1739 - #, c-format - msgid "source: errors in %s" - msgstr "source: fel i %s" - --#: init.c:1706 -+#: init.c:1740 - #, c-format - msgid "source: reading aborted due too many errors in %s" - msgstr "source: läsningen avbruten pga för många fel i %s" - --#: init.c:1720 -+#: init.c:1754 - #, c-format - msgid "source: error at %s" - msgstr "source: fel vid %s" - --#: init.c:1725 -+#: init.c:1759 - msgid "source: too many arguments" - msgstr "source: för många parametrar" - --#: init.c:1776 -+#: init.c:1810 - #, c-format - msgid "%s: unknown command" - msgstr "%s: okänt kommando" - --#: init.c:2220 -+#: init.c:2258 - #, c-format - msgid "Error in command line: %s\n" - msgstr "Fel i kommandorad: %s\n" - --#: init.c:2270 -+#: init.c:2308 - msgid "unable to determine home directory" - msgstr "kunde inte avgöra hemkatalog" - --#: init.c:2278 -+#: init.c:2316 - msgid "unable to determine username" - msgstr "kunde inte avgöra användarnamn" - -@@ -2729,7 +2711,7 @@ msgstr "komponera ett nytt brevmeddeland - - #: keymap_alldefs.h:103 - msgid "break the thread in two" --msgstr "" -+msgstr "dela tråden i två" - - #: keymap_alldefs.h:104 - msgid "open a different folder" -@@ -2768,9 +2750,8 @@ msgid "show only messages matching a pat - msgstr "visa endast meddelanden som matchar ett mönster" - - #: keymap_alldefs.h:113 --#, fuzzy - msgid "link tagged message to the current one" --msgstr "Återsänd märkta meddelanden till: " -+msgstr "länka markerade meddelande till det aktuella" - - #: keymap_alldefs.h:114 - msgid "jump to the next new message" -@@ -3135,26 +3116,25 @@ msgstr "Slut på minne!" - #: main.c:59 - msgid "" - "To contact the developers, please mail to .\n" --"To report a bug, please use the flea(1) utility.\n" -+"To report a bug, please visit http://bugs.mutt.org/.\n" - msgstr "" --"För att kontakta utvecklarna, var vänlig skicka brev till .\n" --"För att rapportera ett fel, var vänlig använd verktyget flea(1).\n" -+"För att kontakta utvecklarna, var vänlig skicka brev till " -+".\n" -+"För att rapportera ett fel, var vänlig besök 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 "" --"Upphovsrätt (C) 1996-2001 Michael R. Elkins med fler.\n" -+"Upphovsrätt (C) 1996-2005 Michael R. Elkins med fler.\n" - "Mutt levereras HELT UTAN GARANTI; för detaljer kör `mutt -vv'.\n" - "Mutt är fri mjukvara, och du är välkommen att sprida det vidare\n" - "under vissa villkor; kör `mutt -vv' för detaljer.\n" - - #: main.c:69 --#, fuzzy - msgid "" - "Copyright (C) 1996-2004 Michael R. Elkins \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3164,9 +3144,21 @@ msgid "" - "Copyright (C) 1999-2002 Tommi Komulainen \n" - "Copyright (C) 2000-2002 Edmund Grimley Evans \n" - "\n" --"Lots of others not mentioned here contributed lots of code,\n" --"fixes, and suggestions.\n" -+"Many others not mentioned here contributed code, fixes,\n" -+"and suggestions.\n" -+msgstr "" -+"Upphovsrätt (C) 1996-2004 Michael R. Elkins \n" -+"Upphovsrätt (C) 1996-2002 Brandon Long \n" -+"Upphovsrätt (C) 1997-2005 Thomas Roessler \n" -+"Upphovsrätt (C) 1998-2005 Werner Koch \n" -+"Upphovsrätt (C) 1999-2005 Brendan Cully \n" -+"Upphovsrätt (C) 1999-2002 Tommi Komulainen \n" -+"Upphovsrätt (C) 2000-2002 Edmund Grimley Evans \n" - "\n" -+"Många ej nämnda personer har bidragit med kod, fixar och förslag.\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" -@@ -3176,21 +3168,7 @@ msgid "" - " 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" - msgstr "" --"Upphovsrätt (C) 1996-2002 Michael R. Elkins \n" --"Upphovsrätt (C) 1996-2002 Brandon Long \n" --"Upphovsrätt (C) 1997-2002 Thomas Roessler \n" --"Upphovsrätt (C) 1998-2002 Werner Koch \n" --"Upphovsrätt (C) 1999-2002 Brendan Cully \n" --"Upphovsrätt (C) 1999-2002 Tommi Komulainen \n" --"Upphovsrätt (C) 2000-2002 Edmund Grimley Evans \n" --"\n" --"Många ej nämnda personer har bidragit med kod, fixar och förslag.\n" --"\n" - " Följande text är en informell översättning som enbart tillhandahålls i\n" - " informativt syfte. För alla juridiska tolkningar gäller den engelska\n" - " originaltexten.\n" -@@ -3204,13 +3182,19 @@ msgstr "" - " UTAN NÅGON SOM HELST GARANTI, även utan underförstådd garanti om\n" - " SÄLJBARHET eller LÄMPLIGHET FÖR NÅGOT SPECIELLT ÄNDAMÅL. Se GNU\n" - " General Public License för ytterligare information.\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 "" - " Du bör ha fått en kopia av GNU General Public License\n" - " tillsammans med detta program. Om inte, skriv till Free Software \n" --" Foundation,Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, " --"USA.\n" -+" Foundation,Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, ""USA.\n" - --#: main.c:107 --#, fuzzy -+#: main.c:108 - msgid "" - "usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3223,15 +3207,8 @@ msgid "" - "[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" --"\n" --"options:\n" --" -A \texpand the given alias\n" --" -a \tattach a file to the message\n" --" -b
\tspecify a blind carbon-copy (BCC) address\n" --" -c
\tspecify a carbon-copy (CC) address\n" --" -D\t\tprint the value of all variables to stdout" - msgstr "" --"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " -+"användning: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" - " mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q " - " ] [...]\n" -@@ -3241,38 +3218,28 @@ msgstr "" - "[ -i ] [ -s <ämne> ] [ -b ] [ -c ] [ ... ]\n" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" --"\n" -+ -+#: main.c:116 -+msgid "" -+"options:\n" -+" -A \texpand the given alias\n" -+" -a \tattach a file to the message\n" -+" -b
\tspecify a blind carbon-copy (BCC) address\n" -+" -c
\tspecify a carbon-copy (CC) address\n" -+" -D\t\tprint the value of all variables to stdout" -+msgstr "" - "options:\n" - " -A \texpandera det givna aliaset\n" - " -a \tbifoga en fil till meddelandet\n" - " -b \tange en \"blind carbon-copy\" (BCC) adress\n" - " -c \tange en \"carbon-copy\" (CC) adress\n" --" -e \tange ett kommando som ska köras efter initiering\n" --" -f \tange vilken brevlåda som ska läsas\n" --" -F \tange en alternativ muttrc-fil\n" --" -H \tange en filmall att läsa huvud från\n" --" -i \tange en fil som Mutt ska inkludera i svaret\n" --" -m \tange standardtyp för brevlådan\n" --" -n\t\tgör så att Mutt inte läser systemets Muttrc\n" --" -p\t\tåterkalla ett uppskjutet meddelande\n" --" -Q \tundersök värdet på en konfigurationsvariabel\n" --" -R\t\töppna brevlåda i skrivskyddat läge\n" --" -s <ämne>\tange ett ämne (måste vara inom citationstecken om det " --"innehåller blanksteg)\n" --" -v\t\tvisa version och definitioner vid kompileringen\n" --" -x\t\tsimulera mailx's sändläge\n" --" -y\t\tvälj en brevlåda specifierad i din \"mailboxes\"-lista\n" --" -z\t\tavsluta omedelbart om det inte finns några meddelanden i brevlådan\n" --" -Z\t\töppna den första foldern med ett nytt meddelande, avsluta omedelbart " --"om inget finns\n" --" -h\t\tden här hjälptexten" -+" -D\t\tskriv ut värdet på alla variabler på stdout" - --#: main.c:122 -+#: main.c:124 - msgid " -d \tlog debugging output to ~/.muttdebug0" --msgstr "" -+msgstr " -d \tlogga debug-utskrifter till ~/.muttdebug0" - --#: main.c:125 --#, fuzzy -+#: main.c:127 - msgid "" - " -e \tspecify a command to be executed after initialization\n" - " -f \tspecify which mailbox to read\n" -@@ -3281,7 +3248,19 @@ msgid "" - " -i \tspecify a file which Mutt should include in the body\n" - " -m \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 \tange ett kommando som ska köras efter initiering\n" -+" -f \tange vilken brevlåda som ska läsas\n" -+" -F \tange en alternativ muttrc-fil\n" -+" -H \tange en filmall att läsa huvud från\n" -+" -i \tange en fil som Mutt ska inkludera i svaret\n" -+" -m \tange standardtyp för brevlådan\n" -+" -n\t\tgör så att Mutt inte läser systemets Muttrc\n" -+" -p\t\tåterkalla ett uppskjutet meddelande" -+ -+#: main.c:136 -+msgid "" - " -Q \tquery a configuration variable\n" - " -R\t\topen mailbox in read-only mode\n" - " -s \tspecify a subject (must be in quotes if it has spaces)\n" -@@ -3292,30 +3271,6 @@ msgid "" - " -Z\t\topen the first folder with new message, exit immediately if none\n" - " -h\t\tthis help message" - msgstr "" --"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " --" ]\n" --" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q " --" ] [...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " --"[...]\n" --" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " --"[ -i ] [ -s <ämne> ] [ -b ] [ -c ] [ ... ]\n" --" mutt [ -n ] [ -e ] [ -F ] -p\n" --" mutt -v[v]\n" --"\n" --"options:\n" --" -A \texpandera det givna aliaset\n" --" -a \tbifoga en fil till meddelandet\n" --" -b \tange en \"blind carbon-copy\" (BCC) adress\n" --" -c \tange en \"carbon-copy\" (CC) adress\n" --" -e \tange ett kommando som ska köras efter initiering\n" --" -f \tange vilken brevlåda som ska läsas\n" --" -F \tange en alternativ muttrc-fil\n" --" -H \tange en filmall att läsa huvud från\n" --" -i \tange en fil som Mutt ska inkludera i svaret\n" --" -m \tange standardtyp för brevlådan\n" --" -n\t\tgör så att Mutt inte läser systemets Muttrc\n" --" -p\t\tåterkalla ett uppskjutet meddelande\n" - " -Q \tundersök värdet på en konfigurationsvariabel\n" - " -R\t\töppna brevlåda i skrivskyddat läge\n" - " -s <ämne>\tange ett ämne (måste vara inom citationstecken om det " -@@ -3328,7 +3283,7 @@ msgstr "" - "om inget finns\n" - " -h\t\tden här hjälptexten" - --#: main.c:181 -+#: main.c:185 - msgid "" - "\n" - "Compile options:" -@@ -3336,47 +3291,47 @@ msgstr "" - "\n" - "Kompileringsval:" - --#: main.c:487 -+#: main.c:494 - msgid "Error initializing terminal." - msgstr "Fel vid initiering av terminalen." - --#: main.c:597 -+#: main.c:604 - #, c-format - msgid "Debugging at level %d.\n" - msgstr "Avlusning på nivå %d.\n" - --#: main.c:599 -+#: main.c:606 - msgid "DEBUG was not defined during compilation. Ignored.\n" - msgstr "DEBUG var inte valt vid kompilering. Ignoreras.\n" - --#: main.c:749 -+#: main.c:758 - #, c-format - msgid "%s does not exist. Create it?" - msgstr "%s finns inte. Skapa den?" - --#: main.c:753 -+#: main.c:762 - #, c-format - msgid "Can't create %s: %s." - msgstr "Kan inte skapa %s: %s." - --#: main.c:798 -+#: main.c:807 - msgid "No recipients specified.\n" - msgstr "Inga mottagare angivna.\n" - --#: main.c:884 -+#: main.c:893 - #, c-format - msgid "%s: unable to attach file.\n" - msgstr "%s: kunde inte bifoga fil.\n" - --#: main.c:904 -+#: main.c:913 - msgid "No mailbox with new mail." - msgstr "Ingen brevlåda med nya brev." - --#: main.c:913 -+#: main.c:922 - msgid "No incoming mailboxes defined." - msgstr "Inga inkommande brevlådor definierade." - --#: main.c:941 -+#: main.c:950 - msgid "Mailbox is empty." - msgstr "Brevlådan är tom." - -@@ -3473,19 +3428,19 @@ msgstr "Du är på den sista posten." - msgid "You are on the first entry." - msgstr "Du är på den första posten." - --#: menu.c:718 pattern.c:1303 -+#: menu.c:718 pattern.c:1308 - msgid "Search for: " - msgstr "Sök efter: " - --#: menu.c:719 pattern.c:1304 -+#: menu.c:719 pattern.c:1309 - msgid "Reverse search for: " - msgstr "Sök i omvänd ordning efter: " - --#: menu.c:729 pattern.c:1336 -+#: menu.c:729 pattern.c:1341 - msgid "No search pattern." - msgstr "Inget sökmönster." - --#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1405 -+#: menu.c:759 pager.c:1980 pager.c:1996 pager.c:2104 pattern.c:1410 - msgid "Not found." - msgstr "Hittades inte." - -@@ -3673,89 +3628,82 @@ msgstr "Certifikat sparat" - - #: mutt_ssl_gnutls.c:95 mutt_ssl_gnutls.c:117 - msgid "Error: no TLS socket open" --msgstr "" -+msgstr "Fel: ingen TLS-socket öppen" - - #: mutt_ssl_gnutls.c:204 - msgid "All available protocols for TLS/SSL connection disabled" --msgstr "" -+msgstr "Alla tillgängliga protokoll för TLS/SSL-anslutning inaktiverade" - - #: mutt_ssl_gnutls.c:265 --#, fuzzy, c-format -+#, c-format - msgid "SSL/TLS connection using %s (%s/%s/%s)" --msgstr "SSL-anslutning använder %s (%s)" -+msgstr "SSL/TLS-anslutning använder %s (%s/%s/%s)" - - #: mutt_ssl_gnutls.c:508 - #, c-format - msgid "Certificate verification error (%s)" --msgstr "" -+msgstr "Certifikatverifieringsfel (%s)" - - #: mutt_ssl_gnutls.c:516 --#, fuzzy - msgid "Certificate is not X.509" --msgstr "Certifikat sparat" -+msgstr "Certifikat är inte X.509" - - #: mutt_ssl_gnutls.c:523 --#, fuzzy - msgid "Error initialising gnutls certificate data" --msgstr "Fel vid initiering av terminalen." -+msgstr "Fel vid initiering av gnutls certifikatdata" - - #: mutt_ssl_gnutls.c:539 - msgid "Error processing certificate data" --msgstr "" -+msgstr "Fel vid bearbeting av certifikatdata" - - #: mutt_ssl_gnutls.c:724 --#, fuzzy, c-format -+#, c-format - msgid "SHA1 Fingerprint: %s" --msgstr "Fingeravtryck: %s" -+msgstr "SHA1 Fingeravtryck: %s" - - #: mutt_ssl_gnutls.c:727 --#, fuzzy, c-format -+#, c-format - msgid "MD5 Fingerprint: %s" --msgstr "Fingeravtryck: %s" -+msgstr "MD5 Fingeravtryck: %s" - - #: mutt_ssl_gnutls.c:732 --#, fuzzy - msgid "WARNING: Server certificate is not yet valid" --msgstr "Servercertifikat är inte giltigt än" -+msgstr "VARNING: Servercertifikat är inte giltigt än" - - #: mutt_ssl_gnutls.c:737 --#, fuzzy - msgid "WARNING: Server certificate has expired" --msgstr "Serverertifikat har utgått" -+msgstr "VARNING: Servercertifikat har utgått" - - #: mutt_ssl_gnutls.c:742 --#, fuzzy - msgid "WARNING: Server certificate has been revoked" --msgstr "Serverertifikat har utgått" -+msgstr "VARNING: Servercertifikat har återkallats" - - #: mutt_ssl_gnutls.c:747 - msgid "WARNING: Server hostname does not match certificate" --msgstr "" -+msgstr "VARNING: Servervärdnamnet matchar inte certifikat" - - #: mutt_ssl_gnutls.c:752 --#, fuzzy - msgid "WARNING: Signer of server certificate is not a CA" --msgstr "Servercertifikat är inte giltigt än" -+msgstr "VARNING: Signerare av servercertifikat är inte en CA" - - #: mutt_ssl_gnutls.c:755 --#, fuzzy - msgid "TLS/SSL Certificate check" --msgstr "Kontroll av SSL-certifikat" -+msgstr "Kontroll av TLS/SSL-certifikat" - - #: mutt_tunnel.c:70 --#, fuzzy, c-format -+#, c-format - msgid "Connecting with \"%s\"..." --msgstr "Ansluter till %s..." -+msgstr "Ansluter med \"%s\"..." - - #: mutt_tunnel.c:137 - #, c-format - msgid "Tunnel to %s returned error %d (%s)" --msgstr "" -+msgstr "Tunnel till %s returnerade fel %d (%s)" - - #: mutt_tunnel.c:155 mutt_tunnel.c:171 --#, fuzzy, c-format -+#, c-format - msgid "Tunnel error talking to %s: %s" --msgstr "Fel uppstod vid förbindelsen till %s (%s)" -+msgstr "Tunnelfel vid förbindelsen till %s: %s" - - #: muttlib.c:910 - msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]" -@@ -3903,10 +3851,6 @@ msgstr "Kan inte skriva meddelande" - msgid "Integer overflow -- can't allocate memory." - msgstr "Heltalsöverflödning -- kan inte allokera minne." - --#: pager.c:57 --msgid "Not available in this menu." --msgstr "Inte tillgänglig i den här menyn." -- - #: pager.c:1484 - msgid "PrevPg" - msgstr "Föreg. sida" -@@ -3961,81 +3905,86 @@ msgstr "\"multipart\"-meddelande har ing - msgid "Error in expression: %s" - msgstr "Fel i uttryck: %s" - --#: pattern.c:389 -+#: pattern.c:268 -+#, c-format -+msgid "Empty expression" -+msgstr "Tomt uttryck" -+ -+#: pattern.c:394 - #, c-format - msgid "Invalid day of month: %s" - msgstr "Ogiltig dag i månaden: %s" - --#: pattern.c:403 -+#: pattern.c:408 - #, c-format - msgid "Invalid month: %s" - msgstr "Ogiltig månad: %s" - - #. getDate has its own error message, don't overwrite it here --#: pattern.c:555 -+#: pattern.c:560 - #, c-format - msgid "Invalid relative date: %s" - msgstr "Ogiltigt relativt datum: %s" - --#: pattern.c:569 -+#: pattern.c:574 - msgid "error in expression" - msgstr "fel i uttryck" - --#: pattern.c:784 pattern.c:894 -+#: pattern.c:789 pattern.c:899 - #, c-format - msgid "error in pattern at: %s" - msgstr "fel i mönster vid: %s" - --#: pattern.c:834 -+#: pattern.c:839 - #, c-format - msgid "%c: invalid command" - msgstr "%c: ogiltigt kommando" - --#: pattern.c:840 -+#: pattern.c:845 - #, c-format - msgid "%c: not supported in this mode" - msgstr "%c: stöds inte i det här läget" - --#: pattern.c:853 -+#: pattern.c:858 - #, c-format - msgid "missing parameter" - msgstr "saknar parameter" - --#: pattern.c:869 -+#: pattern.c:874 - #, c-format - msgid "mismatched parenthesis: %s" - msgstr "missmatchande parentes: %s" - --#: pattern.c:901 -+#: pattern.c:906 - msgid "empty pattern" - msgstr "tomt mönster" - --#: pattern.c:1117 -+#: pattern.c:1122 - #, c-format - msgid "error: unknown op %d (report this error)." - msgstr "fel: okänd operation %d (rapportera det här felet)." - --#: pattern.c:1193 pattern.c:1322 -+#: pattern.c:1198 pattern.c:1327 - msgid "Compiling search pattern..." - msgstr "Kompilerar sökmönster..." - --#: pattern.c:1212 -+#: pattern.c:1217 - msgid "Executing command on matching messages..." - msgstr "Kör kommando på matchande meddelanden..." - --#: pattern.c:1275 -+#: pattern.c:1280 - msgid "No messages matched criteria." - msgstr "Inga meddelanden matchade kriteriet." - --#: pattern.c:1364 -+#: pattern.c:1369 - msgid "Search hit bottom without finding match" - msgstr "Sökning nådde slutet utan att hitta träff" - --#: pattern.c:1375 -+#: pattern.c:1380 - msgid "Search hit top without finding match" - msgstr "Sökning nådde början utan att hitta träff" - --#: pattern.c:1397 -+#: pattern.c:1402 - msgid "Search interrupted." - msgstr "Sökning avbruten." - -@@ -4047,11 +3996,11 @@ msgstr "Mata in PGP-lösenfras:" - msgid "PGP passphrase forgotten." - msgstr "PGP-lösenfras glömd." - --#: pgp.c:345 -+#: pgp.c:353 - msgid "[-- Error: unable to create PGP subprocess! --]\n" - msgstr "[-- Fel: kunde inte skapa PGP-underprocess! --]\n" - --#: pgp.c:379 pgp.c:620 pgp.c:824 -+#: pgp.c:387 pgp.c:628 pgp.c:832 - msgid "" - "[-- End of PGP output --]\n" - "\n" -@@ -4059,22 +4008,20 @@ msgstr "" - "[-- Slut på PGP-utdata --]\n" - "\n" - --#: pgp.c:392 pgp.c:956 --#, fuzzy -+#: pgp.c:400 pgp.c:964 - msgid "Could not decrypt PGP message" --msgstr "Kunde inte kopiera meddelande" -+msgstr "Kunde inte avkryptera PGP-meddelande" - - #. clear 'Invoking...' message, since there's no error --#: pgp.c:441 pgp.c:952 --#, fuzzy -+#: pgp.c:449 pgp.c:960 - msgid "PGP message successfully decrypted." --msgstr "PGP-signaturen verifierades framgångsrikt." -+msgstr "PGP-meddelande avkrypterades framgångsrikt." - --#: pgp.c:728 -+#: pgp.c:736 - msgid "Internal error. Inform ." - msgstr "Internt fel. Informera ." - --#: pgp.c:789 -+#: pgp.c:797 - msgid "" - "[-- Error: could not create a PGP subprocess! --]\n" - "\n" -@@ -4082,33 +4029,32 @@ msgstr "" - "[-- Fel: kunde inte skapa en PGP-underprocess! --]\n" - "\n" - --#: pgp.c:833 --#, fuzzy -+#: pgp.c:841 - msgid "Decryption failed" --msgstr "Avkryptering misslyckades." -+msgstr "Avkryptering misslyckades" - --#: pgp.c:1008 -+#: pgp.c:1016 - msgid "Can't open PGP subprocess!" - msgstr "Kan inte öppna PGP-underprocess!" - --#: pgp.c:1444 -+#: pgp.c:1452 - msgid "Can't invoke PGP" - msgstr "Kan inte starta PGP" - --#: pgp.c:1545 -+#: pgp.c:1553 - #, c-format - msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? " - msgstr "PGP (k)ryptera, (s)ignera, signera s(o)m, (b)åda %s, eller (r)ensa? " - --#: pgp.c:1546 -+#: pgp.c:1554 - msgid "PGP/M(i)ME" - msgstr "PGP/M(i)ME" - --#: pgp.c:1546 -+#: pgp.c:1554 - msgid "(i)nline" - msgstr "(i)nfogat" - --#: pgp.c:1548 -+#: pgp.c:1556 - msgid "esabifc" - msgstr "ksobir" - -@@ -4413,7 +4359,7 @@ msgstr "Kan inte skapa %s." - msgid "Can't find any tagged messages." - msgstr "Kan inte hitta några märkta meddelanden." - --#: recvcmd.c:749 send.c:715 -+#: recvcmd.c:749 send.c:721 - msgid "No mailing lists found!" - msgstr "Inga sändlistor hittades!" - -@@ -4535,82 +4481,82 @@ msgstr "Svara till %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 "Inga märkta meddelanden är synliga!" - --#: send.c:741 -+#: send.c:747 - msgid "Include message in reply?" - msgstr "Inkludera meddelande i svar?" - --#: send.c:746 -+#: send.c:752 - msgid "Including quoted message..." - msgstr "Inkluderar citerat meddelande..." - --#: send.c:756 -+#: send.c:762 - msgid "Could not include all requested messages!" - msgstr "Kunde inte inkludera alla begärda meddelanden!" - --#: send.c:770 -+#: send.c:776 - msgid "Forward as attachment?" - msgstr "Vidarebefordra som bilaga?" - --#: send.c:774 -+#: send.c:780 - msgid "Preparing forwarded message..." - msgstr "Förbereder vidarebefordrat meddelande..." - - #. If the user is composing a new message, check to see if there - #. * are any postponed messages first. - #. --#: send.c:1071 -+#: send.c:1077 - msgid "Recall postponed message?" - msgstr "Återkalla uppskjutet meddelande?" - --#: send.c:1372 -+#: send.c:1379 - msgid "Edit forwarded message?" - msgstr "Redigera vidarebefordrat meddelande?" - --#: send.c:1400 -+#: send.c:1407 - msgid "Abort unmodified message?" - msgstr "Meddelandet har inte ändrats. Avbryt?" - --#: send.c:1402 -+#: send.c:1409 - msgid "Aborted unmodified message." - msgstr "Meddelandet har inte ändrats. Avbröt." - --#: send.c:1471 -+#: send.c:1478 - msgid "Message postponed." - msgstr "Meddelande uppskjutet." - --#: send.c:1480 -+#: send.c:1487 - msgid "No recipients are specified!" - msgstr "Inga mottagare är angivna!" - --#: send.c:1485 -+#: send.c:1492 - msgid "No recipients were specified." - msgstr "Inga mottagare blev angivna." - --#: send.c:1501 -+#: send.c:1508 - msgid "No subject, abort sending?" - msgstr "Inget ärende, avbryt sändning?" - --#: send.c:1505 -+#: send.c:1512 - msgid "No subject specified." - msgstr "Inget ärende angivet." - --#: send.c:1567 -+#: send.c:1574 - msgid "Sending message..." - msgstr "Skickar meddelande..." - --#: send.c:1708 -+#: send.c:1715 - msgid "Could not send the message." - msgstr "Kunde inte skicka meddelandet." - --#: send.c:1713 -+#: send.c:1720 - msgid "Mail sent." - msgstr "Brevet skickat." - --#: send.c:1713 -+#: send.c:1720 - msgid "Sending in background." - msgstr "Skickar i bakgrunden." - -@@ -4843,15 +4789,3 @@ msgstr "Första meddelandet är inte synli - #: thread.c:1095 - msgid "Parent message is not available." - msgstr "Första meddelandet är inte tillgängligt." -- --#~ msgid "First entry is shown." --#~ msgstr "Första posten visas." -- --#~ msgid "Last entry is shown." --#~ msgstr "Sista posten visas." -- --#~ msgid "Unexpected response received from server: %s" --#~ msgstr "Oväntat svar mottaget från server: %s" -- --#~ msgid "Unable to append to IMAP mailboxes at this server" --#~ msgstr "Kunde inte lägga till IMAP-brevlådor på den här servern." diff --git a/upstream/patches/cvs_2005-11-01 b/upstream/patches/cvs_2005-11-01 deleted file mode 100644 index 2f1f978..0000000 --- a/upstream/patches/cvs_2005-11-01 +++ /dev/null @@ -1,10996 +0,0 @@ -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) -+ -+ * menu.c: This should be a better patch for the menu break -+ dance. (#2019) -+ -+2005-10-31 11:56:58 Thomas Glanzmann (roessler) -+ -+ * imap/message.c: Fix 2119. -+ -+2005-10-31 10:51:54 Thomas Roessler (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) -+ -+ * 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 (roessler) -+ -+ * po/fr.po: update -+ -+2005-10-17 09:14:58 TAKAHASHI Tamotsu (roessler) -+ -+ * smime.c: Fix S/MIME algorithm choice. -+ -+2005-10-14 09:30:11 Thomas Roessler (roessler) -+ -+ * imap/imap.c: Fix imap/2112. -+ -+2005-10-10 18:26:31 Brendan Cully (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) -+ -+ * 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) -+ -+ * 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 (brendan) -+ -+ * smime.c: Add AES ciphers to S/MIME encryption options. Closes: -+ #2103. -+ -+2005-10-05 19:24:40 David Champion (brendan) -+ -+ * doc/manual.xml.head, init.c: Fix 'unattachments'. Closes: #2102. -+ -+2005-10-05 19:20:22 Jeff Ito (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) -+ -+ * 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 (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 (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 (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 (roessler) -+ -+ * curs_lib.c, send.c: fix a problem that appears with signatures -+ without newline. -+ -+2005-09-30 18:24:17 Brendan Cully (brendan) -+ -+ * doc/devel-notes.txt: Change manual.sgml to manual.xml (noted -+ by Alain Bench). -+ -+2005-09-30 01:42:50 Roland Rosenfeld (brendan) -+ -+ * po/de.po: Update. -+ -+2005-09-29 23:57:07 Vincent Lefevre (brendan) -+ -+ * po/fr.po: Update. -+ -+2005-09-29 23:52:16 pi (brendan) -+ -+ * configure.in, po/eu.po: Basque translation. -+ - 2005-09-29 23:02:49 Brendan Cully (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 --#else --#ifdef HAVE_NCURSES_H --#include -+#if HAVE_NCURSESW_NCURSES_H -+# include -+#elif HAVE_NCURSES_NCURSES_H -+# include -+#elif HAVE_NCURSES_H -+# include - #else --#include --#endif -+# include - #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 -+** 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 -+#include -+ -+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 - - - -+ -+Attachment Searching and Counting -+ -+ -+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. -+ -+ -+ -+The syntax is: -+ -+ -+attachments {+|-}disposition mime-type -+unattachments {+|-}disposition mime-type -+attachments ? -+ -+ -+ -+Disposition is the attachment's Content-disposition type -- either -+"inline" or "attachment". You can abbreviate this to I or A. -+ -+ -+ -+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. -+ -+ -+ -+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.) -+ -+ -+ -+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. -+ -+ -+ -+Some examples might help to illustrate. The examples that are not -+commented out define the default configuration of the lists. -+ -+ -+ -+## 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 -+ -+ -+ -+"attachments ?" will list your current settings in Muttrc format, so -+that it can be pasted elsewhere. -+ -+ -+ -+ - - MIME Lookup - -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 \n" - "Language-Team: German \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 ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3214,19 +3211,15 @@ msgid "" - " -c
\tspecify a carbon-copy (CC) address\n" - " -D\t\tprint the value of all variables to stdout" - msgstr "" --"usage: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " --" ]\n" --" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " --"[...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " --"[...]\n" --" mutt [ -nR ] [ -e ] [ -F ] -D\n" --" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " --"[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" --" mutt [ -n ] [ -e ] [ -F ] -p\n" --" mutt -v[v]\n" -+"Aufruf: mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f ]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] [...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] [...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -D\n" -+" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] [ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" -+" mutt [ -n ] [ -e ] [ -F ] -p\n" -+" mutt -v[v]\n" - "\n" --"options:\n" -+"Optionen:\n" - " -A \tExpandiere den angegebenen Alias\n" - " -a \tHängt Datei an die Message an\n" - " -b
\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 -+# Piarres Beobide Egaña , 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 \n" -+"Language-Team: 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 "" -+msgstr "" -+ -+#: 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 "" -+msgstr "" -+ -+#: 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 .\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 \n" -+"Copyright (C) 1996-2002 Brandon Long \n" -+"Copyright (C) 1997-2005 Thomas Roessler \n" -+"Copyright (C) 1998-2005 Werner Koch \n" -+"Copyright (C) 1999-2005 Brendan Cully \n" -+"Copyright (C) 1999-2002 Tommi Komulainen \n" -+"Copyright (C) 2000-2002 Edmund Grimley Evans \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 ] [ -F ] [ -m ] [ -f " -+" ]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -Q [ -Q ] " -+"[...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -A [ -A ] " -+"[...]\n" -+" mutt [ -nR ] [ -e ] [ -F ] -D\n" -+" mutt [ -nx ] [ -e ] [ -a ] [ -F ] [ -H ] " -+"[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" -+" mutt [ -n ] [ -e ] [ -F ] -p\n" -+" mutt -v[v]\n" -+msgstr "" -+ -+#: main.c:116 -+msgid "" -+"options:\n" -+" -A \texpand the given alias\n" -+" -a \tattach a file to the message\n" -+" -b
\tspecify a blind carbon-copy (BCC) address\n" -+" -c
\tspecify a carbon-copy (CC) address\n" -+" -D\t\tprint the value of all variables to stdout" -+msgstr "" -+ -+#: main.c:124 -+msgid " -d \tlog debugging output to ~/.muttdebug0" -+msgstr "" -+ -+#: main.c:127 -+msgid "" -+" -e \tspecify a command to be executed after initialization\n" -+" -f \tspecify which mailbox to read\n" -+" -F \tspecify an alternate muttrc file\n" -+" -H \tspecify a draft file to read header and body from\n" -+" -i \tspecify a file which Mutt should include in the body\n" -+" -m \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 \tquery a configuration variable\n" -+" -R\t\topen mailbox in read-only mode\n" -+" -s \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 ." -+msgstr "Barne arazoa. Berri eman ." -+ -+#: 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 \n" - "Language-Team: mutt-dev \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 "" -@@ -613,19 +613,19 @@ msgstr "" - - #: 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 "" -@@ -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 .\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 à .\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 \n" - "Copyright (C) 2000-2002 Edmund Grimley Evans \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 \n" - "Copyright (C) 1996-2002 Brandon Long \n" -@@ -3286,23 +3297,43 @@ msgstr "" - "Copyright (C) 2000-2002 Edmund Grimley Evans \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 ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3315,13 +3346,6 @@ msgid "" - "[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" --"\n" --"options:\n" --" -A \texpand the given alias\n" --" -a \tattach a file to the message\n" --" -b
\tspecify a blind carbon-copy (BCC) address\n" --" -c
\tspecify a carbon-copy (CC) address\n" --" -D\t\tprint the value of all variables to stdout" - msgstr "" - "usage : mutt [ -nRyzZ ] [ -e ] [ -F ] [ -m ] [ -f " - " ]\n" -@@ -3334,7 +3358,16 @@ msgstr "" - "[ -i ] [ -s ] [ -b ] [ -c ] [ ... ]\n" - " mutt [ -n ] [ -e ] [ -F ] -p\n" - " mutt -v[v]\n" --"\n" -+ -+#: main.c:116 -+msgid "" -+"options:\n" -+" -A \texpand the given alias\n" -+" -a \tattach a file to the message\n" -+" -b
\tspecify a blind carbon-copy (BCC) address\n" -+" -c
\tspecify a carbon-copy (CC) address\n" -+" -D\t\tprint the value of all variables to stdout" -+msgstr "" - "options :\n" - " -A \tdéveloppe l'alias mentionné\n" - " -a \tattache un fichier à ce message\n" -@@ -3342,11 +3375,11 @@ msgstr "" - " -c \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 \tlog debugging output to ~/.muttdebug0" - msgstr " -d \técrit les infos de débuggage dans ~/.muttdebug0" - --#: main.c:125 -+#: main.c:127 - msgid "" - " -e \tspecify a command to be executed after initialization\n" - " -f \tspecify which mailbox to read\n" -@@ -3355,7 +3388,19 @@ msgid "" - " -i \tspecify a file which Mutt should include in the body\n" - " -m \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 \tspécifie une commande à exécuter après l'initialisation\n" -+" -f \tspécifie quelle boîte aux lettres lire\n" -+" -F \tspécifie un fichier muttrc alternatif\n" -+" -H \tspécifie un fichier de brouillon d'où lire en-têtes et corps\n" -+" -i \tspécifie un fichier que Mutt doit inclure dans le corps\n" -+" -m \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 \tquery a configuration variable\n" - " -R\t\topen mailbox in read-only mode\n" - " -s \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 \tspécifie une commande à exécuter après l'initialisation\n" --" -f \tspécifie quelle boîte aux lettres lire\n" --" -F \tspécifie un fichier muttrc alternatif\n" --" -H \tspécifie un fichier de brouillon d'où lire en-têtes et corps\n" --" -i \tspécifie un fichier que Mutt doit inclure dans le corps\n" --" -m \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 \tdemande la valeur d'une variable de configuration\n" - " -R\t\touvre la boîte aux lettres en mode lecture seule\n" - " -s \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 ." - msgstr "Erreur interne. Veuillez avertir ." - --#: 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" diff --git a/upstream/patches/cvs_2005-11-24 b/upstream/patches/cvs_2005-11-24 deleted file mode 100644 index d246298..0000000 --- a/upstream/patches/cvs_2005-11-24 +++ /dev/null @@ -1,212 +0,0 @@ -Index: mutt/ChangeLog -=================================================================== -RCS file: /home/roessler/cvs/mutt/ChangeLog,v -retrieving revision 3.635 -retrieving revision 3.641 -diff -u -p -r3.635 -r3.641 ---- mutt/ChangeLog 1 Nov 2005 08:43:14 -0000 3.635 -+++ mutt/ChangeLog 24 Nov 2005 12:51:12 -0000 3.641 -@@ -1,3 +1,24 @@ -+2005-11-24 12:50:27 Thomas Roessler (roessler) -+ -+ * curs_main.c, pattern.c: mutt/2142 suggests that the change -+ from pattern.c,3.14 -> 3.15 causes inconsistency and confusion. -+ Reverting the change; adding a helpful message to the status line. -+ -+2005-11-22 12:31:58 Thomas Roessler (roessler) -+ -+ * pgp.c: Fix "mixed messages" about the success (or not) of -+ decrypting PGP messages. -+ -+ * handler.c: Actually, the previous fix for 2139 had a flaw. -+ -+ * handler.c: Fix mutt/2139; also Debian #340116. -+ -+2005-11-17 18:40:50 Thomas Roessler (roessler) -+ -+ * menu.c: a not entirely sane state of code. -+ -+ * menu.c: Another stab at #2019. -+ - 2005-11-01 08:42:00 Thomas Roessler (roessler) - - * menu.c: This should be a better patch for the menu break -Index: mutt/curs_main.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/curs_main.c,v -retrieving revision 3.34 -retrieving revision 3.35 -diff -u -p -r3.34 -r3.35 ---- mutt/curs_main.c 4 Oct 2005 04:29:09 -0000 3.34 -+++ mutt/curs_main.c 24 Nov 2005 12:50:27 -0000 3.35 -@@ -868,6 +868,8 @@ CHECK_IMAP_ACL(IMAP_ACL_DELETE); - mutt_draw_tree (Context); - menu->redraw = REDRAW_FULL; - } -+ if (Context->pattern) -+ mutt_message _("To view all messages, limit to \"all\"."); - break; - - case OP_QUIT: -Index: mutt/handler.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/handler.c,v -retrieving revision 3.23 -retrieving revision 3.25 -diff -u -p -r3.23 -r3.25 ---- mutt/handler.c 21 Oct 2005 04:35:37 -0000 3.23 -+++ mutt/handler.c 22 Nov 2005 12:21:14 -0000 3.25 -@@ -1754,16 +1754,16 @@ void mutt_decode_attachment (BODY *b, ST - switch (b->encoding) - { - case ENCQUOTEDPRINTABLE: -- mutt_decode_quoted (s, b->length, istext, cd); -+ mutt_decode_quoted (s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)), cd); - break; - case ENCBASE64: -- mutt_decode_base64 (s, b->length, istext, cd); -+ mutt_decode_base64 (s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)), cd); - break; - case ENCUUENCODED: -- mutt_decode_uuencoded (s, b->length, istext, cd); -+ mutt_decode_uuencoded (s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)), cd); - break; - default: -- mutt_decode_xbit (s, b->length, istext, cd); -+ mutt_decode_xbit (s, b->length, istext || ((WithCrypto & APPLICATION_PGP) && mutt_is_application_pgp (b)), cd); - break; - } - -Index: mutt/menu.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/menu.c,v -retrieving revision 3.23 -retrieving revision 3.25 -diff -u -p -r3.23 -r3.25 ---- mutt/menu.c 1 Nov 2005 08:42:00 -0000 3.23 -+++ mutt/menu.c 17 Nov 2005 18:40:50 -0000 3.25 -@@ -379,36 +379,27 @@ void menu_check_recenter (MUTTMENU *menu - - if (!option (OPTMENUMOVEOFF) && menu->max <= menu->pagelen) /* less entries than lines */ - { -- if (menu->top != 0) { -+ if (menu->top != 0) -+ { - menu->top = 0; - set_option (OPTNEEDREDRAW); - } - } - else - { -- /* -- * 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) || (c < MenuContext)) - { -- if (option (OPTMENUSCROLL) || (menu->pagelen <= 0)) -+ if (menu->current < menu->top + c) - menu->top = menu->current - c; -- else -- menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c; -+ else if (menu->current >= menu->top + menu->pagelen - c) -+ menu->top = menu->current - menu->pagelen + c + 1; - } -- if (menu->current >= menu->top + menu->pagelen - c) /* indicator below bottom threshold */ -+ else - { -- 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 (menu->current < menu->top + c) -+ menu->top -= (menu->pagelen - c) * ((menu->top + menu->pagelen - 1 - menu->current) / (menu->pagelen - c)) - c; -+ else if ((menu->current >= menu->top + menu->pagelen - c)) -+ menu->top += (menu->pagelen - c) * ((menu->current - menu->top) / (menu->pagelen - c)) - c; - } - } - -Index: mutt/pattern.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pattern.c,v -retrieving revision 3.26 -retrieving revision 3.27 -diff -u -p -r3.26 -r3.27 ---- mutt/pattern.c 21 Oct 2005 04:35:37 -0000 3.26 -+++ mutt/pattern.c 24 Nov 2005 12:50:27 -0000 3.27 -@@ -1202,15 +1202,8 @@ int mutt_pattern_func (int op, char *pro - int i; - - strfcpy (buf, NONULL (Context->pattern), sizeof (buf)); -- if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0) -+ if (mutt_get_field (prompt, buf, sizeof (buf), M_PATTERN | M_CLEAR) != 0 || !buf[0]) - return (-1); -- if (!buf[0]) -- { -- if (op == M_LIMIT) -- strfcpy (buf, "~A", sizeof(buf)); -- else -- return -1; -- } - - mutt_message _("Compiling search pattern..."); - -Index: mutt/pgp.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/pgp.c,v -retrieving revision 3.60 -retrieving revision 3.61 -diff -u -p -r3.60 -r3.61 ---- mutt/pgp.c 21 Oct 2005 04:35:37 -0000 3.60 -+++ mutt/pgp.c 22 Nov 2005 12:31:58 -0000 3.61 -@@ -243,6 +243,7 @@ static void pgp_copy_clearsigned (FILE * - - int pgp_application_pgp_handler (BODY *m, STATE *s) - { -+ int could_not_decrypt = 0; - int needpass = -1, pgp_keyblock = 0; - int clearsign = 0, rv, rc; - int c = 1; /* silence GCC warning */ -@@ -398,15 +399,16 @@ int pgp_application_pgp_handler (BODY *m - } - if (!clearsign && (!pgpout || c == EOF)) - { -+ could_not_decrypt = 1; -+ pgp_void_passphrase (); -+ } -+ -+ if (could_not_decrypt && !(s->flags & M_DISPLAY)) -+ { - mutt_error _("Could not decrypt PGP message"); - mutt_sleep (1); -- pgp_void_passphrase (); -- -- if (!(s->flags & M_DISPLAY)) -- { -- rc = -1; -- goto out; -- } -+ rc = -1; -+ goto out; - } - } - -@@ -450,7 +452,10 @@ int pgp_application_pgp_handler (BODY *m - if (needpass) - { - state_attach_puts (_("[-- END PGP MESSAGE --]\n"), s); -- mutt_message _("PGP message successfully decrypted."); -+ if (could_not_decrypt) -+ mutt_error _("Could not decrypt PGP message"); -+ else -+ mutt_message _("PGP message successfully decrypted."); - } - else if (pgp_keyblock) - state_attach_puts (_("[-- END PGP PUBLIC KEY BLOCK --]\n"), s); diff --git a/upstream/patches/cvs_2005-12-16_turkish-fix b/upstream/patches/cvs_2005-12-16_turkish-fix deleted file mode 100644 index 8a41e10..0000000 --- a/upstream/patches/cvs_2005-12-16_turkish-fix +++ /dev/null @@ -1,206 +0,0 @@ -Index: mutt/color.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/color.c,v -retrieving revision 3.8 -retrieving revision 3.9 -diff -u -p -r3.8 -r3.9 ---- mutt/color.c 17 Sep 2005 20:46:10 -0000 3.8 -+++ mutt/color.c 16 Dec 2005 18:49:40 -0000 3.9 -@@ -309,14 +309,14 @@ parse_color_name (const char *s, int *co - { - char *eptr; - -- if (mutt_strncasecmp (s, "bright", 6) == 0) -+ if (ascii_strncasecmp (s, "bright", 6) == 0) - { - *attr |= brite; - s += 6; - } - - /* allow aliases for xterm color resources */ -- if (mutt_strncasecmp (s, "color", 5) == 0) -+ if (ascii_strncasecmp (s, "color", 5) == 0) - { - s += 5; - *col = strtol (s, &eptr, 10); -Index: mutt/crypt.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/crypt.c,v -retrieving revision 3.32 -retrieving revision 3.33 -diff -u -p -r3.32 -r3.33 ---- mutt/crypt.c 21 Oct 2005 04:35:37 -0000 3.32 -+++ mutt/crypt.c 16 Dec 2005 18:49:40 -0000 3.33 -@@ -552,7 +552,7 @@ void convert_to_7bit (BODY *a) - convert_to_7bit (a->parts); - } - else if (a->type == TYPEMESSAGE && -- mutt_strcasecmp(a->subtype, "delivery-status")) -+ ascii_strcasecmp(a->subtype, "delivery-status")) - { - if(a->encoding != ENC7BIT) - mutt_message_to_7bit (a, NULL); -@@ -808,15 +808,15 @@ int mutt_signed_handler (BODY *a, STATE - - if ((WithCrypto & APPLICATION_PGP) - && protocol_major == TYPEAPPLICATION -- && !mutt_strcasecmp (protocol_minor, "pgp-signature")) -+ && !ascii_strcasecmp (protocol_minor, "pgp-signature")) - ; - else if ((WithCrypto & APPLICATION_SMIME) - && protocol_major == TYPEAPPLICATION -- && !(mutt_strcasecmp (protocol_minor, "x-pkcs7-signature") -- && mutt_strcasecmp (protocol_minor, "pkcs7-signature"))) -+ && !(ascii_strcasecmp (protocol_minor, "x-pkcs7-signature") -+ && ascii_strcasecmp (protocol_minor, "pkcs7-signature"))) - ; - else if (protocol_major == TYPEMULTIPART -- && !mutt_strcasecmp (protocol_minor, "mixed")) -+ && !ascii_strcasecmp (protocol_minor, "mixed")) - ; - else - { -@@ -840,7 +840,7 @@ int mutt_signed_handler (BODY *a, STATE - { - if ((WithCrypto & APPLICATION_PGP) - && signatures[i]->type == TYPEAPPLICATION -- && !mutt_strcasecmp (signatures[i]->subtype, "pgp-signature")) -+ && !ascii_strcasecmp (signatures[i]->subtype, "pgp-signature")) - { - if (crypt_pgp_verify_one (signatures[i], s, tempfile) != 0) - goodsig = 0; -@@ -850,8 +850,8 @@ int mutt_signed_handler (BODY *a, STATE - - if ((WithCrypto & APPLICATION_SMIME) - && signatures[i]->type == TYPEAPPLICATION -- && (!mutt_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature") -- || !mutt_strcasecmp(signatures[i]->subtype, "pkcs7-signature"))) -+ && (!ascii_strcasecmp(signatures[i]->subtype, "x-pkcs7-signature") -+ || !ascii_strcasecmp(signatures[i]->subtype, "pkcs7-signature"))) - { - if (crypt_smime_verify_one (signatures[i], s, tempfile) != 0) - goodsig = 0; -Index: mutt/handler.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/handler.c,v -retrieving revision 3.25 -retrieving revision 3.26 -diff -u -p -r3.25 -r3.26 ---- mutt/handler.c 22 Nov 2005 12:21:14 -0000 3.25 -+++ mutt/handler.c 16 Dec 2005 18:49:40 -0000 3.26 -@@ -1843,7 +1843,7 @@ int mutt_body_handler (BODY *b, STATE *s - handler = mutt_signed_handler; - } - else if ((WithCrypto & APPLICATION_PGP) -- && mutt_strcasecmp ("encrypted", b->subtype) == 0) -+ && ascii_strcasecmp ("encrypted", b->subtype) == 0) - { - p = mutt_get_parameter ("protocol", b->parameter); - -Index: mutt/init.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/init.c,v -retrieving revision 3.46 -retrieving revision 3.47 -diff -u -p -r3.46 -r3.47 ---- mutt/init.c 5 Oct 2005 19:24:40 -0000 3.46 -+++ mutt/init.c 16 Dec 2005 18:49:40 -0000 3.47 -@@ -834,9 +834,9 @@ static int parse_attach_list (BUFFER *bu - a = safe_malloc(sizeof(ATTACH_MATCH)); - - /* some cheap hacks that I expect to remove */ -- if (!mutt_strcasecmp(buf->data, "any")) -+ if (!ascii_strcasecmp(buf->data, "any")) - a->major = safe_strdup("*/.*"); -- else if (!mutt_strcasecmp(buf->data, "none")) -+ else if (!ascii_strcasecmp(buf->data, "none")) - a->major = safe_strdup("cheap_hack/this_should_never_match"); - else - a->major = safe_strdup(buf->data); -@@ -898,9 +898,9 @@ static int parse_unattach_list (BUFFER * - { - mutt_extract_token (buf, s, 0); - -- if (!mutt_strcasecmp(buf->data, "any")) -+ if (!ascii_strcasecmp(buf->data, "any")) - tmp = safe_strdup("*/.*"); -- else if (!mutt_strcasecmp(buf->data, "none")) -+ else if (!ascii_strcasecmp(buf->data, "none")) - tmp = safe_strdup("cheap_hack/this_should_never_match"); - else - tmp = safe_strdup(buf->data); -@@ -1001,13 +1001,13 @@ static int parse_attachments (BUFFER *bu - op = '+'; - category--; - } -- if (!mutt_strncasecmp(category, "attachment", strlen(category))) { -+ if (!ascii_strncasecmp(category, "attachment", strlen(category))) { - if (op == '+') - listp = &AttachAllow; - else - listp = &AttachExclude; - } -- else if (!mutt_strncasecmp(category, "inline", strlen(category))) { -+ else if (!ascii_strncasecmp(category, "inline", strlen(category))) { - if (op == '+') - listp = &InlineAllow; - else -@@ -1038,13 +1038,13 @@ static int parse_unattachments (BUFFER * - op = '+'; - p--; - } -- if (!mutt_strncasecmp(p, "attachment", strlen(p))) { -+ if (!ascii_strncasecmp(p, "attachment", strlen(p))) { - if (op == '+') - listp = &AttachAllow; - else - listp = &AttachExclude; - } -- else if (!mutt_strncasecmp(p, "inline", strlen(p))) { -+ else if (!ascii_strncasecmp(p, "inline", strlen(p))) { - if (op == '+') - listp = &InlineAllow; - else -Index: mutt/parse.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/parse.c,v -retrieving revision 3.21 -retrieving revision 3.22 -diff -u -p -r3.21 -r3.22 ---- mutt/parse.c 21 Oct 2005 04:35:37 -0000 3.21 -+++ mutt/parse.c 16 Dec 2005 18:49:40 -0000 3.22 -@@ -1542,7 +1542,7 @@ int count_body_parts (BODY *body, int fl - { - /* Always recurse multiparts, except multipart/alternative. */ - shallrecurse = 1; -- if (!mutt_strcasecmp(bp->subtype, "alternative")) -+ if (!ascii_strcasecmp(bp->subtype, "alternative")) - shallrecurse = 0; - - /* Don't count containers if they're top-level. */ -Index: mutt/smime.c -=================================================================== -RCS file: /home/roessler/cvs/mutt/smime.c,v -retrieving revision 3.47 -retrieving revision 3.48 -diff -u -p -r3.47 -r3.48 ---- mutt/smime.c 21 Oct 2005 04:35:38 -0000 3.47 -+++ mutt/smime.c 16 Dec 2005 18:49:40 -0000 3.48 -@@ -1621,7 +1621,7 @@ int smime_verify_one (BODY *sigbdy, STAT - rewind (smimeerr); - - line = mutt_read_line (line, &linelen, smimeerr, &lineno); -- if (linelen && !mutt_strcasecmp (line, "verification successful")) -+ if (linelen && !ascii_strcasecmp (line, "verification successful")) - badsig = 0; - - FREE (&line); -@@ -1842,7 +1842,7 @@ static BODY *smime_handle_entity (BODY * - rewind (smimeerr); - - line = mutt_read_line (line, &linelen, smimeerr, &lineno); -- if (linelen && !mutt_strcasecmp (line, "verification successful")) -+ if (linelen && !ascii_strcasecmp (line, "verification successful")) - m->goodsig = 1; - FREE (&line); - }