Source tree and make process changes. make dist and make

maintainer-clean should now work as they are supposed to.

23 files changed, 364 insertions, 165 deletions

diff --git a/ChangeLog b/ChangeLog
index cc99a7c2..c895f11b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+Sat Oct  3 18:18:39 1998  Thomas Roessler  <roessler@guug.de>
+
+	* help.c: Remove an unprotected gettext() call.
+
+	* missing: Persuade CVS to get the file modes right.
+
+	* INSTALL: Adding a note on SparcLinux problems when gcc is
+	called with the -pedantic flag.
+
+Fri Oct  2 17:39:47 1998  Thomas Roessler  <roessler@guug.de>
+
+	* po/mutt.pot, po/de.po:
+	A small fix to get autoview messages properly colored.
+
+	* pattern.c, mutt.h, Makefile.in: patch-0.92.8.sec.match_all.1
+
+	* rx/Attic/Makefile:
+	The Makefile here is supposed to be generated by autoconf.
+
+	* rx/Makefile.in, rx/Attic/Makefile, po/mutt.pot, configure.in, configure, Makefile.in, Makefile.am:
+	Fixing some build-related problems, and preparing 0.94.9p1.
+
+	* doc/manual.txt, doc/manual.sgml, hdrline.c:
+	Roland Rosenfeld's first name patch.
+
+	* mutt.h, compose.c: More () fixes.
+
+	* mutt.h, edit.c, curs_lib.c, browser.c:
+	With SLang, addstr() is a macro.  This means we should put
+	additional braces around _()-style arguments.
+
+Thu Oct  1 20:16:56 1998  Thomas Roessler  <roessler@guug.de>
+
+	* po/mutt.pot, po/de.po, po/cat-id-tbl.c, po/POTFILES.in, doc/Makefile.in:
+	Translate help strings.
+
+	* charsets/Makefile.in, postpone.c, pager.c, help.c, compose.c, Makefile.in:
+	Translate help strigns.
+
+	* intl/VERSION, intl/Attic/libintl.h, intl/Attic/libintl.glibc, intl/Attic/intlh.inst.in, intl/Attic/COPYING, intl/Attic/BUGS, intl/Attic/AUTHORS:
+	*** empty log message ***
+
+	* po/mutt.pot, po/de.po, po/cat-id-tbl.c, po/POTFILES.in, recvattach.c, query.c, pager.c, curs_main.c, compose.c, browser.c, addrbook.c:
+	Translate the various help lines.
+
+	* mutt.h, lib.c, handler.c: Gero Treuner's reply_quote patch.
+
+	* po/mutt.pot, po/de.po, po/cat-id-tbl.c, po/POTFILES.in:
+	Add l10n for handler.c.
+
+	* po/mutt.pot, po/de.po, po/cat-id-tbl.c, curs_lib.c:
+	Make mutt_yesorno() language sensitive.
+
+	* po/de.po: Various German-language related fixes.
+
+	* reldate.h, configure.in, configure, TODO, Makefile.in, ChangeLog:
+	Preparing 0.94.9i.
+
+	* po/de.po: German l10n, first take.
+
+	* intl/Attic/AUTHORS, intl/Attic/BUGS, intl/Attic/COPYING:
+	Adding legalese.
+
+	* po/mutt.pot, po/de.po, po/cat-id-tbl.c, main.c: More i18n fixes.
+
+	* po/mutt.pot, po/de.po, po/cat-id-tbl.c:
+	Adapting the catalog files to 0.94.8.
+
+	* charsets/Makefile.in, configure.in, configure, Makefile.in, Makefile.am:
+	Various automake and installation fixes.
+
+	* po/Makefile.in.in, po/POTFILES.in, po/cat-id-tbl.c, po/de.po, po/mutt.pot, po/stamp-cat-id, intl/Attic/intlh.inst.in, intl/Attic/libintl.glibc, intl/Attic/libintl.h, intl/ChangeLog, intl/Makefile.in, intl/bindtextdom.c, intl/cat-compat.c, intl/dcgettext.c, intl/dgettext.c, intl/explodename.c, intl/finddomain.c, intl/gettext.c, intl/gettext.h, intl/gettextP.h, intl/hash-string.h, intl/intl-compat.c, intl/l10nflist.c, intl/libgettext.h, intl/linux-msg.sed, intl/loadinfo.h, intl/loadmsgcat.c, intl/localealias.c, intl/po2tbl.sed.in, intl/textdomain.c, intl/xopen-msg.sed, doc/Makefile.in, thread.c, stamp-h.in, status.c, sort.c, signal.c, sendlib.c, send.c, score.c, rfc1524.c, recvattach.c, query.c, postpone.c, pop.c, pgppubring.c, pgpkey.c, pgp.c, pattern.c, parse.c, pager.c, mx.c, missing, mutt.h, mh.c, menu.c, mbox.c, main.c, lib.c, keymap.c, init.c, imap.c, hook.c, help.c, headers.c, handler.c, gen_defs, flags.c, edit.c, date.c, curs_main.c, curs_lib.c, copy.c, configure.in, configure, config.h.in, compose.c, commands.c, color.c, buffy.c, browser.c, attach.c, alias.c, aclocal.m4, addrbook.c, acconfig.h, ABOUT-NLS, Makefile.am, Makefile.in:
+	Adding gettext support, based on the patch by Marco d'Itri.
+
+	* TODO: add a note about the currently-missing mh_sequences support.
+
 Thu Oct  1 11:22:51 1998  Thomas Roessler  <roessler@guug.de>
 
 	* po/de.po: German l10n, first take.
