From: Adeodato Simó Date: Thu, 29 Sep 2005 23:15:28 +0000 (+0200) Subject: Import mutt_1.5.11-2 X-Git-Tag: 1.5.11-2 X-Git-Url: https://git.llucax.com/software/mutt-debian.git/commitdiff_plain/c17d89a9948fd2608b6e1f238f324cd4b3a47dc5?ds=sidebyside Import mutt_1.5.11-2 --- diff --git a/debian/changelog b/debian/changelog index c010bc4..641e104 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +mutt (1.5.11-2) unstable; urgency=low (but fixes critical bug not in testing) + + * The fix for coping with mboxes bigger than 2 GB introduced a bug affecting + at least powerpc (but not i386) which made mutt write Content-Length: 0 in + mboxes due to a un-updated %ld format specifier. This caused for mail to + be lost in the next mbox write. + + Apply a patch quickly provided by upstream (thanks, Brendan Cully!) that + makes mutt use the right format specifier. (Closes: #330474) + + * Update the compressed folders to the 1.5.11, which includes documentation + in XML format. + + -- Adeodato Simó Fri, 30 Sep 2005 01:15:28 +0200 + mutt (1.5.11-1) unstable; urgency=low * New upstream release, fixing the following bugs: diff --git a/debian/patches/autotools-update b/debian/patches/autotools-update index e85fd45..1d49fb2 100644 --- a/debian/patches/autotools-update +++ b/debian/patches/autotools-update @@ -1,6 +1,6 @@ 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-09-25 22:16:49.000000000 +0200 ++++ mutt-1.5.11/Makefile.in 2005-09-30 01:14:50.000000000 +0200 @@ -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. @@ -88,7 +88,7 @@ diff -ru mutt-1.5.11.orig/Makefile.in mutt-1.5.11/Makefile.in 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-09-25 22:16:45.000000000 +0200 ++++ mutt-1.5.11/config.h.in 2005-09-30 01:14:46.000000000 +0200 @@ -87,6 +87,9 @@ /* Define to 1 if you have the `fgets_unlocked' function. */ #undef HAVE_FGETS_UNLOCKED @@ -109,7 +109,17 @@ diff -ru mutt-1.5.11.orig/config.h.in mutt-1.5.11/config.h.in /* Define to 1 if you have the `RAND_egd' function. */ #undef HAVE_RAND_EGD -@@ -492,6 +498,9 @@ +@@ -475,6 +481,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 +501,9 @@ /* Define to enable Sun mailtool attachments support. */ #undef SUN_ATTACHMENT @@ -119,7 +129,7 @@ diff -ru mutt-1.5.11.orig/config.h.in mutt-1.5.11/config.h.in /* Define to use dotlocking for mailboxes. */ #undef USE_DOTLOCK -@@ -568,6 +577,9 @@ +@@ -568,6 +580,9 @@ # undef _GNU_SOURCE #endif @@ -129,7 +139,7 @@ diff -ru mutt-1.5.11.orig/config.h.in mutt-1.5.11/config.h.in /* Define for large files, on AIX-style hosts. */ #undef _LARGE_FILES -@@ -609,3 +621,13 @@ +@@ -609,3 +624,19 @@ /* Define to 'int' if system headers don't define. */ #undef wint_t @@ -137,16 +147,22 @@ diff -ru mutt-1.5.11.orig/config.h.in mutt-1.5.11/config.h.in +/* 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-09-25 22:16:50.000000000 +0200 ++++ mutt-1.5.11/configure 2005-09-30 01:14:51.000000000 +0200 @@ -309,7 +309,7 @@ # include #endif" @@ -389,7 +405,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -4812,6 +4795,178 @@ +@@ -4812,6 +4795,584 @@ rm -f conftest* fi @@ -564,11 +580,417 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure +_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 +5123,8 @@ +@@ -4968,6 +5529,8 @@ @@ -577,7 +999,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure for ac_header in inttypes.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -@@ -5001,8 +5158,7 @@ +@@ -5001,8 +5564,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -587,7 +1009,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5149,8 +5305,7 @@ +@@ -5149,8 +5711,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -597,7 +1019,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5212,8 +5367,7 @@ +@@ -5212,8 +5773,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -607,7 +1029,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5275,8 +5429,7 @@ +@@ -5275,8 +5835,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -617,7 +1039,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5316,8 +5469,7 @@ +@@ -5316,8 +5875,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -627,7 +1049,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5373,8 +5525,7 @@ +@@ -5373,8 +5931,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -637,7 +1059,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5414,8 +5565,7 @@ +@@ -5414,8 +5971,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -647,7 +1069,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5479,8 +5629,7 @@ +@@ -5479,8 +6035,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -657,7 +1079,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5511,10 +5660,8 @@ +@@ -5511,10 +6066,8 @@ esac else if test "$cross_compiling" = yes; then @@ -670,7 +1092,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -5626,8 +5773,7 @@ +@@ -5626,8 +6179,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -680,7 +1102,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5689,8 +5835,7 @@ +@@ -5689,8 +6241,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -690,7 +1112,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5730,8 +5875,7 @@ +@@ -5730,8 +6281,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -700,7 +1122,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5787,8 +5931,7 @@ +@@ -5787,8 +6337,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -710,7 +1132,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5828,8 +5971,7 @@ +@@ -5828,8 +6377,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -720,7 +1142,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5893,8 +6035,7 @@ +@@ -5893,8 +6441,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -730,7 +1152,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -5925,10 +6066,8 @@ +@@ -5925,10 +6472,8 @@ esac else if test "$cross_compiling" = yes; then @@ -743,7 +1165,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6040,8 +6179,7 @@ +@@ -6040,8 +6585,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -753,7 +1175,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6103,8 +6241,7 @@ +@@ -6103,8 +6647,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -763,7 +1185,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6144,8 +6281,7 @@ +@@ -6144,8 +6687,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -773,7 +1195,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6201,8 +6337,7 @@ +@@ -6201,8 +6743,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -783,7 +1205,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6242,8 +6377,7 @@ +@@ -6242,8 +6783,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -793,7 +1215,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6307,8 +6441,7 @@ +@@ -6307,8 +6847,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -803,7 +1225,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6339,10 +6472,8 @@ +@@ -6339,10 +6878,8 @@ esac else if test "$cross_compiling" = yes; then @@ -816,7 +1238,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -6454,8 +6585,7 @@ +@@ -6454,8 +6991,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -826,7 +1248,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6517,8 +6647,7 @@ +@@ -6517,8 +7053,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -836,7 +1258,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6558,8 +6687,7 @@ +@@ -6558,8 +7093,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -846,7 +1268,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6615,8 +6743,7 @@ +@@ -6615,8 +7149,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -856,7 +1278,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6656,8 +6783,7 @@ +@@ -6656,8 +7189,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -866,7 +1288,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6721,8 +6847,7 @@ +@@ -6721,8 +7253,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -876,7 +1298,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -6753,10 +6878,8 @@ +@@ -6753,10 +7284,8 @@ esac else if test "$cross_compiling" = yes; then @@ -889,7 +1311,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -@@ -7205,8 +7328,7 @@ +@@ -7205,8 +7734,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -899,7 +1321,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7292,8 +7414,7 @@ +@@ -7292,8 +7820,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -909,7 +1331,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7408,8 +7529,7 @@ +@@ -7408,8 +7935,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -919,7 +1341,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7479,8 +7599,7 @@ +@@ -7479,8 +8005,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -929,7 +1351,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7549,8 +7668,7 @@ +@@ -7549,8 +8074,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -939,7 +1361,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7616,8 +7734,7 @@ +@@ -7616,8 +8140,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -949,7 +1371,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7767,8 +7884,7 @@ +@@ -7767,8 +8290,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -959,7 +1381,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -7951,8 +8067,7 @@ +@@ -7951,8 +8473,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -969,7 +1391,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8020,8 +8135,7 @@ +@@ -8020,8 +8541,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -979,7 +1401,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8090,8 +8204,7 @@ +@@ -8090,8 +8610,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -989,7 +1411,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8162,8 +8275,7 @@ +@@ -8162,8 +8681,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -999,7 +1421,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8285,8 +8397,7 @@ +@@ -8285,8 +8803,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1009,7 +1431,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8355,8 +8466,7 @@ +@@ -8355,8 +8872,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1019,7 +1441,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8433,8 +8543,7 @@ +@@ -8433,8 +8949,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1029,7 +1451,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8496,8 +8605,7 @@ +@@ -8496,8 +9011,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1039,7 +1461,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8550,8 +8658,7 @@ +@@ -8550,8 +9064,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1049,7 +1471,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8594,8 +8701,7 @@ +@@ -8594,8 +9107,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1059,7 +1481,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8670,8 +8776,7 @@ +@@ -8670,8 +9182,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1069,7 +1491,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8710,8 +8815,7 @@ +@@ -8710,8 +9221,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1079,7 +1501,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8807,8 +8911,7 @@ +@@ -8807,8 +9317,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1089,7 +1511,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -8978,8 +9081,7 @@ +@@ -8978,8 +9487,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1099,7 +1521,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9129,8 +9231,7 @@ +@@ -9129,8 +9637,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1109,7 +1531,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9279,8 +9380,7 @@ +@@ -9279,8 +9786,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1119,7 +1541,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9466,8 +9566,7 @@ +@@ -9466,8 +9972,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1129,7 +1551,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9539,8 +9638,7 @@ +@@ -9539,8 +10044,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1139,7 +1561,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9647,8 +9745,7 @@ +@@ -9647,8 +10151,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1149,7 +1571,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9737,8 +9834,7 @@ +@@ -9737,8 +10240,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1159,7 +1581,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9811,8 +9907,7 @@ +@@ -9811,8 +10313,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1169,7 +1591,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9877,8 +9972,7 @@ +@@ -9877,8 +10378,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1179,7 +1601,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -9985,8 +10079,7 @@ +@@ -9985,8 +10485,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1189,7 +1611,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10089,8 +10182,7 @@ +@@ -10089,8 +10588,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1199,7 +1621,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10198,8 +10290,7 @@ +@@ -10198,8 +10696,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1209,7 +1631,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10259,8 +10350,7 @@ +@@ -10259,8 +10756,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1219,7 +1641,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10448,8 +10538,7 @@ +@@ -10448,8 +10944,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1229,7 +1651,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10552,8 +10641,7 @@ +@@ -10552,8 +11047,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1239,7 +1661,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10667,8 +10755,7 @@ +@@ -10667,8 +11161,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1249,7 +1671,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10737,8 +10824,7 @@ +@@ -10737,8 +11230,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1259,7 +1681,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10845,8 +10931,7 @@ +@@ -10845,8 +11337,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1269,7 +1691,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -10915,8 +11000,7 @@ +@@ -10915,8 +11406,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1279,7 +1701,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11023,8 +11107,7 @@ +@@ -11023,8 +11513,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1289,7 +1711,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11134,8 +11217,7 @@ +@@ -11134,8 +11623,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1299,7 +1721,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11636,8 +11718,7 @@ +@@ -11636,8 +12124,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1309,7 +1731,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11703,8 +11784,7 @@ +@@ -11703,8 +12190,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1319,7 +1741,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11805,8 +11885,7 @@ +@@ -11805,8 +12291,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1329,7 +1751,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11872,8 +11951,7 @@ +@@ -11872,8 +12357,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1339,7 +1761,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -11978,8 +12056,7 @@ +@@ -11978,8 +12462,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1349,7 +1771,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12140,8 +12217,7 @@ +@@ -12140,8 +12623,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1359,7 +1781,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12214,8 +12290,7 @@ +@@ -12214,8 +12696,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1369,7 +1791,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12290,8 +12365,7 @@ +@@ -12290,8 +12771,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1379,7 +1801,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12484,8 +12558,7 @@ +@@ -12484,8 +12964,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1389,7 +1811,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12562,8 +12635,7 @@ +@@ -12562,8 +13041,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1399,7 +1821,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12672,8 +12744,7 @@ +@@ -12672,8 +13150,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1409,7 +1831,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -12930,8 +13001,7 @@ +@@ -12930,8 +13407,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1419,7 +1841,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13104,8 +13174,7 @@ +@@ -13104,8 +13580,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1429,7 +1851,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13226,8 +13295,7 @@ +@@ -13226,8 +13701,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1439,7 +1861,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13344,8 +13412,7 @@ +@@ -13344,8 +13818,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1449,7 +1871,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13449,8 +13516,7 @@ +@@ -13449,8 +13922,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1459,7 +1881,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13552,8 +13618,7 @@ +@@ -13552,8 +14024,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1469,7 +1891,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13655,8 +13720,7 @@ +@@ -13655,8 +14126,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1479,7 +1901,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13807,6 +13871,18 @@ +@@ -13807,6 +14277,18 @@ fi fi; @@ -1498,7 +1920,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure # Check whether --with-exec-shell or --without-exec-shell was given. if test "${with_exec_shell+set}" = set; then -@@ -13858,6 +13934,74 @@ +@@ -13858,6 +14340,74 @@ OLDLIBS="$LIBS" need_md5="yes" @@ -1573,7 +1995,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure ac_prefer_gdbm=yes # Check whether --with-gdbm or --without-gdbm was given. -@@ -13865,7 +14009,7 @@ +@@ -13865,7 +14415,7 @@ withval="$with_gdbm" ac_prefer_gdbm=$withval fi; @@ -1582,7 +2004,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure CPPFLAGS="$OLDCPPFLAGS" LIBS="$OLDLIBS -lgdbm"; echo "$as_me:$LINENO: checking for gdbm_open" >&5 -@@ -13899,8 +14043,7 @@ +@@ -13899,8 +14449,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1592,7 +2014,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -13933,7 +14076,7 @@ +@@ -13933,7 +14482,7 @@ withval="$with_bdb" ac_bdb_prefix=$withval fi; @@ -1601,7 +2023,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure 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 +14128,7 @@ +@@ -13985,8 +14534,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1611,7 +2033,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14026,7 +14168,15 @@ +@@ -14026,7 +14574,15 @@ fi fi @@ -1628,7 +2050,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure CPPFLAGS="$OLDCPPFLAGS" LIBS="$OLDLIBS -lgdbm"; -@@ -14043,8 +14193,8 @@ +@@ -14043,8 +14599,8 @@ _ACEOF else @@ -1639,7 +2061,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (exit 1); exit 1; }; } fi fi -@@ -14102,8 +14252,7 @@ +@@ -14102,8 +14658,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1649,7 +2071,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14168,8 +14317,7 @@ +@@ -14168,8 +14723,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1659,7 +2081,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14233,8 +14381,7 @@ +@@ -14233,8 +14787,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1669,7 +2091,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14315,8 +14462,7 @@ +@@ -14315,8 +14868,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1679,7 +2101,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14457,8 +14603,7 @@ +@@ -14457,8 +15009,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1689,7 +2111,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14596,8 +14741,7 @@ +@@ -14596,8 +15147,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1699,7 +2121,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -14781,8 +14925,7 @@ +@@ -14781,8 +15331,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1709,7 +2131,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15072,8 +15215,7 @@ +@@ -15072,8 +15621,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1719,7 +2141,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15279,8 +15421,7 @@ +@@ -15279,8 +15827,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1729,7 +2151,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15362,8 +15503,7 @@ +@@ -15362,8 +15909,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1739,7 +2161,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15413,8 +15553,7 @@ +@@ -15413,8 +15959,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1749,7 +2171,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15489,8 +15628,7 @@ +@@ -15489,8 +16034,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1759,7 +2181,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15560,8 +15698,7 @@ +@@ -15560,8 +16104,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1769,7 +2191,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15624,8 +15761,7 @@ +@@ -15624,8 +16167,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1779,7 +2201,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15730,8 +15866,7 @@ +@@ -15730,8 +16272,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1789,7 +2211,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15869,8 +16004,7 @@ +@@ -15869,8 +16410,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1799,7 +2221,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -15929,8 +16063,7 @@ +@@ -15929,8 +16469,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1809,7 +2231,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16041,8 +16174,7 @@ +@@ -16041,8 +16580,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1819,7 +2241,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16527,8 +16659,7 @@ +@@ -16527,8 +17065,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1829,7 +2251,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16882,8 +17013,7 @@ +@@ -16882,8 +17419,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1839,7 +2261,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -16954,8 +17084,7 @@ +@@ -16954,8 +17490,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1849,7 +2271,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17106,8 +17235,7 @@ +@@ -17106,8 +17641,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1859,7 +2281,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17174,8 +17302,7 @@ +@@ -17174,8 +17708,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1869,7 +2291,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17241,8 +17368,7 @@ +@@ -17241,8 +17774,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1879,7 +2301,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17429,8 +17555,7 @@ +@@ -17429,8 +17961,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1889,7 +2311,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17536,8 +17661,7 @@ +@@ -17536,8 +18067,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1899,7 +2321,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17640,8 +17764,7 @@ +@@ -17640,8 +18170,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1909,7 +2331,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17709,8 +17832,7 @@ +@@ -17709,8 +18238,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1919,7 +2341,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17791,8 +17913,7 @@ +@@ -17791,8 +18319,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1929,7 +2351,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17855,8 +17976,7 @@ +@@ -17855,8 +18382,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1939,7 +2361,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -17917,8 +18037,7 @@ +@@ -17917,8 +18443,7 @@ cat conftest.err >&5 echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && @@ -1949,7 +2371,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? -@@ -18713,7 +18832,7 @@ +@@ -18713,7 +19238,7 @@ s,@AMTAR@,$AMTAR,;t t s,@am__tar@,$am__tar,;t t s,@am__untar@,$am__untar,;t t @@ -1958,7 +2380,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure s,@build@,$build,;t t s,@build_cpu@,$build_cpu,;t t s,@build_vendor@,$build_vendor,;t t -@@ -18970,11 +19089,6 @@ +@@ -18970,11 +19495,6 @@ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac @@ -1970,7 +2392,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure # 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 +19127,12 @@ +@@ -19013,6 +19533,12 @@ fi;; esac done` || { (exit 1); exit 1; } @@ -1985,7 +2407,7 @@ diff -ru mutt-1.5.11.orig/configure mutt-1.5.11/configure 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-09-25 22:16:49.000000000 +0200 ++++ mutt-1.5.11/imap/Makefile.in 2005-09-30 01:14:49.000000000 +0200 @@ -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. @@ -2012,7 +2434,7 @@ diff -ru mutt-1.5.11.orig/imap/Makefile.in mutt-1.5.11/imap/Makefile.in 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-09-25 22:16:49.000000000 +0200 ++++ mutt-1.5.11/m4/Makefile.in 2005-09-30 01:14:49.000000000 +0200 @@ -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. diff --git a/upstream/extra-patches/compressed-folders b/upstream/extra-patches/compressed-folders index 3a5c3ae..1d15cad 100644 --- a/upstream/extra-patches/compressed-folders +++ b/upstream/extra-patches/compressed-folders @@ -7,8 +7,8 @@ The home page for this patch is: http://www.spinnaker.de/mutt/compressed/ * Patch last synced with upstream: - - Date: 2005-08-14 - - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.10.rr.compressed.1.gz + - Date: 2005-09-29 + - File: http://www.spinnaker.de/mutt/compressed/patch-1.5.11.rr.compressed.1.gz * Changes made: - filterdiff -p1 \ @@ -16,9 +16,9 @@ The home page for this patch is: doc/manual.sgml 'doc/manual*.html' doc/muttrc.man; do echo "-x $f"; done) == END PATCH -diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c ---- mutt-1.5.10/compress.c 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.10-ro/compress.c 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/compress.c mutt-1.5.11-ro/compress.c +--- mutt-1.5.11/compress.c 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.11-ro/compress.c 2005-09-27 13:26:58.000000000 +0200 @@ -0,0 +1,487 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -507,9 +507,9 @@ diff -urN mutt-1.5.10/compress.c mutt-1.5.10-ro/compress.c +} + +#endif /* USE_COMPRESSED */ -diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h ---- mutt-1.5.10/compress.h 1970-01-01 01:00:00.000000000 +0100 -+++ mutt-1.5.10-ro/compress.h 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/compress.h mutt-1.5.11-ro/compress.h +--- mutt-1.5.11/compress.h 1970-01-01 01:00:00.000000000 +0100 ++++ mutt-1.5.11-ro/compress.h 2005-09-27 13:26:58.000000000 +0200 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 1997 Alain Penders @@ -538,12 +538,12 @@ diff -urN mutt-1.5.10/compress.h mutt-1.5.10-ro/compress.h +int mutt_test_compress_command (const char *); +int mutt_check_mailbox_compressed (CONTEXT *); +void mutt_fast_close_compressed (CONTEXT *); -diff -urN mutt-1.5.10/config.h.in mutt-1.5.10-ro/config.h.in -diff -urN mutt-1.5.10/configure mutt-1.5.10-ro/configure -diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in ---- mutt-1.5.10/configure.in 2005-08-11 23:49:24.000000000 +0200 -+++ mutt-1.5.10-ro/configure.in 2005-08-14 12:10:21.000000000 +0200 -@@ -753,6 +753,11 @@ +diff -urN mutt-1.5.11/config.h.in mutt-1.5.11-ro/config.h.in +diff -urN mutt-1.5.11/configure mutt-1.5.11-ro/configure +diff -urN mutt-1.5.11/configure.in mutt-1.5.11-ro/configure.in +--- mutt-1.5.11/configure.in 2005-09-15 16:21:24.000000000 +0200 ++++ mutt-1.5.11-ro/configure.in 2005-09-27 13:26:58.000000000 +0200 +@@ -711,6 +711,11 @@ AC_DEFINE(LOCALES_HACK,1,[ Define if the result of isprint() is unreliable. ]) fi]) @@ -555,10 +555,10 @@ diff -urN mutt-1.5.10/configure.in mutt-1.5.10-ro/configure.in AC_ARG_WITH(exec-shell, AC_HELP_STRING([--with-exec-shell=SHELL], [Specify alternate shell (ONLY if /bin/sh is broken)]), [if test $withval != yes; then AC_DEFINE_UNQUOTED(EXECSHELL, "$withval", -diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c ---- mutt-1.5.10/curs_main.c 2005-08-11 21:37:01.000000000 +0200 -+++ mutt-1.5.10-ro/curs_main.c 2005-08-14 12:10:21.000000000 +0200 -@@ -1087,6 +1087,11 @@ +diff -urN mutt-1.5.11/curs_main.c mutt-1.5.11-ro/curs_main.c +--- mutt-1.5.11/curs_main.c 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/curs_main.c 2005-09-27 13:26:58.000000000 +0200 +@@ -1091,6 +1091,11 @@ { int check; @@ -570,16 +570,218 @@ diff -urN mutt-1.5.10/curs_main.c mutt-1.5.10-ro/curs_main.c mutt_str_replace (&LastFolder, Context->path); oldcount = Context ? Context->msgcount : 0; -diff -urN mutt-1.5.10/doc/manual-4.html mutt-1.5.10-ro/doc/manual-4.html -diff -urN mutt-1.5.10/doc/manual-6.html mutt-1.5.10-ro/doc/manual-6.html -diff -urN mutt-1.5.10/doc/manual.html mutt-1.5.10-ro/doc/manual.html -diff -urN mutt-1.5.10/doc/manual.sgml mutt-1.5.10-ro/doc/manual.sgml -diff -urN mutt-1.5.10/doc/manual.sgml.head mutt-1.5.10-ro/doc/manual.sgml.head -diff -urN mutt-1.5.10/doc/manual.txt mutt-1.5.10-ro/doc/manual.txt -diff -urN mutt-1.5.10/doc/muttrc.man mutt-1.5.10-ro/doc/muttrc.man -diff -urN mutt-1.5.10/doc/muttrc.man.head mutt-1.5.10-ro/doc/muttrc.man.head ---- mutt-1.5.10/doc/muttrc.man.head 2005-01-15 10:42:45.000000000 +0100 -+++ mutt-1.5.10-ro/doc/muttrc.man.head 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/doc/manual.xml.head mutt-1.5.11-ro/doc/manual.xml.head +--- mutt-1.5.11/doc/manual.xml.head 2005-09-06 18:46:44.000000000 +0200 ++++ mutt-1.5.11-ro/doc/manual.xml.head 2005-09-27 13:29:11.000000000 +0200 +@@ -4404,6 +4404,205 @@ + + + ++ ++Compressed folders Support (OPTIONAL) ++ ++ ++If Mutt was compiled with compressed folders support (by running the ++configure script with the ++--enable-compressed flag), Mutt can open folders ++stored in an arbitrary format, provided that the user has a script to ++convert from/to this format to one of the accepted. ++ ++The most common use is to open compressed archived folders e.g. with ++gzip. ++ ++In addition, the user can provide a script that gets a folder in an ++accepted format and appends its context to the folder in the ++user-defined format, which may be faster than converting the entire ++folder to the accepted format, appending to it and converting back to ++the user-defined format. ++ ++There are three hooks defined (open-hook, close-hook and append-hook) which define commands to ++uncompress and compress a folder and to append messages to an existing ++compressed folder respectively. ++ ++For example: ++ ++ ++open-hook \\.gz$ "gzip -cd %f > %t" ++close-hook \\.gz$ "gzip -c %t > %f" ++append-hook \\.gz$ "gzip -c %t >> %f" ++ ++ ++You do not have to specify all of the commands. If you omit append-hook, the folder will be open and ++closed again each time you will add to it. If you omit close-hook (or give empty command) , the ++folder will be open in the mode. If you specify append-hook though you'll be able to ++append to the folder. ++ ++Note that Mutt will only try to use hooks if the file is not in one of ++the accepted formats. In particular, if the file is empty, mutt ++supposes it is not compressed. This is important because it allows the ++use of programs that do not have well defined extensions. Just use ++"." as a regexp. But this may be surprising if your ++compressing script produces empty files. In this situation, unset ++$save_empty, so that ++the compressed file will be removed if you delete all of the messages. ++ ++ ++ ++Open a compressed mailbox for reading ++ ++ ++Usage: open-hook regexp "command" ++ ++The command is the command that can be used for ++opening the folders whose names match regexp. ++ ++The command string is the printf-like format ++string, and it should accept two parameters: %f, which is ++replaced with the (compressed) folder name, and %t which is ++replaced with the name of the temporary folder to which to write. ++ ++%f and %t can be repeated any number of times in the ++command string, and all of the entries are replaced with the ++appropriate folder name. In addition, %% is replaced by ++%, as in printf, and any other %anything is left as is. ++ ++The command should not remove the original compressed file. The ++command should return non-zero exit status if it ++fails, so mutt knows something's wrong. ++ ++Example: ++ ++ ++open-hook \\.gz$ "gzip -cd %f > %t" ++ ++ ++If the command is empty, this operation is ++disabled for this file type. ++ ++ ++ ++ ++Write a compressed mailbox ++ ++ ++Usage: close-hook regexp "command" ++ ++This is used to close the folder that was open with the open-hook command after some changes were ++made to it. ++ ++The command string is the command that can be ++used for closing the folders whose names match ++regexp. It has the same format as in the open-hook command. Temporary folder in this ++case is the folder previously produced by the open-hook command. ++ ++The command should not remove the decompressed file. The ++command should return non-zero exit status if it ++fails, so mutt knows something's wrong. ++ ++Example: ++ ++ ++close-hook \\.gz$ "gzip -c %t > %f" ++ ++ ++If the command is empty, this operation is ++disabled for this file type, and the file can only be open in the ++read-only mode. ++ ++close-hook is not called when you ++exit from the folder if the folder was not changed. ++ ++ ++ ++ ++Append a message to a compressed mailbox ++ ++ ++Usage: append-hook regexp "command" ++ ++This command is used for saving to an existing compressed folder. The ++command is the command that can be used for ++appending to the folders whose names match ++regexp. It has the same format as in the open-hook command. The temporary folder in ++this case contains the messages that are being appended. ++ ++The command should not remove the decompressed file. The ++command should return non-zero exit status if it ++fails, so mutt knows something's wrong. ++ ++Example: ++ ++ ++append-hook \\.gz$ "gzip -c %t >> %f" ++ ++ ++When append-hook is used, the folder ++is not opened, which saves time, but this means that we can not find ++out what the folder type is. Thus the default ($mbox_type) type is always ++supposed (i.e. this is the format used for the temporary folder). ++ ++If the file does not exist when you save to it, close-hook is called, and not append-hook. append-hook is only for appending to ++existing folders. ++ ++If the command is empty, this operation is ++disabled for this file type. In this case, the folder will be open and ++closed again (using open-hook and ++close-hookrespectively) each time you ++will add to it. ++ ++ ++ ++ ++Encrypted folders ++ ++ ++The compressed folders support can also be used to handle encrypted ++folders. If you want to encrypt a folder with PGP, you may want to use ++the following hooks: ++ ++ ++open-hook \\.pgp$ "pgp -f < %f > %t" ++close-hook \\.pgp$ "pgp -fe YourPgpUserIdOrKeyId < %t > %f" ++ ++ ++Please note, that PGP does not support appending to an encrypted ++folder, so there is no append-hook defined. ++ ++If you are using GnuPG instead of PGP, you may use the following hooks ++instead: ++ ++ ++open-hook \\.gpg$ "gpg --decrypt < %f > %t" ++close-hook \\.gpg$ "gpg --encrypt --recipient YourGpgUserIdOrKeyId < %t > %f" ++ ++ ++Note: the folder is temporary stored ++decrypted in the /tmp directory, where it can be read by your system ++administrator. So think about the security aspects of this. ++ ++ ++ ++ + + Mutt's MIME Support + +diff -urN mutt-1.5.11/doc/muttrc.man.head mutt-1.5.11-ro/doc/muttrc.man.head +--- mutt-1.5.11/doc/muttrc.man.head 2005-09-07 10:19:44.000000000 +0200 ++++ mutt-1.5.11-ro/doc/muttrc.man.head 2005-09-27 13:29:53.000000000 +0200 @@ -316,6 +316,24 @@ to a certain recipient. The meaning of "key ID" is to be taken broadly: This can be a different e-mail address, a numerical key ID, @@ -605,9 +807,9 @@ diff -urN mutt-1.5.10/doc/muttrc.man.head mutt-1.5.10-ro/doc/muttrc.man.head .TP \fBpush\fP \fIstring\fP This command adds the named \fIstring\fP to the keyboard buffer. -diff -urN mutt-1.5.10/hook.c mutt-1.5.10-ro/hook.c ---- mutt-1.5.10/hook.c 2005-02-03 19:47:52.000000000 +0100 -+++ mutt-1.5.10-ro/hook.c 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/hook.c mutt-1.5.11-ro/hook.c +--- mutt-1.5.11/hook.c 2005-02-03 19:47:52.000000000 +0100 ++++ mutt-1.5.11-ro/hook.c 2005-09-27 13:27:02.000000000 +0200 @@ -24,6 +24,10 @@ #include "mailbox.h" #include "mutt_crypt.h" @@ -636,10 +838,10 @@ diff -urN mutt-1.5.10/hook.c mutt-1.5.10-ro/hook.c else if (DefaultHook && !(data & (M_CHARSETHOOK | M_ACCOUNTHOOK)) && (!WithCrypto || !(data & M_CRYPTHOOK)) ) -diff -urN mutt-1.5.10/init.h mutt-1.5.10-ro/init.h ---- mutt-1.5.10/init.h 2005-08-11 21:37:01.000000000 +0200 -+++ mutt-1.5.10-ro/init.h 2005-08-14 12:10:21.000000000 +0200 -@@ -2979,6 +2979,11 @@ +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 }, { "folder-hook", mutt_parse_hook, M_FOLDERHOOK }, @@ -651,10 +853,10 @@ diff -urN mutt-1.5.10/init.h mutt-1.5.10-ro/init.h { "hdr_order", parse_list, UL &HeaderOrderList }, #ifdef HAVE_ICONV { "iconv-hook", mutt_parse_hook, M_ICONVHOOK }, -diff -urN mutt-1.5.10/main.c mutt-1.5.10-ro/main.c ---- mutt-1.5.10/main.c 2005-08-11 21:37:01.000000000 +0200 -+++ mutt-1.5.10-ro/main.c 2005-08-14 12:10:21.000000000 +0200 -@@ -382,6 +382,12 @@ +diff -urN mutt-1.5.11/main.c mutt-1.5.11-ro/main.c +--- mutt-1.5.11/main.c 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/main.c 2005-09-27 13:27:02.000000000 +0200 +@@ -385,6 +385,12 @@ #else "-LOCALES_HACK " #endif @@ -667,9 +869,9 @@ diff -urN mutt-1.5.10/main.c mutt-1.5.10-ro/main.c #ifdef HAVE_WC_FUNCS "+HAVE_WC_FUNCS " -diff -urN mutt-1.5.10/Makefile.am mutt-1.5.10-ro/Makefile.am ---- mutt-1.5.10/Makefile.am 2005-08-11 23:27:28.000000000 +0200 -+++ mutt-1.5.10-ro/Makefile.am 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/Makefile.am mutt-1.5.11-ro/Makefile.am +--- mutt-1.5.11/Makefile.am 2005-08-11 23:27:28.000000000 +0200 ++++ mutt-1.5.11-ro/Makefile.am 2005-09-27 13:27:02.000000000 +0200 @@ -18,7 +18,7 @@ bin_PROGRAMS = mutt @DOTLOCK_TARGET@ @PGPAUX_TARGET@ mutt_SOURCES = $(BUILT_SOURCES) \ @@ -688,10 +890,10 @@ diff -urN mutt-1.5.10/Makefile.am mutt-1.5.10-ro/Makefile.am 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 \ -diff -urN mutt-1.5.10/Makefile.in mutt-1.5.10-ro/Makefile.in -diff -urN mutt-1.5.10/mbox.c mutt-1.5.10-ro/mbox.c ---- mutt-1.5.10/mbox.c 2005-08-02 09:08:00.000000000 +0200 -+++ mutt-1.5.10-ro/mbox.c 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/Makefile.in mutt-1.5.11-ro/Makefile.in +diff -urN mutt-1.5.11/mbox.c mutt-1.5.11-ro/mbox.c +--- mutt-1.5.11/mbox.c 2005-08-02 09:08:00.000000000 +0200 ++++ mutt-1.5.11-ro/mbox.c 2005-09-27 13:27:02.000000000 +0200 @@ -28,6 +28,10 @@ #include "sort.h" #include "copy.h" @@ -716,10 +918,10 @@ diff -urN mutt-1.5.10/mbox.c mutt-1.5.10-ro/mbox.c mutt_unblock_signals (); mx_fastclose_mailbox (ctx); return 0; -diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h ---- mutt-1.5.10/mutt.h 2005-08-11 21:37:23.000000000 +0200 -+++ mutt-1.5.10-ro/mutt.h 2005-08-14 12:10:21.000000000 +0200 -@@ -161,6 +161,11 @@ +diff -urN mutt-1.5.11/mutt.h mutt-1.5.11-ro/mutt.h +--- mutt-1.5.11/mutt.h 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/mutt.h 2005-09-27 13:27:02.000000000 +0200 +@@ -157,6 +157,11 @@ #define M_ACCOUNTHOOK (1<<9) #define M_REPLYHOOK (1<<10) #define M_SEND2HOOK (1<<11) @@ -731,7 +933,7 @@ diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h /* tree characters for linearize_tree and print_enriched_string */ #define M_TREE_LLCORNER 1 -@@ -829,6 +834,11 @@ +@@ -828,6 +833,11 @@ void *data; /* driver specific data */ #endif /* USE_IMAP */ @@ -743,12 +945,12 @@ diff -urN mutt-1.5.10/mutt.h mutt-1.5.10-ro/mutt.h short magic; /* mailbox type */ unsigned int locked : 1; /* is the mailbox locked? */ -diff -urN mutt-1.5.10/Muttrc mutt-1.5.10-ro/Muttrc -diff -urN mutt-1.5.10/Muttrc.head mutt-1.5.10-ro/Muttrc.head -diff -urN mutt-1.5.10/Muttrc.head.in mutt-1.5.10-ro/Muttrc.head.in -diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c ---- mutt-1.5.10/mx.c 2005-08-02 09:08:01.000000000 +0200 -+++ mutt-1.5.10-ro/mx.c 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/Muttrc mutt-1.5.11-ro/Muttrc +diff -urN mutt-1.5.11/Muttrc.head mutt-1.5.11-ro/Muttrc.head +diff -urN mutt-1.5.11/Muttrc.head.in mutt-1.5.11-ro/Muttrc.head.in +diff -urN mutt-1.5.11/mx.c mutt-1.5.11-ro/mx.c +--- mutt-1.5.11/mx.c 2005-09-07 10:19:43.000000000 +0200 ++++ mutt-1.5.11-ro/mx.c 2005-09-27 13:27:02.000000000 +0200 @@ -30,6 +30,10 @@ #include "keymap.h" #include "url.h" @@ -847,9 +1049,9 @@ diff -urN mutt-1.5.10/mx.c mutt-1.5.10-ro/mx.c if (ctx) { if (ctx->locked) lock = 0; -diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h ---- mutt-1.5.10/mx.h 2003-08-05 15:58:16.000000000 +0200 -+++ mutt-1.5.10-ro/mx.h 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/mx.h mutt-1.5.11-ro/mx.h +--- mutt-1.5.11/mx.h 2003-08-05 15:58:16.000000000 +0200 ++++ mutt-1.5.11-ro/mx.h 2005-09-27 13:27:02.000000000 +0200 @@ -40,6 +40,9 @@ #ifdef USE_POP , M_POP @@ -860,17 +1062,17 @@ diff -urN mutt-1.5.10/mx.h mutt-1.5.10-ro/mx.h }; WHERE short DefaultMagic INITVAL (M_MBOX); -diff -urN mutt-1.5.10/PATCHES mutt-1.5.10-ro/PATCHES ---- mutt-1.5.10/PATCHES 2005-08-11 23:27:30.000000000 +0200 -+++ mutt-1.5.10-ro/PATCHES 2005-08-14 12:10:35.000000000 +0200 +diff -urN mutt-1.5.11/PATCHES mutt-1.5.11-ro/PATCHES +--- mutt-1.5.11/PATCHES 2005-08-15 10:16:00.000000000 +0200 ++++ mutt-1.5.11-ro/PATCHES 2005-09-27 13:30:25.000000000 +0200 @@ -0,0 +1 @@ -+patch-1.5.10.rr.compressed.1 -diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po ---- mutt-1.5.10/po/de.po 2005-08-11 23:50:35.000000000 +0200 -+++ mutt-1.5.10-ro/po/de.po 2005-08-14 12:12:20.000000000 +0200 -@@ -1281,6 +1281,48 @@ ++patch-1.5.11.rr.compressed.1 +diff -urN mutt-1.5.11/po/de.po mutt-1.5.11-ro/po/de.po +--- mutt-1.5.11/po/de.po 2005-09-15 16:23:50.000000000 +0200 ++++ mutt-1.5.11-ro/po/de.po 2005-09-27 13:27:02.000000000 +0200 +@@ -1262,6 +1262,48 @@ msgid "Failed to figure out sender" - msgstr "Kann Datei nicht öffnen, um Nachrichtenkopf zu untersuchen." + msgstr "Kann Absender nicht ermitteln" +#: compress.c:203 mbox.c:661 +msgid "Mailbox was corrupted!" @@ -917,7 +1119,7 @@ diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po #: crypt.c:69 #, c-format msgid " (current time: %c)" -@@ -1901,6 +1943,10 @@ +@@ -1882,6 +1924,10 @@ msgid "Help for %s" msgstr "Hilfe für %s" @@ -928,7 +1130,7 @@ diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po #: hook.c:246 #, c-format msgid "unhook: Can't do unhook * from within a hook." -@@ -3383,18 +3429,10 @@ +@@ -3336,18 +3382,10 @@ msgid "Mailbox is corrupt!" msgstr "Mailbox fehlerhaft!" @@ -947,9 +1149,9 @@ diff -urN mutt-1.5.10/po/de.po mutt-1.5.10-ro/po/de.po #. 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. -diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in ---- mutt-1.5.10/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200 -+++ mutt-1.5.10-ro/po/POTFILES.in 2005-08-14 12:13:18.000000000 +0200 +diff -urN mutt-1.5.11/po/POTFILES.in mutt-1.5.11-ro/po/POTFILES.in +--- mutt-1.5.11/po/POTFILES.in 2005-08-03 11:17:47.000000000 +0200 ++++ mutt-1.5.11-ro/po/POTFILES.in 2005-09-27 13:27:02.000000000 +0200 @@ -8,6 +8,7 @@ color.c commands.c @@ -958,9 +1160,9 @@ diff -urN mutt-1.5.10/po/POTFILES.in mutt-1.5.10-ro/po/POTFILES.in crypt-gpgme.c crypt.c cryptglue.c -diff -urN mutt-1.5.10/status.c mutt-1.5.10-ro/status.c ---- mutt-1.5.10/status.c 2005-02-03 19:47:53.000000000 +0100 -+++ mutt-1.5.10-ro/status.c 2005-08-14 12:10:21.000000000 +0200 +diff -urN mutt-1.5.11/status.c mutt-1.5.11-ro/status.c +--- mutt-1.5.11/status.c 2005-02-03 19:47:53.000000000 +0100 ++++ mutt-1.5.11-ro/status.c 2005-09-27 13:27:02.000000000 +0200 @@ -97,6 +97,14 @@ case 'f': diff --git a/upstream/patches/cvs_2005-09-29 b/upstream/patches/cvs_2005-09-29 new file mode 100644 index 0000000..99a43f9 --- /dev/null +++ b/upstream/patches/cvs_2005-09-29 @@ -0,0 +1,2063 @@ +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."