diff --git a/Makefile.am b/Makefile.am
index ef6cfc0a..3f8d0627 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,7 +19,14 @@ mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@
 EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 	gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
 
-BUILT_SOURCES = mutt_dotlock.c
+EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO acconfig.h attach.h \
+	buffy.h charset.h config.h copy.h dotlock.h functions.h gen_defs \
+	globals.h hash.h history.h imap.h init.h keymap.h \
+	mailbox.h mapping.h mime.h mutt.h mutt_curses.h mutt_menu.h  \
+	mutt_regex.h mutt_socket.h mx.h pager.h parse.h pgp.h protos.h  \
+	reldate.h rfc1524.h rfc2047.h rfc822.h sha.h sha_locl.h sort.h mime.types
+
+BUILT_SOURCES = mutt_dotlock.c keymap_defs.h
 
 mutt_dotlock.c: dotlock.c
 	cp dotlock.c mutt_dotlock.c
@@ -28,7 +35,7 @@ CLEANFILES = mutt_dotlock.c
 
 LDADD = @LIBOBJS@ @INTLLIBS@
 
-SUBDIRS = doc intl po rx
+SUBDIRS = doc intl po rx contrib charsets
 
 OPS=$(srcdir)/OPS $(srcdir)/OPS.PGP
 
@@ -47,3 +54,24 @@ install-exec-local:
 		chgrp @DOTLOCK_GROUP@ $(bindir)/mutt_dotlock ; \
 		chmod @DOTLOCK_PERMISSION@  $(bindir)/mutt_dotlock ; \
 	fi
+
+install-data-local:
+	-if [ ! -f $(sharedir)/Muttrc ]; then \
+		$(srcdir)/mkinstalldirs $(sharedir); \
+		$(INSTALL) -m 644 $(srcdir)/Muttrc $(sharedir); \
+	fi
+	-if [ ! -f $(sharedir)/mime.types ]; then \
+		$(INSTALL) -m 644 $(srcdir)/mime.types $(sharedir); \
+	fi
+
+
+# Don't make this one ChangeLog - it's intended to be
+# used manually.
+
+changelog:
+	rcs2log | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog
+	$(VISUAL) ChangeLog
+
+dist-hook:
+	-for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
+	-rm -f $(distdir)/config.h
diff --git a/Makefile.in b/Makefile.in
index a46f9d41..492462f7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,13 +119,20 @@ mutt_DEPENDENCIES = @MUTT_LIB_OBJECTS@
 EXTRA_mutt_SOURCES = pgp.c pgpinvoke.c pgpkey.c pgppubring.c sha1dgst.c \
 	gnupgparse.c resize.c snprintf.c dotlock.c pop.c imap.c socket.c
 
-BUILT_SOURCES = mutt_dotlock.c
+EXTRA_DIST = COPYRIGHT GPL OPS OPS.PGP TODO acconfig.h attach.h \
+	buffy.h charset.h config.h copy.h dotlock.h functions.h gen_defs \
+	globals.h hash.h history.h imap.h init.h keymap.h \
+	mailbox.h mapping.h mime.h mutt.h mutt_curses.h mutt_menu.h  \
+	mutt_regex.h mutt_socket.h mx.h pager.h parse.h pgp.h protos.h  \
+	reldate.h rfc1524.h rfc2047.h rfc822.h sha.h sha_locl.h sort.h mime.types
+
+BUILT_SOURCES = mutt_dotlock.c keymap_defs.h
 
 CLEANFILES = mutt_dotlock.c
 
 LDADD = @LIBOBJS@ @INTLLIBS@
 
-SUBDIRS = doc intl po rx
+SUBDIRS = doc intl po rx contrib charsets
 
 OPS=$(srcdir)/OPS $(srcdir)/OPS.PGP
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -396,6 +403,7 @@ distdir: $(DISTFILES)
 	  (cd $$subdir && $(MAKE) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
 	    || exit 1; \
 	done
+	$(MAKE) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
 
 DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
 
@@ -432,15 +440,17 @@ all-am: Makefile $(PROGRAMS) config.h
 
 install-exec-am: install-binPROGRAMS install-exec-local
 
+install-data-am: install-data-local
+
 uninstall-am: uninstall-binPROGRAMS
 
 install-exec: install-exec-recursive install-exec-am
 	@$(NORMAL_INSTALL)
 
-install-data: install-data-recursive
+install-data: install-data-recursive install-data-am
 	@$(NORMAL_INSTALL)
 
-install: install-recursive install-exec-am
+install: install-recursive install-exec-am install-data-am
 	@:
 
 uninstall: uninstall-recursive uninstall-am
@@ -506,8 +516,8 @@ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
 maintainer-clean-depend info dvi installcheck all-recursive-am all-am \
-install-exec-am uninstall-am install-exec install-data install \
-uninstall all installdirs mostlyclean-generic distclean-generic \
+install-exec-am install-data-am uninstall-am install-exec install-data \
+install uninstall all installdirs mostlyclean-generic distclean-generic \
 clean-generic maintainer-clean-generic clean mostlyclean distclean \
 maintainer-clean
 
@@ -531,6 +541,26 @@ install-exec-local:
 		chmod @DOTLOCK_PERMISSION@  $(bindir)/mutt_dotlock ; \
 	fi
 
+install-data-local:
+	-if [ ! -f $(sharedir)/Muttrc ]; then \
+		$(srcdir)/mkinstalldirs $(sharedir); \
+		$(INSTALL) -m 644 $(srcdir)/Muttrc $(sharedir); \
+	fi
+	-if [ ! -f $(sharedir)/mime.types ]; then \
+		$(INSTALL) -m 644 $(srcdir)/mime.types $(sharedir); \
+	fi
+
+# Don't make this one ChangeLog - it's intended to be
+# used manually.
+
+changelog:
+	rcs2log | cat - ChangeLog > ChangeLog.$$$$ && mv ChangeLog.$$$$ ChangeLog
+	$(VISUAL) ChangeLog
+
+dist-hook:
+	-for file in $(BUILT_SOURCES) ; do rm -f $(distdir)/$$file ; done
+	-rm -f $(distdir)/config.h
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/charsets/Makefile.in b/charsets/Makefile.in
index 68a0393e..409e8028 100644
--- a/charsets/Makefile.in
+++ b/charsets/Makefile.in
@@ -22,12 +22,17 @@ CC=@CC@
 CFLAGS=@CFLAGS@ -D_GEN_CHARSETS
 LDFLAGS=@LDFLAGS@
 srcdir=@srcdir@
+top_srcdir=@top_srcdir@
 VPATH=@srcdir@
 @SET_MAKE@
 INSTALL=@INSTALL@
 
-charsets.list: parse_i18n
-	sh gen_charsets
+subdir=charsets
+distdir=@distdir@
+
+DISTFILES = parse_i18n.c Makefile.in charsets.list charsets.alias gen_charsets
+
+all: charsets.list
 
 parse_i18n: parse_i18n.o
 	$(CC) -o parse_i18n parse_i18n.o
@@ -35,16 +40,14 @@ parse_i18n: parse_i18n.o
 clean:
 	-rm -f *.o *~ core parse_i18n
 
-distclean: clean veryclean
+distclean: clean
 	-rm -f Makefile
 
-veryclean:
-	-rm -f `cat charsets.list` charsets.list charsets.alias
-
 maintainer-clean: distclean
+	-rm -f `cat charsets.list` charsets.list charsets.alias
 
-charmaps: parse_i18n
-	( cd $(srcdir) && ./gen_charsets )
+charmaps charsets.list: parse_i18n
+	cd $(srcdir) && sh ./gen_charsets
 
 install: charsets.list
 	$(srcdir)/../mkinstalldirs $(sharedir)/charsets
@@ -55,3 +58,12 @@ install: charsets.list
 	  $(INSTALL) -m 644 $(sharedir)/charsets/charsets.alias.dist	\
 			$(sharedir)/charsets/charsets.alias
 
+Makefile: ../config.status Makefile.in
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+distdir dist: Makefile $(DISTFILES)
+	for file in `cat charsets.list` $(DISTFILES) ; do	\
+		ln $(srcdir)/$$file $(distdir) 2> /dev/null	\
+			|| cp -p $(srcdir)/$$file $(distdir);	\
+	done
diff --git a/charsets/gen_charsets b/charsets/gen_charsets
index 5ae2d6a7..b2a62d61 100755
--- a/charsets/gen_charsets
+++ b/charsets/gen_charsets
@@ -4,9 +4,13 @@ dirs="/usr/local/lib/nls /usr/lib/nls /usr/local/share/nls /usr/share/nls"
 dirs="$dirs /usr/local/lib/i18n /usr/lib/i18n /usr/local/share/i18n"
 dirs="$dirs /usr/share/i18n"
 
-trap "rm -f ./charsets.$$; exit" 0 1 2 15
+trap "rm -f ./charsets.$$ charsets.list.$$ charsets.alias.$$ ; exit" 0 1 2 15
 
-rm -f ./charsets.list ./charsets.alias ./charsets.$$
+rm -f ./charsets.$$
+
+for i in charsets.list charsets.alias ; do
+	mv -f $i $i.$$
+done
 
 for d in $dirs ; do
   [ -d $d/charmaps ] && ./parse_i18n ./ $d/charmaps/* >> ./charsets.$$
@@ -14,3 +18,8 @@ done
 
 awk '$1 == "charset" { printf ("%s\n", $2); }' ./charsets.$$ > charsets.list
 awk '$1 == "alias"   { printf ("%s %s\n", $2, $3); }' ./charsets.$$ > charsets.alias
+
+if ! test -s charsets.list ; then
+	mv charsets.alias.$$ charsets.alias
+	mv charsets.list.$$ charsets.list
+fi
diff --git a/configure b/configure
index d29718d6..ed9e070d 100755
--- a/configure
+++ b/configure
@@ -734,7 +734,7 @@ fi
 
 PACKAGE=mutt
 
-VERSION=0.94.9p1
+VERSION=0.94.10
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -5205,7 +5205,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile intl/Makefile po/Makefile.in rx/Makefile Muttrc doc/Makefile doc/dotlock.man doc/mutt.man charsets/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile intl/Makefile po/Makefile.in rx/Makefile Muttrc doc/Makefile doc/dotlock.man doc/mutt.man charsets/Makefile contrib/Makefile config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -5334,7 +5334,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile po/Makefile.in rx/Makefile Muttrc doc/Makefile doc/dotlock.man doc/mutt.man charsets/Makefile"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile intl/Makefile po/Makefile.in rx/Makefile Muttrc doc/Makefile doc/dotlock.man doc/mutt.man charsets/Makefile contrib/Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/configure.in b/configure.in
index d2cbf0a0..efb49c4e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT(mutt.h)
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mutt, 0.94.9p1)
+AM_INIT_AUTOMAKE(mutt, 0.94.10)
 
 ALL_LINGUAS="de"
 
@@ -445,4 +445,4 @@ MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
 AC_SUBST(MUTTLOCALEDIR)
 AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")
 
-AC_OUTPUT(Makefile intl/Makefile po/Makefile.in rx/Makefile Muttrc doc/Makefile doc/dotlock.man doc/mutt.man charsets/Makefile)
+AC_OUTPUT(Makefile intl/Makefile po/Makefile.in rx/Makefile Muttrc doc/Makefile doc/dotlock.man doc/mutt.man charsets/Makefile contrib/Makefile)
diff --git a/Mush.rc b/contrib/Mush.rc
index 41008926..41008926 100644
--- a/Mush.rc
+++ b/contrib/Mush.rc
diff --git a/Pine.rc b/contrib/Pine.rc
index 5eb0f86c..5eb0f86c 100644
--- a/Pine.rc
+++ b/contrib/Pine.rc
diff --git a/doc/language.txt b/contrib/language.txt
index 4e9032fc..4e9032fc 100644
--- a/doc/language.txt
+++ b/contrib/language.txt
diff --git a/doc/language50.txt b/contrib/language50.txt
index a573c105..a573c105 100644
--- a/doc/language50.txt
+++ b/contrib/language50.txt
diff --git a/patch.slang-1.2.2.keypad.1 b/contrib/patch.slang-1.2.2.keypad.1
index 93df4d72..93df4d72 100644
--- a/patch.slang-1.2.2.keypad.1
+++ b/contrib/patch.slang-1.2.2.keypad.1
diff --git a/sample.mailcap b/contrib/sample.mailcap
index 6cba2b67..6cba2b67 100644
--- a/sample.mailcap
+++ b/contrib/sample.mailcap
diff --git a/sample.muttrc b/contrib/sample.muttrc
index 8bce3bbe..8bce3bbe 100644
--- a/sample.muttrc
+++ b/contrib/sample.muttrc
diff --git a/depend.awk b/depend.awk
deleted file mode 100644
index 89385212..00000000
--- a/depend.awk
+++ /dev/null
@@ -1,2 +0,0 @@
-$0 ~ /^# DO NOT REMOVE THIS LINE/ { exit }
-{ print }
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 9e7f0e60..036ae385 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -1,4 +1,6 @@
 SHELL=/bin/sh
+
+PACKAGE=@PACKAGE@
 VERSION=@VERSION@
 
 prefix=@prefix@
@@ -9,7 +11,9 @@ mandir=@mandir@
 sharedir=@sharedir@
 srcdir=@srcdir@
 docdir=@docdir@
-VPATH=@srcdir@/doc
+top_srcdir=@top_srcdir@
+top_builddir=..
+VPATH=@srcdir@
 @SET_MAKE@
 
 INSTALL=@INSTALL@
@@ -18,6 +22,11 @@ XCPPFLAGS=-I. @CPPFLAGS@
 CFLAGS=@CFLAGS@ -DSHAREDIR=\"$(sharedir)\" $(XCPPFLAGS)
 LDFLAGS=@LDFLAGS@
 
+DISTFILES = Makefile.in PGP-Notes.txt dotlock.man.in \
+	manual.sgml manual.txt mutt.man.in style-guide
+
+subdir = doc
+
 complete: all html
 
 all: mutt.man dotlock.man manual.txt 
@@ -25,10 +34,10 @@ all: mutt.man dotlock.man manual.txt
 html: manual.html
 
 install: dotlock.man mutt.man manual.txt
-	../mkinstalldirs $(mandir)/man1
+	$(top_srcdir)/mkinstalldirs $(mandir)/man1
 	$(INSTALL) -m 644 mutt.man $(mandir)/man1/mutt.1
 	$(INSTALL) -m 644 dotlock.man $(mandir)/man1/mutt.dotlock.1
-	../mkinstalldirs $(docdir)
+	$(top_srcdir)/mkinstalldirs $(docdir)
 	$(INSTALL) -m 644 manual.txt $(docdir)
 	$(INSTALL) -m 644 PGP-Notes.txt $(docdir)
 
@@ -58,3 +67,15 @@ maintainer-clean: clean clean-real
 
 distclean: clean
 	rm -f Makefile
+
+Makefile: Makefile.in ../config.status
+	cd .. \
+	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+dist distdir: Makefile $(DISTFILES)
+	for file in $(DISTFILES) ; do				\
+		ln $(srcdir)/$$file $(distdir) 2> /dev/null 	\
+			|| cp -p $(srcdir)/$$file $(distdir); 	\
+	done
+			
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index d9934c5d..9d0462d0 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -46,7 +46,7 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
 SOURCES = cat-id-tbl.c
 POFILES = @POFILES@
 GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
+DISTFILES = Makefile.in.in POTFILES.in $(PACKAGE).pot \
 stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
 
 POTFILES = \
diff --git a/po/cat-id-tbl.c b/po/cat-id-tbl.c
index 208f41c1..055efaec 100644
--- a/po/cat-id-tbl.c
+++ b/po/cat-id-tbl.c
@@ -676,74 +676,75 @@ options:\n\
   {"Connecting to %s", 556},
   {"Server closed connection!", 557},
   {"No new mail in POP mailbox.", 558},
-  {"Error reading message!", 559},
-  {"Error while writing mailbox!", 560},
-  {"%s [%d messages read]", 561},
-  {"Postponed Messages", 562},
-  {"No postponed messages.", 563},
-  {"Illegal PGP header", 564},
-  {"New Query", 565},
-  {"Make Alias", 566},
-  {"Search", 567},
-  {"Waiting for response...", 568},
-  {"Query command not defined.", 569},
-  {"Query", 570},
-  {"Query: ", 571},
-  {"Query '%s'", 572},
-  {"Pipe", 573},
-  {"Print", 574},
-  {"Saving...", 575},
-  {"Attachment saved", 576},
-  {"WARNING!  You are about to overwrite %s, continue?", 577},
-  {"Attachment filtered.", 578},
-  {"Filter through: ", 579},
-  {"Pipe to: ", 580},
-  {"I dont know how to print %s attachments!", 581},
-  {"Print tagged attachment(s)?", 582},
-  {"Print attachment?", 583},
-  {"You may only bounce message/rfc822 parts.", 584},
-  {"Bounce messages to %s...?", 585},
-  {"Bounce message to %s...?", 586},
-  {"Attachments", 587},
-  {"Only deletion of multipart attachments is supported.", 588},
-  {"Deletion of attachments from PGP messages is unsupported.", 589},
-  {"This operation is not currently supported for PGP messages.", 590},
-  {"Improperly formated entry for type %s in \"%s\" line %d", 591},
-  {"No mailcap path specified", 592},
-  {"mailcap entry for type %s not found", 593},
-  {"score: too few arguments", 594},
-  {"score: too many arguments", 595},
-  {"No subject, abort?", 596},
-  {"No subject, aborting.", 597},
-  {"Reply to %s?", 598},
-  {"No tagged messages are visible!", 599},
-  {"No mailing lists found!", 600},
-  {"Include message in reply?", 601},
-  {"Could not include all requested messages!", 602},
-  {"Forward MIME encapsulated?", 603},
-  {"Recall postponed message?", 604},
-  {"Abort unmodified message?", 605},
-  {"Aborted unmodified message.", 606},
-  {"Mail not sent.", 607},
-  {"Message postponed.", 608},
-  {"No recipients are specified!", 609},
-  {"No recipients were specified.", 610},
-  {"No subject, abort sending?", 611},
-  {"No subject specified.", 612},
-  {"Message edited. Really send?", 613},
-  {"Sending message...", 614},
-  {"Mail sent.", 615},
-  {"No boundary parameter found! [report this error]", 616},
-  {"%s no longer exists!", 617},
-  {"Could not open %s", 618},
-  {"Error sending message, child exited %d (%s).\n", 619},
-  {"Saved output of child process to %s.\n", 620},
-  {"Error sending message.", 621},
-  {"Caught %s...  Exiting.\n", 622},
-  {"Caught signal %d...  Exiting.\n", 623},
-  {"Sorting mailbox...", 624},
-  {"Could not find sorting function! [report this bug]", 625},
-  {"(no mailbox)", 626},
+  {"Reading %d new message (%d bytes)...", 559},
+  {"Error reading message!", 560},
+  {"Error while writing mailbox!", 561},
+  {"%s [%d messages read]", 562},
+  {"Postponed Messages", 563},
+  {"No postponed messages.", 564},
+  {"Illegal PGP header", 565},
+  {"New Query", 566},
+  {"Make Alias", 567},
+  {"Search", 568},
+  {"Waiting for response...", 569},
+  {"Query command not defined.", 570},
+  {"Query", 571},
+  {"Query: ", 572},
+  {"Query '%s'", 573},
+  {"Pipe", 574},
+  {"Print", 575},
+  {"Saving...", 576},
+  {"Attachment saved", 577},
+  {"WARNING!  You are about to overwrite %s, continue?", 578},
+  {"Attachment filtered.", 579},
+  {"Filter through: ", 580},
+  {"Pipe to: ", 581},
+  {"I dont know how to print %s attachments!", 582},
+  {"Print tagged attachment(s)?", 583},
+  {"Print attachment?", 584},
+  {"You may only bounce message/rfc822 parts.", 585},
+  {"Bounce messages to %s...?", 586},
+  {"Bounce message to %s...?", 587},
+  {"Attachments", 588},
+  {"Only deletion of multipart attachments is supported.", 589},
+  {"Deletion of attachments from PGP messages is unsupported.", 590},
+  {"This operation is not currently supported for PGP messages.", 591},
+  {"Improperly formated entry for type %s in \"%s\" line %d", 592},
+  {"No mailcap path specified", 593},
+  {"mailcap entry for type %s not found", 594},
+  {"score: too few arguments", 595},
+  {"score: too many arguments", 596},
+  {"No subject, abort?", 597},
+  {"No subject, aborting.", 598},
+  {"Reply to %s?", 599},
+  {"No tagged messages are visible!", 600},
+  {"No mailing lists found!", 601},
+  {"Include message in reply?", 602},
+  {"Could not include all requested messages!", 603},
+  {"Forward MIME encapsulated?", 604},
+  {"Recall postponed message?", 605},
+  {"Abort unmodified message?", 606},
+  {"Aborted unmodified message.", 607},
+  {"Mail not sent.", 608},
+  {"Message postponed.", 609},
+  {"No recipients are specified!", 610},
+  {"No recipients were specified.", 611},
+  {"No subject, abort sending?", 612},
+  {"No subject specified.", 613},
+  {"Message edited. Really send?", 614},
+  {"Sending message...", 615},
+  {"Mail sent.", 616},
+  {"No boundary parameter found! [report this error]", 617},
+  {"%s no longer exists!", 618},
+  {"Could not open %s", 619},
+  {"Error sending message, child exited %d (%s).\n", 620},
+  {"Saved output of child process to %s.\n", 621},
+  {"Error sending message.", 622},
+  {"Caught %s...  Exiting.\n", 623},
+  {"Caught signal %d...  Exiting.\n", 624},
+  {"Sorting mailbox...", 625},
+  {"Could not find sorting function! [report this bug]", 626},
+  {"(no mailbox)", 627},
 };
 
-int _msg_tbl_length = 626;
+int _msg_tbl_length = 627;
diff --git a/po/de.po b/po/de.po
index 9d54084c..70225068 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-02 16:05+0200\n"
+"POT-Creation-Date: 1998-10-04 00:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -678,11 +678,11 @@ msgstr "Alle Nachrichten gelöscht."
 msgid "You are on the first message."
 msgstr "Sie sind bereits auf der ersten Nachricht."
 
-#: curs_main.c:1123 pattern.c:1062
+#: curs_main.c:1123 pattern.c:1074
 msgid "Search wrapped to top."
 msgstr "Suche von vorne begonnen."
 
-#: curs_main.c:1132 pattern.c:1073
+#: curs_main.c:1132 pattern.c:1085
 msgid "Search wrapped to bottom."
 msgstr "Suche von hinten begonnen."
 
@@ -840,7 +840,7 @@ msgstr "In Kommando einspeisen: "
 #: handler.c:1115 handler.c:1138
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
-msgstr "[-- Fehlerausgame von %s --]\n"
+msgstr "[-- Fehlerausgabe von %s --]\n"
 
 #: handler.c:1239
 msgid "Error: multipart/signed has no protocol."
@@ -2001,7 +2001,7 @@ msgstr "Sie sind auf dem letzten Eintrag."
 msgid "You are on the first entry."
 msgstr "Sie sind auf dem ersten Eintrag"
 
-#: menu.c:584 pattern.c:1008
+#: menu.c:584 pattern.c:1020
 msgid "Search for: "
 msgstr "Suche nach: "
 
@@ -2009,11 +2009,11 @@ msgstr "Suche nach: "
 msgid "Reverse search for: "
 msgstr "Suche rückwärts nach: "
 
-#: menu.c:596 pattern.c:1041
+#: menu.c:596 pattern.c:1053
 msgid "No search pattern."
 msgstr "Kein Suchmuster."
 
-#: menu.c:626 pager.c:1769 pager.c:1785 pager.c:1872 pattern.c:1106
+#: menu.c:626 pager.c:1769 pager.c:1785 pager.c:1872 pattern.c:1118
 msgid "Not found."
 msgstr "Nicht gefunden."
 
@@ -2183,60 +2183,60 @@ msgstr "Ungültiger Monat: %s"
 msgid "error in expression"
 msgstr "Fehler in Ausdruck."
 
-#: pattern.c:574 pattern.c:677
+#: pattern.c:579 pattern.c:687
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "Fehler in Muster bei: %s"
 
-#: pattern.c:619
+#: pattern.c:627
 #, c-format
 msgid "%c: invalid command"
 msgstr "%c: Ungültiges Kommando"
 
-#: pattern.c:625
+#: pattern.c:633
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c: Wird in diesem Modus nicht unterstützt."
 
-#: pattern.c:638
+#: pattern.c:646
 msgid "missing parameter"
 msgstr "Fehlender Parameter"
 
-#: pattern.c:654
+#: pattern.c:662
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "Unpasende Klammern: %s"
 
-#: pattern.c:684
+#: pattern.c:694
 msgid "empty pattern"
 msgstr "Leeres Muster"
 
-#: pattern.c:835
+#: pattern.c:847
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr ""
 
-#: pattern.c:899 pattern.c:1027
+#: pattern.c:911 pattern.c:1039
 msgid "Compiling search pattern..."
 msgstr "Compiliere Suchmuster..."
 
-#: pattern.c:913
+#: pattern.c:925
 msgid "Executing command on matching messages..."
 msgstr "Führe Kommando aus..."
 
-#: pattern.c:970
+#: pattern.c:982
 msgid "No messages matched criteria."
 msgstr "Keine Nachrichten haben Kriterium erfüllt."
 
-#: pattern.c:1065
+#: pattern.c:1077
 msgid "Search hit bottom without finding match"
 msgstr "Suche hat Ende erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1076
+#: pattern.c:1088
 msgid "Search hit top without finding match"
 msgstr "Suche hat Anfang erreicht, ohne Treffer zu erzielen."
 
-#: pattern.c:1098
+#: pattern.c:1110
 msgid "Search interrupted."
 msgstr "Suche unterbrochen."
 
@@ -2523,6 +2523,11 @@ msgstr "Server hat Verbindung geschlossen!"
 msgid "No new mail in POP mailbox."
 msgstr "Keine neuen Nachrichten auf dem POP-Server."
 
+#: pop.c:195
+#, c-format
+msgid "Reading %d new message (%d bytes)..."
+msgstr ""
+
 #: pop.c:231
 msgid "Error reading message!"
 msgstr "Kann Nachricht nicht lesen!"
diff --git a/po/mutt.pot b/po/mutt.pot
index c6eb6e58..5cd510ac 100644
--- a/po/mutt.pot
+++ b/po/mutt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1998-10-02 16:20+0200\n"
+"POT-Creation-Date: 1998-10-04 00:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -679,11 +679,11 @@ msgstr ""
 msgid "You are on the first message."
 msgstr ""
 
-#: curs_main.c:1123 pattern.c:1062
+#: curs_main.c:1123 pattern.c:1074
 msgid "Search wrapped to top."
 msgstr ""
 
-#: curs_main.c:1132 pattern.c:1073
+#: curs_main.c:1132 pattern.c:1085
 msgid "Search wrapped to bottom."
 msgstr ""
 
@@ -1974,7 +1974,7 @@ msgstr ""
 msgid "You are on the first entry."
 msgstr ""
 
-#: menu.c:584 pattern.c:1008
+#: menu.c:584 pattern.c:1020
 msgid "Search for: "
 msgstr ""
 
@@ -1982,11 +1982,11 @@ msgstr ""
 msgid "Reverse search for: "
 msgstr ""
 
-#: menu.c:596 pattern.c:1041
+#: menu.c:596 pattern.c:1053
 msgid "No search pattern."
 msgstr ""
 
-#: menu.c:626 pager.c:1769 pager.c:1785 pager.c:1872 pattern.c:1106
+#: menu.c:626 pager.c:1769 pager.c:1785 pager.c:1872 pattern.c:1118
 msgid "Not found."
 msgstr ""
 
@@ -2156,60 +2156,60 @@ msgstr ""
 msgid "error in expression"